Merge "Swift auth url should use a suffix"