firebase · Yue-Wang-Google · Apr 23, 2019 · Apr 22, 2019
diff --git a/Firebase/Auth/Source/Auth/FIRAuth.m b/Firebase/Auth/Source/Auth/FIRAuth.m
@@ -1677,9 +1677,9 @@ - (void)scheduleAutoTokenRefreshWithDelay:(NSTimeInterval)delay retry:(BOOL)retr
     @param callback Called when the user has been signed in or when an error occurred. Invoked
         asynchronously on the global auth work queue in the future.
  */
-- (void)completeSignInWithAccessToken:(NSString *)accessToken
-            accessTokenExpirationDate:(NSDate *)accessTokenExpirationDate
-                         refreshToken:(NSString *)refreshToken
+- (void)completeSignInWithAccessToken:(nullable NSString *)accessToken
+            accessTokenExpirationDate:(nullable NSDate *)accessTokenExpirationDate
+                         refreshToken:(nullable NSString *)refreshToken
                             anonymous:(BOOL)anonymous
                              callback:(FIRAuthResultCallback)callback {
   [FIRUser retrieveUserWithAuth:self
@@ -1800,7 +1800,7 @@ - (BOOL)updateCurrentUser:(nullable FIRUser *)user
     @param outError Return value for any error which occurs.
     @return @YES on success, @NO otherwise.
  */
-- (BOOL)saveUser:(FIRUser *)user
+- (BOOL)saveUser:(nullable FIRUser *)user
            error:(NSError *_Nullable *_Nullable)outError {
   BOOL success;
 
@@ -2014,8 +2014,8 @@ - (BOOL)useUserAccessGroup:(NSString *_Nullable)accessGroup
   return YES;
 }
 
-- (FIRUser *)getStoredUserForAccessGroup:(NSString *_Nullable)accessGroup
-                                   error:(NSError *_Nullable *_Nullable)outError {
+- (nullable FIRUser *)getStoredUserForAccessGroup:(NSString *_Nullable)accessGroup
+                                            error:(NSError *_Nullable *_Nullable)outError {
   FIRUser *user;
   if (!accessGroup) {
     NSString *userKey = [NSString stringWithFormat:kUserKey, _firebaseAppName];

diff --git a/Firebase/Auth/Source/AuthProvider/Phone/FIRPhoneAuthProvider.m b/Firebase/Auth/Source/AuthProvider/Phone/FIRPhoneAuthProvider.m
@@ -271,7 +271,7 @@ - (void)verifyClientAndSendVerificationCodeToPhoneNumber:(NSString *)phoneNumber
       callback(nil, error);
       return;
     }
-    FIRSendVerificationCodeRequest *request;
+    FIRSendVerificationCodeRequest * _Nullable request;
     if (appCredential) {
       request =
           [[FIRSendVerificationCodeRequest alloc]
@@ -287,28 +287,30 @@ - (void)verifyClientAndSendVerificationCodeToPhoneNumber:(NSString *)phoneNumber
                    reCAPTCHAToken:reCAPTCHAToken
              requestConfiguration:self->_auth.requestConfiguration];
     }
-    [FIRAuthBackend sendVerificationCode:request
-                                callback:^(FIRSendVerificationCodeResponse *_Nullable response,
-                                           NSError *_Nullable error) {
-      if (error) {
-        if (error.code == FIRAuthErrorCodeInvalidAppCredential) {
-          if (retryOnInvalidAppCredential) {
-            [self->_auth.appCredentialManager clearCredential];
-            [self verifyClientAndSendVerificationCodeToPhoneNumber:phoneNumber
-                                       retryOnInvalidAppCredential:NO
-                                                        UIDelegate:UIDelegate
-                                                          callback:callback];
+    if (request) {
+      [FIRAuthBackend sendVerificationCode:request
+                                  callback:^(FIRSendVerificationCodeResponse *_Nullable response,
+                                             NSError *_Nullable error) {
+        if (error) {
+          if (error.code == FIRAuthErrorCodeInvalidAppCredential) {
+            if (retryOnInvalidAppCredential) {
+              [self->_auth.appCredentialManager clearCredential];
+              [self verifyClientAndSendVerificationCodeToPhoneNumber:phoneNumber
+                                         retryOnInvalidAppCredential:NO
+                                                          UIDelegate:UIDelegate
+                                                            callback:callback];
+              return;
+            }
+            callback(nil, [FIRAuthErrorUtils unexpectedResponseWithDeserializedResponse:nil
+                                                                        underlyingError:error]);
             return;
           }
-          callback(nil, [FIRAuthErrorUtils unexpectedResponseWithDeserializedResponse:nil
-                                                                      underlyingError:error]);
+          callback(nil, error);
           return;
         }
-        callback(nil, error);
-        return;
-      }
-      callback(response.verificationID, nil);
-    }];
+        callback(response.verificationID, nil);
+      }];
+    }
   }];
 }
 
@@ -436,7 +438,9 @@ - (void)reCAPTCHAURLWithEventID:(NSString *)eventID completion:(FIRReCAPTCHAURLC
     NSURLComponents *components = [[NSURLComponents alloc] initWithString:
       [NSString stringWithFormat:kReCAPTCHAURLStringFormat, authDomain]];
     [components setQueryItems:queryItems];
-    completion([components URL], nil);
+    if (completion) {
+      completion([components URL], nil);
+    }
   }];
 }
 

diff --git a/Firebase/Auth/Source/Public/FIRAuth.h b/Firebase/Auth/Source/Public/FIRAuth.h
@@ -818,8 +818,8 @@ DEPRECATED_MSG_ATTRIBUTE("Please use signInWithCredential:completion: for Object
 /** @fn getStoredUserForAccessGroup:error:
     @brief Get the stored user in the given accessGroup.
  */
-- (FIRUser *)getStoredUserForAccessGroup:(NSString *_Nullable)accessGroup
-                                   error:(NSError *_Nullable *_Nullable)outError;
+- (nullable FIRUser *)getStoredUserForAccessGroup:(NSString *_Nullable)accessGroup
+                                            error:(NSError *_Nullable *_Nullable)outError;
 
 @end
 

diff --git a/Firebase/Auth/Source/Storage/FIRAuthKeychain.h b/Firebase/Auth/Source/Storage/FIRAuthKeychain.h
@@ -72,7 +72,8 @@ NS_ASSUME_NONNULL_BEGIN
     @param outError The address to store any error that occurs during the process, if not nil.
     @return The item of the given query. nil if not exsit.
  */
-- (NSData *)getItemWithQuery:(NSDictionary *)query error:(NSError *_Nullable *_Nullable)outError;
+- (nullable NSData *)getItemWithQuery:(NSDictionary *)query
+                                error:(NSError *_Nullable *_Nullable)outError;
 
 /** @fn setItem:withQuery:error:
     @brief Set the item into keychain with given query.

diff --git a/Firebase/Auth/Source/Storage/FIRAuthKeychain.m b/Firebase/Auth/Source/Storage/FIRAuthKeychain.m
@@ -119,7 +119,7 @@ - (BOOL)removeDataForKey:(NSString *)key error:(NSError **_Nullable)error {
 
 #pragma mark - Private methods for non-sharing keychain operations
 
-- (NSData *)itemWithQuery:(NSDictionary *)query error:(NSError **_Nullable)error {
+- (nullable NSData *)itemWithQuery:(NSDictionary *)query error:(NSError **_Nullable)error {
   NSMutableDictionary *returningQuery = [query mutableCopy];
   returningQuery[(__bridge id)kSecReturnData] = @YES;
   returningQuery[(__bridge id)kSecReturnAttributes] = @YES;
@@ -233,7 +233,8 @@ - (NSDictionary *)legacyGenericPasswordQueryWithKey:(NSString *)key {
 
 #pragma mark - Private methods for shared keychain operations
 
-- (NSData *)getItemWithQuery:(NSDictionary *)query error:(NSError *_Nullable *_Nullable)outError {
+- (nullable NSData *)getItemWithQuery:(NSDictionary *)query
+                                error:(NSError *_Nullable *_Nullable)outError {
   NSMutableDictionary *mutableQuery = [query mutableCopy];
 
   mutableQuery[(__bridge id)kSecReturnData] = @YES;

diff --git a/Firebase/Auth/Source/Utilities/FIRAuthErrorUtils.m b/Firebase/Auth/Source/Utilities/FIRAuthErrorUtils.m
@@ -745,7 +745,10 @@ + (NSError *)errorWithCode:(FIRAuthInternalErrorCode)code
   if (isPublic) {
     // This is a public error. Return it as a public error and add a description.
     NSInteger errorCode = code & ~FIRAuthPublicErrorCodeFlag;
-    NSMutableDictionary *errorUserInfo = [NSMutableDictionary dictionaryWithDictionary:userInfo];
+    NSMutableDictionary *errorUserInfo = [NSMutableDictionary dictionary];
+    if (userInfo) {
+      [errorUserInfo addEntriesFromDictionary:userInfo];
+    }
     if (!errorUserInfo[NSLocalizedDescriptionKey]) {
       errorUserInfo[NSLocalizedDescriptionKey] = FIRAuthErrorDescription(errorCode);
     }