@react-native-firebase/app-check 26.4.0 → 27.1.0

package/plugin/build/ios/appDelegate.js

@@ -112,21 +112,20 @@ function modifySwiftAppDelegate(contents) {
     if (contents.includes('RNFBAppCheckModule.sharedInstance()')) {
         return contents;
     }
-    // Find the Firebase initialization end line to insert after
-    const firebaseLine = '// @generated end @react-native-firebase/app-didFinishLaunchingWithOptions';
-    if (contents.includes(firebaseLine)) {
-        // Insert right after Firebase initialization
-        return contents.replace(firebaseLine, `${firebaseLine}
-        RNFBAppCheckModule.sharedInstance()
-        FirebaseApp.configure()
-      `);
-    }
-    // If Firebase initialization block not found, register the App Check provider factory
-    // then call FirebaseApp.configure(). Firebase requires the factory before configure
-    // (AppCheck-AD-3); do not reverse this order.
+    // App plugin (or an earlier pass) already calls configure. The provider factory must
+    // run before that call. Do not append a second FirebaseApp.configure().
+    const existingConfigure = /^([ \t]*)FirebaseApp\.configure\(\)/m.exec(contents);
+    if (existingConfigure) {
+        const indent = existingConfigure[1];
+        return contents.replace(existingConfigure[0], `${indent}RNFBAppCheckModule.sharedInstance()\n${existingConfigure[0]}`);
+    }
+    // No configure yet. Register the factory, then configure. Firebase requires the
+    // factory before configure (AppCheck-AD-3). Expo 58 scene AppDelegates start
+    // React Native from SceneDelegate, so the anchor is the didFinishLaunching return
+    // rather than factory.startReactNative.
     const methodInvocationBlock = `RNFBAppCheckModule.sharedInstance()
     FirebaseApp.configure()`;
-    const methodInvocationLineMatcher = /(?:factory\.startReactNative\()/;
+    const methodInvocationLineMatcher = /(?:factory\.startReactNative\()|(?:return\s+super\.application\(\s*application\s*,\s*didFinishLaunchingWithOptions:\s*launchOptions\s*\))/;
     if (!methodInvocationLineMatcher.test(contents)) {
         config_plugins_1.WarningAggregator.addWarningIOS('@react-native-firebase/app-check', 'Unable to determine correct insertion point in AppDelegate.swift. Skipping App Check addition.');
         return contents;

package/plugin/src/ios/appDelegate.ts

@@ -127,27 +127,26 @@ export function modifySwiftAppDelegate(contents: string): string {
     return contents;
   }
 
-  // Find the Firebase initialization end line to insert after
-  const firebaseLine = '// @generated end @react-native-firebase/app-didFinishLaunchingWithOptions';
-
-  if (contents.includes(firebaseLine)) {
-    // Insert right after Firebase initialization
+  // App plugin (or an earlier pass) already calls configure. The provider factory must
+  // run before that call. Do not append a second FirebaseApp.configure().
+  const existingConfigure = /^([ \t]*)FirebaseApp\.configure\(\)/m.exec(contents);
+  if (existingConfigure) {
+    const indent = existingConfigure[1];
     return contents.replace(
-      firebaseLine,
-      `${firebaseLine}
-        RNFBAppCheckModule.sharedInstance()
-        FirebaseApp.configure()
-      `,
+      existingConfigure[0],
+      `${indent}RNFBAppCheckModule.sharedInstance()\n${existingConfigure[0]}`,
     );
   }
 
-  // If Firebase initialization block not found, register the App Check provider factory
-  // then call FirebaseApp.configure(). Firebase requires the factory before configure
-  // (AppCheck-AD-3); do not reverse this order.
+  // No configure yet. Register the factory, then configure. Firebase requires the
+  // factory before configure (AppCheck-AD-3). Expo 58 scene AppDelegates start
+  // React Native from SceneDelegate, so the anchor is the didFinishLaunching return
+  // rather than factory.startReactNative.
   const methodInvocationBlock = `RNFBAppCheckModule.sharedInstance()
     FirebaseApp.configure()`;
 
-  const methodInvocationLineMatcher = /(?:factory\.startReactNative\()/;
+  const methodInvocationLineMatcher =
+    /(?:factory\.startReactNative\()|(?:return\s+super\.application\(\s*application\s*,\s*didFinishLaunchingWithOptions:\s*launchOptions\s*\))/;
 
   if (!methodInvocationLineMatcher.test(contents)) {
     WarningAggregator.addWarningIOS(

package/android/src/main/java/io/invertase/firebase/appcheck/RNFBAppCheckListenerRegistry.java

@@ -1,76 +0,0 @@
-package io.invertase.firebase.appcheck;
-
-/*
- * Copyright (c) 2016-present Invertase Limited & Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this library except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import io.invertase.firebase.common.RNFBHandleCollisionException;
-import io.invertase.firebase.common.RNFBHandleMap;
-import java.util.List;
-
-/**
- * App Check token listener map. Unique {@link #put} / {@link #putOrDiscard}; callers {@link #take}
- * or {@link #takeAllAndRemove} then {@code remove()} outside the HandleMap lock. Skip-if-registered
- * is {@code get(appName) != null}.
- */
-final class RNFBAppCheckListenerRegistry {
-  private final RNFBHandleMap<String, AppCheckListenerHandle> map = new RNFBHandleMap<>();
-
-  void put(String appName, AppCheckListenerHandle handle) throws RNFBHandleCollisionException {
-    map.put(appName, handle);
-  }
-
-  /**
-   * Unique put. On collision, {@code remove()} the incoming handle and leave the existing mapping.
-   *
-   * @return true if stored
-   */
-  boolean putOrDiscard(String appName, AppCheckListenerHandle handle) {
-    try {
-      map.put(appName, handle);
-      return true;
-    } catch (RNFBHandleCollisionException collision) {
-      if (handle != null) {
-        handle.remove();
-      }
-      return false;
-    }
-  }
-
-  AppCheckListenerHandle get(String appName) {
-    return map.get(appName);
-  }
-
-  AppCheckListenerHandle take(String appName) {
-    return map.take(appName);
-  }
-
-  void takeAndRemove(String appName) {
-    AppCheckListenerHandle handle = map.take(appName);
-    if (handle != null) {
-      handle.remove();
-    }
-  }
-
-  void takeAllAndRemove() {
-    List<AppCheckListenerHandle> remaining = map.takeAll();
-    for (AppCheckListenerHandle handle : remaining) {
-      if (handle != null) {
-        handle.remove();
-      }
-    }
-  }
-}