Fix for an exception in firebase::auth::VerifyPhoneNumber for applications recreating app instances.

Fix is to plumb clientID through the PlatformOptions to AppOptions (and vice versa) on iOS. The lack of a configured clientID was causing a NSInternalInconsistencyException in FIROAuthProvider getCredentialWithUIDelegate.

PiperOrigin-RevId: 262248021

Author: Googler

app/src/app_ios.mm

@@ -85,6 +85,10 @@ static void PlatformOptionsToAppOptions(FIROptions* platform_options,
     NSString* value = platform_options.projectID;
     if (value) app_options->set_project_id(value.UTF8String);
   }
+  if (!strlen(app_options->client_id())) {
+    const char* value = platform_options.clientID.UTF8String;
+    if (value) app_options->set_client_id(value);
+  }
 }
 
 // Copy AppOptions into a FIROptions instance.
@@ -115,6 +119,9 @@ static void PlatformOptionsToAppOptions(FIROptions* platform_options,
   if (strlen(app_options.project_id())) {
     platform_options.projectID = @(app_options.project_id());
   }
+  if (strlen(app_options.client_id())) {
+    platform_options.clientID = @(app_options.client_id());
+  }
   return platform_options;
 }
 

app/src/include/firebase/app.h

@@ -291,6 +291,18 @@ class AppOptions {
   /// </SWIG>
   const char* project_id() const { return project_id_.c_str(); }
 
+#if INTERNAL_EXPERIMENTAL
+  /// @brief set the iOS client ID.
+  ///
+  /// This is the clientID in the GoogleService-Info.plist.
+  void set_client_id(const char* client_id) { client_id_ = client_id; }
+
+  /// @brief Get the iOS client ID.
+  ///
+  /// This is the client_id in the GoogleService-Info.plist.
+  const char* client_id() const { return client_id_.c_str(); }
+#endif  // INTERNAL_EXPERIMENTAL
+
 #ifdef INTERNAL_EXPERIMENTAL
   /// @brief Set the Android or iOS client project name.
   ///
@@ -412,6 +424,8 @@ class AppOptions {
   std::string api_key_;
   /// ID of the app.
   std::string app_id_;
+  /// ClientID of the app.
+  std::string client_id_;
   /// Database root URL.
   std::string database_url_;
   /// Google analytics tracking ID.