@react-native-firebase/app 18.7.3 → 18.8.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [18.8.0](https://github.com/invertase/react-native-firebase/compare/v18.7.3...v18.8.0) (2024-01-25)
+
+### Features
+
+- **auth, authDomain:** implement FirebaseOptions.authDomain on Auth ([a1f4710](https://github.com/invertase/react-native-firebase/commit/a1f471029352b7597d7e83a8c1ea06145768cf89))
+
+### Bug Fixes
+
+- **app:** firebase-ios-sdk 10.20.0 / firebase-android-sdk 32.7.1 ([8d3c3a0](https://github.com/invertase/react-native-firebase/commit/8d3c3a02689d8ec7dd7d705adb941808039cdd50))
+
 ## [18.7.3](https://github.com/invertase/react-native-firebase/compare/v18.7.2...v18.7.3) (2023-12-13)
 
 ### Bug Fixes

package/android/src/reactnative/java/io/invertase/firebase/app/ReactNativeFirebaseAppModule.java

@@ -17,6 +17,7 @@ package io.invertase.firebase.app;
  *
  */
 
+import android.util.Log;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
@@ -38,6 +39,8 @@ import java.util.Map;
 public class ReactNativeFirebaseAppModule extends ReactNativeFirebaseModule {
   private static final String TAG = "App";
 
+  public static Map<String, String> authDomains = new HashMap<>();
+
   ReactNativeFirebaseAppModule(ReactApplicationContext reactContext) {
     super(reactContext, TAG);
   }
@@ -52,11 +55,22 @@ public class ReactNativeFirebaseAppModule extends ReactNativeFirebaseModule {
   public void initializeApp(ReadableMap options, ReadableMap appConfig, Promise promise) {
     FirebaseApp firebaseApp =
         RCTConvertFirebase.readableMapToFirebaseApp(options, appConfig, getContext());
+    ReactNativeFirebaseAppModule.configureAuthDomain(
+        appConfig.getString("name"), options.getString("authDomain"));
 
     WritableMap firebaseAppMap = RCTConvertFirebase.firebaseAppToWritableMap(firebaseApp);
     promise.resolve(firebaseAppMap);
   }
 
+  public static void configureAuthDomain(String name, String authDomain) {
+    if (authDomain != null) {
+      Log.d(TAG, name + " custom authDomain " + authDomain);
+      authDomains.put(name, authDomain);
+    } else {
+      authDomains.remove(name);
+    }
+  }
+
   @ReactMethod
   public void setAutomaticDataCollectionEnabled(String appName, Boolean enabled) {
     FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);

package/android/src/reactnative/java/io/invertase/firebase/app/ReactNativeFirebaseVersion.java

@@ -18,5 +18,5 @@ package io.invertase.firebase.app;
  */
 // generated file - do not modify or commit
 public class ReactNativeFirebaseVersion {
-  public static String VERSION = "18.7.3";
+  public static String VERSION = "18.8.0";
 }

package/android/src/reactnative/java/io/invertase/firebase/common/RCTConvertFirebase.java

@@ -25,6 +25,7 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
+import io.invertase.firebase.app.ReactNativeFirebaseAppModule;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,6 +57,10 @@ public class RCTConvertFirebase {
     options.put("messagingSenderId", appOptions.getGcmSenderId());
     options.put("storageBucket", appOptions.getStorageBucket());
 
+    if (ReactNativeFirebaseAppModule.authDomains.get(name) != null) {
+      options.put("authDomain", ReactNativeFirebaseAppModule.authDomains.get(name));
+    }
+
     root.put("options", options);
     root.put("appConfig", appConfig);
 

package/ios/RNFBApp/RNFBAppModule.h

@@ -21,6 +21,8 @@
 
 @interface RNFBAppModule : NSObject <RCTBridgeModule>
 
++ (NSString *)getCustomDomain:(NSString *)appName;
+
 - (void)setLogLevel:(NSString *)logLevel;
 
 @end

package/ios/RNFBApp/RNFBAppModule.m

@@ -168,7 +168,7 @@ RCT_EXPORT_METHOD(removeListeners : (NSInteger)count) {
 #pragma mark Firebase App Methods
 
 RCT_EXPORT_METHOD(initializeApp
-                  : (FIROptions *)firOptions appConfig
+                  : (NSDictionary *)options appConfig
                   : (NSDictionary *)appConfig resolver
                   : (RCTPromiseResolveBlock)resolve rejecter
                   : (RCTPromiseRejectBlock)reject) {
@@ -176,6 +176,44 @@ RCT_EXPORT_METHOD(initializeApp
     FIRApp *firApp;
     NSString *appName = [appConfig valueForKey:@"name"];
 
+    NSString *appId = [options valueForKey:@"appId"];
+    NSString *messagingSenderId = [options valueForKey:@"messagingSenderId"];
+    FIROptions *firOptions = [[FIROptions alloc] initWithGoogleAppID:appId
+                                                         GCMSenderID:messagingSenderId];
+    firOptions.APIKey = [options valueForKey:@"apiKey"];
+    firOptions.projectID = [options valueForKey:@"projectId"];
+    // kFirebaseOptionsDatabaseUrl
+    if (![[options valueForKey:@"databaseURL"] isEqual:[NSNull null]]) {
+      firOptions.databaseURL = [options valueForKey:@"databaseURL"];
+    }
+    // kFirebaseOptionsStorageBucket
+    if (![[options valueForKey:@"storageBucket"] isEqual:[NSNull null]]) {
+      firOptions.storageBucket = [options valueForKey:@"storageBucket"];
+    }
+    // kFirebaseOptionsDeepLinkURLScheme
+    if (![[options valueForKey:@"deepLinkURLScheme"] isEqual:[NSNull null]]) {
+      firOptions.deepLinkURLScheme = [options valueForKey:@"deepLinkURLScheme"];
+    }
+    // kFirebaseOptionsIosBundleId
+    if (![[options valueForKey:@"iosBundleId"] isEqual:[NSNull null]]) {
+      firOptions.bundleID = [options valueForKey:@"iosBundleId"];
+    }
+    // kFirebaseOptionsIosClientId
+    if (![[options valueForKey:@"iosClientId"] isEqual:[NSNull null]]) {
+      firOptions.clientID = [options valueForKey:@"iosClientId"];
+    }
+    // kFirebaseOptionsAppGroupId
+    if (![[options valueForKey:@"appGroupId"] isEqual:[NSNull null]]) {
+      firOptions.appGroupID = [options valueForKey:@"appGroupId"];
+    }
+
+    if ([options valueForKey:@"authDomain"] != nil) {
+      DLog(@"RNFBAuth app: %@ customAuthDomain: %@", appName, [options valueForKey:@"authDomain"]);
+      if (customAuthDomains == nil) {
+        customAuthDomains = [[NSMutableDictionary alloc] init];
+      }
+      customAuthDomains[appName] = [options valueForKey:@"authDomain"];
+    }
     @try {
       if (!appName || [appName isEqualToString:DEFAULT_APP_DISPLAY_NAME]) {
         [FIRApp configureWithOptions:firOptions];
@@ -195,6 +233,13 @@ RCT_EXPORT_METHOD(initializeApp
   });
 }
 
+static NSMutableDictionary<NSString *, NSString *> *customAuthDomains;
+
++ (NSString *)getCustomDomain:(NSString *)appName {
+  DLog(@"authDomains: %@", customAuthDomains);
+  return customAuthDomains[appName];
+}
+
 RCT_EXPORT_METHOD(setLogLevel : (NSString *)logLevel) {
   int level = FIRLoggerLevelError;
   if ([logLevel isEqualToString:@"verbose"]) {

package/ios/RNFBApp/RNFBSharedUtils.m

@@ -16,6 +16,7 @@
  */
 
 #import "RNFBSharedUtils.h"
+#import "RNFBAppModule.h"
 #import "RNFBJSON.h"
 #import "RNFBMeta.h"
 #import "RNFBPreferences.h"
@@ -65,6 +66,10 @@ static NSString *const RNFBErrorDomain = @"RNFBErrorDomain";
   firAppOptions[@"clientId"] = firOptions.clientID;
   firAppOptions[@"androidClientID"] = firOptions.androidClientID;
   firAppOptions[@"deepLinkUrlScheme"] = firOptions.deepLinkURLScheme;
+  // not in FIROptions API but in JS SDK and project config JSON
+  if ([RNFBAppModule getCustomDomain:name] != nil) {
+    firAppOptions[@"authDomain"] = [RNFBAppModule getCustomDomain:name];
+  }
 
   firAppDictionary[@"options"] = firAppOptions;
   firAppDictionary[@"appConfig"] = firAppConfig;

package/ios/RNFBApp/RNFBVersion.m

@@ -18,4 +18,4 @@
 #import <React/RCTVersion.h>
 
 // generated file - do not modify or commit
-NSString* const RNFBVersionString = @"18.7.3";
+NSString* const RNFBVersionString = @"18.8.0";

package/lib/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-module.exports = '18.7.3';
+module.exports = '18.8.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/app",
-  "version": "18.7.3",
+  "version": "18.8.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "A well tested, feature rich Firebase implementation for React Native, supporting iOS & Android. Individual module support for Admob, Analytics, Auth, Crash Reporting, Cloud Firestore, Database, Dynamic Links, Functions, Messaging (FCM), Remote Config, Storage and more.",
   "main": "lib/index.js",
@@ -73,7 +73,7 @@
   },
   "sdkVersions": {
     "ios": {
-      "firebase": "10.19.0",
+      "firebase": "10.20.0",
       "iosTarget": "11.0",
       "macosTarget": "10.13"
     },
@@ -81,12 +81,12 @@
       "minSdk": 19,
       "targetSdk": 33,
       "compileSdk": 33,
-      "firebase": "32.7.0",
+      "firebase": "32.7.1",
       "firebaseCrashlyticsGradle": "2.9.9",
       "firebasePerfGradle": "1.4.2",
       "gmsGoogleServicesGradle": "4.4.0",
       "playServicesAuth": "20.7.0"
     }
   },
-  "gitHead": "605a0df8171c451513125629355027bda2ea5e5d"
+  "gitHead": "970756d733e1c4642b53d91c5b1b8f58a8f5dbc0"
 }