Update FirebaseUI/Auth 2.0, synced @122379019.

Change-Id: I11fcce1458c533f3d8b0913255fd592db1b3812e

Author: ch40w31

FirebaseUI/Auth/AuthUI/Source/FIRAuthPickerViewController.m

@@ -81,7 +81,7 @@ - (void)viewDidLoad {
                                                     action:@selector(cancel)];
   self.navigationItem.leftBarButtonItem = cancelBarButton;
 
-  NSInteger numberOfButtons = self.authUI.signInProviders.count;
+  NSInteger numberOfButtons = self.authUI.providers.count;
   BOOL showEmailButton = !self.authUI.signInWithEmailHidden;
   if (showEmailButton) {
     ++numberOfButtons;
@@ -93,7 +93,7 @@ - (void)viewDidLoad {
   [self.view addSubview:_buttonContainerView];
 
   CGRect buttonFrame = CGRectMake(0, 0, kSignInButtonWidth, kSignInButtonHeight);
-  for (id<FIRAuthProviderUI> providerUI in self.authUI.signInProviders) {
+  for (id<FIRAuthProviderUI> providerUI in self.authUI.providers) {
     UIButton *providerButton =
         [[FIRAuthUISignInButton alloc] initWithFrame:buttonFrame providerUI:providerUI];
     [providerButton addTarget:self
@@ -283,8 +283,8 @@ - (void)handleAccountLinkingForEmail:(NSString *)email
 #pragma mark - Utilities
 
 - (nullable id<FIRAuthProviderUI>)providerWithID:(NSString *)providerID {
-  NSArray<id<FIRAuthProviderUI>> *signInProviders = self.authUI.signInProviders;
-  for (id<FIRAuthProviderUI> provider in signInProviders) {
+  NSArray<id<FIRAuthProviderUI>> *providers = self.authUI.providers;
+  for (id<FIRAuthProviderUI> provider in providers) {
     if ([provider.providerID isEqual:providerID]) {
       return provider;
     }

FirebaseUI/Auth/AuthUI/Source/FIRAuthUI.h

@@ -84,10 +84,10 @@ typedef void (^FIRAuthUIResultCallback)(FIRUser *_Nullable user, NSError *_Nulla
  */
 @property(nonatomic, weak, readonly, nullable) FIRAuth *auth;
 
-/** @property signInProviders
+/** @property providers
     @brief The @c FIRAuthProviderUI implementations to use for sign-in.
  */
-@property(nonatomic, copy) NSArray<id<FIRAuthProviderUI>> *signInProviders;
+@property(nonatomic, copy) NSArray<id<FIRAuthProviderUI>> *providers;
 
 /** @property signInWithEmailHidden
     @brief Whether to hide the "Sign in with email" option, defaults to NO.
@@ -102,11 +102,11 @@ typedef void (^FIRAuthUIResultCallback)(FIRUser *_Nullable user, NSError *_Nulla
  */
 @property(nonatomic, strong, nullable) NSBundle *customStringsBundle;
 
-/** @property termsOfServiceURL
+/** @property TOSURL
     @brief The URL of your app's Terms of Service. If not nil, a Terms of Service notice is
         displayed on the email/password account creation screen.
  */
-@property(nonatomic, copy, nullable) NSURL *termsOfServiceURL;
+@property(nonatomic, copy, nullable) NSURL *TOSURL;
 
 /** @property delegate
     @brief A delegate that receives callbacks or provides custom UI for @c FIRAuthUI.

FirebaseUI/Auth/AuthUI/Source/FIRAuthUI.m

@@ -77,7 +77,7 @@ - (nullable instancetype)initWithAuth:(FIRAuth *)auth {
 - (BOOL)handleOpenURL:(NSURL *)URL
     sourceApplication:(NSString *)sourceApplication {
   // Complete IDP-based sign-in flow.
-  for (id<FIRAuthProviderUI> provider in _signInProviders) {
+  for (id<FIRAuthProviderUI> provider in _providers) {
     if ([provider handleOpenURL:URL sourceApplication:sourceApplication]) {
       return YES;
     }

FirebaseUI/Auth/AuthUI/Source/FIRAuthUIUtils.h

@@ -33,12 +33,4 @@
  */
 + (UIImage *)imageNamed:(NSString *)name;
 
-/** @fn URLWithString:query:
-    @brief Constructs an URL from a string and additional query parameters.
-    @param baseString The URL string to start with.
-    @param queryParameters The dictionary of additional query parameters.
-    @return The constructed URL.
- */
-+ (NSURL *)URLWithString:(NSString *)urlString queryParameters:(NSDictionary *)queryParameters;
-
 @end

FirebaseUI/Auth/AuthUI/Source/FIRAuthUIUtils.m

@@ -16,8 +16,6 @@
 
 #import "FIRAuthUIUtils.h"
 
-#import <CoreText/CoreText.h>
-
 @implementation FIRAuthUIUtils
 
 + (NSBundle *)frameworkBundle {
@@ -40,60 +38,4 @@ + (UIImage *)imageNamed:(NSString *)name {
   return [UIImage imageWithContentsOfFile:path];
 }
 
-+ (NSURL *)URLWithString:(NSString *)urlString queryParameters:(NSDictionary *)queryParameters {
-  if ([urlString length] == 0) return nil;
-
-  NSString *fullURLString;
-  if ([queryParameters count] > 0) {
-    NSMutableArray *queryItems = [NSMutableArray arrayWithCapacity:[queryParameters count]];
-
-    // sort the custom parameter keys so that we have deterministic parameter
-    // order for unit tests
-    NSArray *queryKeys = [queryParameters allKeys];
-    NSArray *sortedQueryKeys =
-        [queryKeys sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
-
-    for (NSString *paramKey in sortedQueryKeys) {
-      NSString *paramValue = [queryParameters valueForKey:paramKey];
-
-      NSString *paramItem = [NSString stringWithFormat:@"%@=%@",
-                             [self stringByURLEncodingStringParameter:paramKey],
-                             [self stringByURLEncodingStringParameter:paramValue]];
-
-      [queryItems addObject:paramItem];
-    }
-
-    NSString *paramStr = [queryItems componentsJoinedByString:@"&"];
-
-    BOOL hasQMark = ([urlString rangeOfString:@"?"].location == NSNotFound);
-    char joiner = hasQMark ? '?' : '&';
-    fullURLString = [NSString stringWithFormat:@"%@%c%@",
-                     urlString, joiner, paramStr];
-  } else {
-    fullURLString = urlString;
-  }
-  NSURL *result = [NSURL URLWithString:fullURLString];
-  return result;
-}
-
-+ (NSString *)stringByURLEncodingStringParameter:(NSString *)originalString {
-  // For parameters, we'll explicitly leave spaces unescaped now, and replace
-  // them with +'s
-  NSString *const kForceEscape = @"!*'();:@&=+$,/?%#[]";
-  NSString *const kLeaveUnescaped = @" ";
-
-  NSMutableCharacterSet *cs = [[NSCharacterSet URLQueryAllowedCharacterSet] mutableCopy];
-  [cs removeCharactersInString:kForceEscape];
-  [cs addCharactersInString:kLeaveUnescaped];
-
-  NSString *escapedStr = [originalString stringByAddingPercentEncodingWithAllowedCharacters:cs];
-  NSString *resultStr = originalString;
-  if (escapedStr) {
-    // replace spaces with plusses
-    resultStr = [escapedStr stringByReplacingOccurrencesOfString:@" "
-                                                      withString:@"+"];
-  }
-  return resultStr;
-}
-
 @end

FirebaseUI/Auth/AuthUI/Source/FIREmailEntryViewController.m

@@ -176,9 +176,9 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
 }
 
 - (nullable id<FIRAuthProviderUI>)bestProviderFromProviderIDs:(NSArray<NSString *> *)providerIDs {
-  NSArray<id<FIRAuthProviderUI>> *signInProviders = self.authUI.signInProviders;
+  NSArray<id<FIRAuthProviderUI>> *providers = self.authUI.providers;
   for (NSString *providerID in providerIDs) {
-    for (id<FIRAuthProviderUI> provider in signInProviders) {
+    for (id<FIRAuthProviderUI> provider in providers) {
       if ([providerID isEqual:provider.providerID]) {
         return provider;
       }

FirebaseUI/Auth/AuthUI/Source/FIRPasswordSignUpViewController.m

@@ -110,7 +110,7 @@ - (void)viewDidLoad {
 - (void)viewDidLayoutSubviews {
   [super viewDidLayoutSubviews];
 
-  NSURL *termsOfServiceURL = self.authUI.termsOfServiceURL;
+  NSURL *termsOfServiceURL = self.authUI.TOSURL;
   if (!termsOfServiceURL) {
     self.footerTextView.text = nil;
     return;
@@ -124,7 +124,7 @@ - (void)viewDidLayoutSubviews {
       [[NSMutableAttributedString alloc] initWithString:termsOfServiceNotice];
   NSRange termsOfServiceRange = [termsOfServiceNotice rangeOfString:termsOfService];
   [attributedString addAttribute:NSLinkAttributeName
-                           value:self.authUI.termsOfServiceURL.absoluteString
+                           value:self.authUI.TOSURL.absoluteString
                            range:termsOfServiceRange];
   self.footerTextView.attributedText = attributedString;