Set updated credential on iOS Auth errors (#1381)

* Set updated credential on iOS Auth errors

* Add additional null checks

Author: a-maurice

auth/src/ios/auth_ios.mm

@@ -343,6 +343,15 @@ void AuthResultCallback(FIRAuthDataResult *_Nullable fir_auth_result, NSError *_
     }
   }
 
+  // If there is an error, and it has an updated credential, pass that along via the result.
+  if (error != nullptr && error.userInfo != nullptr) {
+    if (error.userInfo[FIRAuthErrorUserInfoUpdatedCredentialKey] != nullptr) {
+      result.additional_user_info.updated_credential =
+          ServiceUpdatedCredentialProvider::GetCredential(new FIRAuthCredentialPointer(
+              error.userInfo[FIRAuthErrorUserInfoUpdatedCredentialKey]));
+    }
+  }
+
   ReferenceCountedFutureImpl &futures = auth_data->future_impl;
   futures.CompleteWithResult(handle, AuthErrorFromNSError(error),
                              util::NSStringToString(error.localizedDescription).c_str(), result);
@@ -353,6 +362,16 @@ void AuthResultCallback(FIRUser *_Nullable user, NSError *_Nullable error,
   User *current_user = AssignUser(user, auth_data);
   AuthResult auth_result;
   if (current_user != nullptr) auth_result.user = *current_user;
+
+  // If there is an error, and it has an updated credential, pass that along via the result.
+  if (error != nullptr && error.userInfo != nullptr) {
+    if (error.userInfo[FIRAuthErrorUserInfoUpdatedCredentialKey] != nullptr) {
+      auth_result.additional_user_info.updated_credential =
+          ServiceUpdatedCredentialProvider::GetCredential(new FIRAuthCredentialPointer(
+              error.userInfo[FIRAuthErrorUserInfoUpdatedCredentialKey]));
+    }
+  }
+
   ReferenceCountedFutureImpl &futures = auth_data->future_impl;
   futures.CompleteWithResult(handle, AuthErrorFromNSError(error),
                              util::NSStringToString(error.localizedDescription).c_str(),
@@ -414,7 +433,7 @@ void SignInResultCallback(FIRAuthDataResult *_Nullable auth_result, NSError *_Nu
     util::NSDictionaryToStdMap(auth_result.additionalUserInfo.profile, &result.info.profile);
   }
 
-  if (error.userInfo != nullptr) {
+  if (error != nullptr && error.userInfo != nullptr) {
     if (error.userInfo[FIRAuthErrorUserInfoUpdatedCredentialKey] != nullptr) {
       result.info.updated_credential = ServiceUpdatedCredentialProvider::GetCredential(
           new FIRAuthCredentialPointer(error.userInfo[FIRAuthErrorUserInfoUpdatedCredentialKey]));

release_build_files/readme.md

@@ -631,6 +631,8 @@ code.
 -   Changes
     - Auth (Android): Fixed an issue where VerifyPhoneNumber's internal
       builder failed to create PhoneAuthOptions with certain compiler settings.
+    - Auth (iOS): Fixed an issue where functions that return AuthResult
+      were not including updated credentials when encountering errors.
     - Remote Config (Desktop): Additional fix for handling of non-English time
       zone names on Windows.