AuthUser -> Swift (#10993)

Author: paulb777

FirebaseAuth/Sources/Auth/FIRAuth.m

@@ -31,7 +31,6 @@
 #import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
 #import "FirebaseAuth/Sources/SystemService/FIRAuthStoredUserManager.h"
-#import "FirebaseAuth/Sources/User/FIRUser_Internal.h"
 #import "FirebaseAuth/Sources/Utilities/FIRAuthExceptionUtils.h"
 
 #if TARGET_OS_IOS
@@ -302,7 +301,8 @@ @interface FIRAuth () <FIRLibrary, FIRComponentLifecycleMaintainer>
 /** @property storedUserManager
     @brief The stored user manager.
  */
-@property(nonatomic, strong, nullable) FIRAuthStoredUserManager *storedUserManager;
+// TODO: temporary in FIRAuth.h
+//@property(nonatomic, strong, nullable) FIRAuthStoredUserManager *storedUserManager;
 
 /** @fn initWithApp:
     @brief Creates a @c FIRAuth instance associated with the provided @c FIRApp instance.
@@ -321,7 +321,8 @@ @implementation FIRAuth {
   /** @var _firebaseAppName
       @brief The Firebase app name.
    */
-  NSString *_firebaseAppName;
+  // TODO: temporary in FIRAuth.h
+  // NSString *_firebaseAppName;
 
   /** @var _listenerHandles
       @brief Handles returned from @c NSNotificationCenter for blocks which are "auth state did
@@ -333,7 +334,8 @@ @implementation FIRAuth {
   /** @var _keychainServices
       @brief The keychain service.
    */
-  id<FIRAuthStorage> _keychainServices;
+  // TODO: temporary in FIRAuth.h
+  // FIRAuthKeychainServices *_keychainServices;
 
   /** @var _lastNotifiedUserToken
       @brief The user access (ID) token used last time for posting auth state changed notification.
@@ -599,6 +601,10 @@ - (nullable FIRUser *)currentUser {
   return result;
 }
 
+- (nullable FIRUser *)rawCurrentUser {
+  return self->_currentUser;
+}
+
 - (void)signInWithProvider:(id<FIRFederatedAuthProvider>)provider
                 UIDelegate:(nullable id<FIRAuthUIDelegate>)UIDelegate
                 completion:(nullable FIRAuthDataResultCallback)completion {
@@ -944,7 +950,7 @@ - (void)internalSignInAndRetrieveDataWithCredential:(FIRAuthCredential *)credent
                              }
 
                              [self
-                                 completeSignInWithAccessToken:response.idToken
+                                 completeSignInWithAccessToken:response.IDToken
                                      accessTokenExpirationDate:response.approximateExpirationDate
                                                   refreshToken:response.refreshToken
                                                      anonymous:NO
@@ -1014,7 +1020,7 @@ - (void)internalSignInAndRetrieveDataWithCredential:(FIRAuthCredential *)credent
                  return;
                }
                [self
-                   completeSignInWithAccessToken:response.idToken
+                   completeSignInWithAccessToken:response.IDToken
                        accessTokenExpirationDate:response.approximateExpirationDate
                                     refreshToken:response.refreshToken
                                        anonymous:NO
@@ -1048,7 +1054,7 @@ - (void)signInAnonymouslyWithCompletion:(nullable FIRAuthDataResultCallback)comp
   dispatch_async(FIRAuthGlobalWorkQueue(), ^{
     FIRAuthDataResultCallback decoratedCallback =
         [self signInFlowAuthDataResultCallbackByDecoratingCallback:completion];
-    if (self->_currentUser.anonymous) {
+    if (self->_currentUser.isAnonymous) {
       FIRAuthDataResult *result = [[FIRAuthDataResult alloc] initWithUser:self->_currentUser
                                                        additionalUserInfo:nil
                                                                credential:nil];
@@ -1685,7 +1691,7 @@ - (void)internalSignInAndRetrieveDataWithCustomToken:(NSString *)token
                    return;
                  }
                }
-               [self completeSignInWithAccessToken:response.idToken
+               [self completeSignInWithAccessToken:response.IDToken
                          accessTokenExpirationDate:response.approximateExpirationDate
                                       refreshToken:response.refreshToken
                                          anonymous:NO
@@ -1784,19 +1790,6 @@ - (void)possiblyPostAuthStateChangeNotification {
   });
 }
 
-- (BOOL)updateKeychainWithUser:(FIRUser *)user error:(NSError *_Nullable *_Nullable)error {
-  if (user != _currentUser) {
-    // No-op if the user is no longer signed in. This is not considered an error as we don't check
-    // whether the user is still current on other callbacks of user operations either.
-    return YES;
-  }
-  if ([self saveUser:user error:error]) {
-    [self possiblyPostAuthStateChangeNotification];
-    return YES;
-  }
-  return NO;
-}
-
 + (NSString *)keychainServiceNameForAppID:(NSString *)appID {
   return [@"firebase_auth_" stringByAppendingString:appID];
 }

FirebaseAuth/Sources/Auth/FIRAuth_Internal.h

@@ -53,15 +53,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (nullable NSString *)getUserID;
 
-/** @fn updateKeychainWithUser:error:
-    @brief Updates the keychain for the given user.
-    @param user The user to be updated.
-    @param error The error caused the method to fail if the method returns NO.
-    @return Whether updating keychain has succeeded or not.
-    @remarks Called by @c FIRUser when user info or token changes occur.
- */
-- (BOOL)updateKeychainWithUser:(FIRUser *)user error:(NSError *_Nullable *_Nullable)error;
-
 /** @fn internalSignInWithCredential:callback:
     @brief Convenience method for @c internalSignInAndRetrieveDataWithCredential:callback:
         This method doesn't return additional identity provider data.

FirebaseAuth/Sources/MultiFactor/FIRMultiFactor+Internal.h

@@ -23,6 +23,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FIRMultiFactor () <NSSecureCoding>
 
+// TODO: revisit User.swift usage of this property after this is in Swift.
+
 @property(nonatomic, weak) FIRUser *user;
 
 /** @fn initWithMFAEnrollments:

FirebaseAuth/Sources/MultiFactor/FIRMultiFactor.m

@@ -20,7 +20,6 @@
 
 #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"
 #import "FirebaseAuth/Sources/MultiFactor/FIRMultiFactor+Internal.h"
-#import "FirebaseAuth/Sources/User/FIRUser_Internal.h"
 
 #import "FirebaseAuth-Swift.h"
 
@@ -49,7 +48,7 @@ - (void)enrollWithAssertion:(FIRMultiFactorAssertion *)assertion
           initWithSessionInfo:phoneAssertion.authCredential.verificationID
              verificationCode:phoneAssertion.authCredential.verificationCode];
   FIRFinalizeMFAEnrollmentRequest *request =
-      [[FIRFinalizeMFAEnrollmentRequest alloc] initWithIDToken:self.user.rawAccessToken
+      [[FIRFinalizeMFAEnrollmentRequest alloc] initWithIDToken:self.user.tokenService.accessToken
                                                    displayName:displayName
                                               verificationInfo:finalizeMFAPhoneRequestInfo
                                           requestConfiguration:self.user.requestConfiguration];
@@ -97,7 +96,7 @@ - (void)unenrollWithInfo:(FIRMultiFactorInfo *)factorInfo
 - (void)unenrollWithFactorUID:(NSString *)factorUID
                    completion:(nullable FIRAuthVoidErrorCallback)completion {
   FIRWithdrawMFARequest *request =
-      [[FIRWithdrawMFARequest alloc] initWithIDToken:self.user.rawAccessToken
+      [[FIRWithdrawMFARequest alloc] initWithIDToken:self.user.tokenService.accessToken
                                      MFAEnrollmentID:factorUID
                                 requestConfiguration:self.user.requestConfiguration];
   [FIRAuthBackend2

FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuth.h

@@ -30,6 +30,8 @@
 @class FIRUser;
 @class FIRAuthNotificationManager;
 @class FIRAuthURLPresenter;
+@class FIRAuthKeychainServices;
+@class FIRAuthStoredUserManager;
 @protocol FIRAuthUIDelegate;
 @protocol FIRFederatedAuthProvider;
 
@@ -312,6 +314,10 @@ NS_SWIFT_NAME(Auth)
  */
 @property(nonatomic, strong, readonly) FIRAuthNotificationManager *notificationManager;
 
+@property(nonatomic, strong) NSString *firebaseAppName;
+@property(nonatomic) FIRAuthKeychainServices *keychainServices;
+@property(nonatomic) FIRAuthStoredUserManager *storedUserManager;
+
 // TODO: Temporary bridge from Swift until completely ported.
 + (dispatch_queue_t)globalWorkQueue;
 
@@ -340,6 +346,9 @@ NS_SWIFT_NAME(Auth)
  */
 @property(nonatomic, strong, readonly, nullable) FIRUser *currentUser;
 
+// TODO: temporary for updateKeychain check. Revisit with Auth.swift. Should not be public.
+@property(nonatomic, strong, readonly, nullable) FIRUser *rawCurrentUser;
+
 /** @property languageCode
     @brief The current user language code. This property can be set to the app's current language by
         calling `useAppLanguage()`.

FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactor.h

@@ -87,6 +87,8 @@ NS_SWIFT_NAME(MultiFactor) API_UNAVAILABLE(macos, tvos, watchos) @interface FIRM
 - (void)unenrollWithFactorUID:(NSString *)factorUID
                    completion:(nullable void (^)(NSError *_Nullable error))completion;
 
+// TODO: revisit User.swift usage of internal User property after this is in Swift.
+
 @end
 
 NS_ASSUME_NONNULL_END