Update FirebaseUI/Auth 2.0, synced @122168651

Change-Id: Ib5e1df011ef5178c4d981521232325fc41f03a3f

Author: ch40w31

FirebaseUI/Auth/AuthProviderUI/Facebook/Source/FIRFacebookAuthUI.m

@@ -18,7 +18,6 @@
 
 #import <FirebaseAuth/FIRFacebookAuthProvider.h>
 #import <FirebaseAuth/FIRUserInfo.h>
-#import <FirebaseAuth/FIRUser_Internal.h>
 #import "FIRAuthUIErrorUtils.h"
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <FBSDKLoginKit/FBSDKLoginKit.h>

FirebaseUI/Auth/AuthUI/Source/FIRAuthUI.m

@@ -19,7 +19,6 @@
 #import <objc/runtime.h>
 
 #import <FirebaseAnalytics/FIRApp.h>
-#import <FirebaseAnalytics/FIRAppAssociationRegistration.h>
 #import <FirebaseAuth/FIRAuth.h>
 #import "FIRAuthPickerViewController.h"
 #import "FIRAuthUI_Internal.h"
@@ -29,6 +28,12 @@
  */
 static NSString *const kAppNameCodingKey = @"appName";
 
+/** @var kAuthAssociationKey
+    @brief The address of this variable is used as the key for associating FIRAuthUI instances with
+        root FIRAuth objects.
+ */
+static const char kAuthAssociationKey;
+
 @interface FIRAuthUI ()
 
 /** @fn initWithAuth:
@@ -49,11 +54,16 @@ + (nullable FIRAuthUI *)authUI {
 }
 
 + (nullable FIRAuthUI *)authUIWithAuth:(FIRAuth *)auth {
-  return [FIRAppAssociationRegistration registeredObjectWithHost:auth
-                                                             key:NSStringFromClass(self)
-                                                   creationBlock:^FIRAuthUI *_Nullable() {
-    return [[FIRAuthUI alloc] initWithAuth:auth];
-  }];
+  @synchronized (self) {
+    // Let the FIRAuth instance retain the FIRAuthUI instance.
+    FIRAuthUI *authUI = objc_getAssociatedObject(auth, &kAuthAssociationKey);
+    if (!authUI) {
+      authUI = [[FIRAuthUI alloc] initWithAuth:auth];
+      objc_setAssociatedObject(auth, &kAuthAssociationKey, authUI,
+          OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    }
+    return authUI;
+  }
 }
 
 - (nullable instancetype)initWithAuth:(FIRAuth *)auth {

FirebaseUI/Auth/AuthUI/Source/FIRAuthUIErrors.h

@@ -33,11 +33,11 @@ typedef NS_ENUM(NSUInteger, FIRAuthUIErrorCode) {
   /** @var FIRAuthUIErrorCodeUserCancelledSignIn
       @brief Indicates the user cancelled a sign-in flow.
    */
-  FIRAuthUIErrorCodeUserCancelledSignIn,
+  FIRAuthUIErrorCodeUserCancelledSignIn = 1,
   /** @var FIRAuthUIErrorCodeProviderError
       @brief Indicates there's an error from the identity provider. The
           @c FIRAuthUIErrorUserInfoProviderIDKey field in the @c NError.userInfo dictionary will
           contain the ID of the identity provider.
    */
-  FIRAuthUIErrorCodeProviderError,
+  FIRAuthUIErrorCodeProviderError = 2,
 };

FirebaseUI/Auth/AuthUI/Source/FIRAuthUIUtils.m

@@ -18,8 +18,6 @@
 
 #import <CoreText/CoreText.h>
 
-#import <FirebaseAuth/FIRAuth_Internal.h>
-
 @implementation FIRAuthUIUtils
 
 + (NSBundle *)frameworkBundle {

FirebaseUI/Auth/AuthUI/Source/FirebaseAuthUI.h

@@ -18,6 +18,7 @@
 #import "FIRAuthProviderUI.h"
 #import "FIRAuthUI.h"
 #import "FIRAuthUIBaseViewController.h"
+#import "FIRAuthUIErrors.h"
 
 /** @var FirebaseAuthUIVersionNumber
     @brief Version number for FirebaseAuthUI.