@react-native-firebase/auth 26.4.0 → 27.0.0

package/plugin/src/ios/sceneLifecycle.ts

@@ -0,0 +1,134 @@
+import fs from 'fs';
+import path from 'path';
+
+// Directories that never contain the app's own scene delegate but are expensive to walk.
+const IGNORED_DIRECTORIES = new Set(['Pods', 'build', 'node_modules', 'DerivedData', '.git']);
+
+const APP_DELEGATE_NAMES = new Set(['AppDelegate.swift', 'AppDelegate.m', 'AppDelegate.mm']);
+
+export type SceneDelegateResolution =
+  | { kind: 'found'; path: string }
+  | { kind: 'missing' }
+  | { kind: 'ambiguous'; candidates: string[] };
+
+/**
+ * Walk `platformProjectRoot` (typically `ios/`) and collect matching file paths, skipping
+ * CocoaPods / build / Xcode bundle trees.
+ */
+function collectFilesNamed(
+  platformProjectRoot: string,
+  fileNamePredicate: (name: string) => boolean,
+): string[] {
+  if (!platformProjectRoot || !fs.existsSync(platformProjectRoot)) {
+    return [];
+  }
+
+  const matches: string[] = [];
+  const queue: string[] = [platformProjectRoot];
+  while (queue.length > 0) {
+    const directory = queue.shift() as string;
+
+    let entries: fs.Dirent[];
+    try {
+      entries = fs.readdirSync(directory, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+
+    for (const entry of entries) {
+      const entryPath = path.join(directory, entry.name);
+      if (entry.isDirectory()) {
+        if (
+          !IGNORED_DIRECTORIES.has(entry.name) &&
+          !entry.name.endsWith('.xcodeproj') &&
+          !entry.name.endsWith('.xcworkspace')
+        ) {
+          queue.push(entryPath);
+        }
+      } else if (fileNamePredicate(entry.name)) {
+        matches.push(entryPath);
+      }
+    }
+  }
+
+  return matches.sort();
+}
+
+/**
+ * Resolve the application target's `SceneDelegate.swift` deterministically.
+ *
+ * - Zero candidates → missing.
+ * - Exactly one candidate → that file (Expo nested layout or bare-expo `ios/` root).
+ * - Multiple candidates → prefer the one co-located with an `AppDelegate.*`; if that is not
+ *   unique, reject as ambiguous rather than patching a distractor (extension / secondary target).
+ */
+export function resolveSceneDelegateFile(platformProjectRoot: string): SceneDelegateResolution {
+  const candidates = collectFilesNamed(platformProjectRoot, name => name === 'SceneDelegate.swift');
+  if (candidates.length === 0) {
+    return { kind: 'missing' };
+  }
+  if (candidates.length === 1) {
+    return { kind: 'found', path: candidates[0] };
+  }
+
+  const appDelegateDirs = new Set(
+    collectFilesNamed(platformProjectRoot, name => APP_DELEGATE_NAMES.has(name)).map(p =>
+      path.dirname(p),
+    ),
+  );
+  const coLocated = candidates.filter(candidate => appDelegateDirs.has(path.dirname(candidate)));
+  if (coLocated.length === 1) {
+    return { kind: 'found', path: coLocated[0] };
+  }
+
+  return { kind: 'ambiguous', candidates };
+}
+
+/**
+ * Locate the app's `SceneDelegate.swift`, or `null` when none exists or resolution is ambiguous.
+ *
+ * Expo SDK 58 writes it next to `AppDelegate.swift` (`ios/<ProjectName>/SceneDelegate.swift`), but
+ * `apps/bare-expo` keeps it at `ios/SceneDelegate.swift`, so search rather than assume a layout.
+ */
+export function findSceneDelegateFile(platformProjectRoot: string): string | null {
+  const resolution = resolveSceneDelegateFile(platformProjectRoot);
+  return resolution.kind === 'found' ? resolution.path : null;
+}
+
+/**
+ * Detect a `UIApplicationSceneManifest` entry in the app's `Info.plist`.
+ *
+ * Independent of `findSceneDelegateFile`: a project can declare the scene life cycle without shipping
+ * a `SceneDelegate.swift` the plugin can patch, and callers need to tell the two cases apart.
+ */
+export function infoPlistDeclaresSceneManifest(platformProjectRoot: string): boolean {
+  if (!platformProjectRoot) {
+    return false;
+  }
+
+  let entries: fs.Dirent[];
+  try {
+    entries = fs.readdirSync(platformProjectRoot, { withFileTypes: true });
+  } catch {
+    return false;
+  }
+
+  for (const entry of entries) {
+    if (!entry.isDirectory() || IGNORED_DIRECTORIES.has(entry.name)) {
+      continue;
+    }
+    const infoPlist = path.join(platformProjectRoot, entry.name, 'Info.plist');
+    try {
+      if (
+        fs.existsSync(infoPlist) &&
+        fs.readFileSync(infoPlist, 'utf-8').includes('UIApplicationSceneManifest')
+      ) {
+        return true;
+      }
+    } catch {
+      continue;
+    }
+  }
+
+  return false;
+}

package/plugin/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/app.plugin.ts","./src/index.ts","./src/pluginconfig.ts","./src/ios/index.ts","./src/ios/openurlfix.ts","./src/ios/urltypes.ts"],"version":"6.0.3"}
+{"root":["./src/app.plugin.ts","./src/index.ts","./src/pluginconfig.ts","./src/ios/index.ts","./src/ios/openurlfix.ts","./src/ios/scenedelegate.ts","./src/ios/scenelifecycle.ts","./src/ios/urltypes.ts"],"version":"6.0.3"}

package/android/src/main/java/io/invertase/firebase/auth/RNFBAuthCacheRegistry.java

@@ -1,66 +0,0 @@
-package io.invertase.firebase.auth;
-
-/*
- * 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;
-
-/**
- * Credential / MFA cache map (data only — no SDK cancel). Unique {@link #put}; callers that
- * previously HashMap-upserted use {@link #putReplacing} (atomic last wins). Peek with {@link #get};
- * remove with {@link #take}; invalidate with {@link #clear}.
- *
- * <p><strong>Collision vs prior HashMap.put upsert:</strong> unique {@link #put} throws; replace at
- * call sites is {@link #putReplacing} (last wins). {@link #putOrDiscard} keeps the first mapping.
- */
-final class RNFBAuthCacheRegistry<V> {
-  private final RNFBHandleMap<String, V> map = new RNFBHandleMap<>();
-
-  void put(String key, V value) throws RNFBHandleCollisionException {
-    map.put(key, value);
-  }
-
-  /**
-   * Unique put. On collision, leave the existing mapping and discard the incoming value (data
-   * only).
-   *
-   * @return true if stored
-   */
-  boolean putOrDiscard(String key, V value) {
-    return map.putIfAbsent(key, value);
-  }
-
-  /**
-   * Atomic replace (last wins). Preserves prior HashMap {@code put} upsert. Taken value discarded.
-   */
-  void putReplacing(String key, V value) {
-    map.putReplacing(key, value);
-  }
-
-  V get(String key) {
-    return map.get(key);
-  }
-
-  V take(String key) {
-    return map.take(key);
-  }
-
-  void clear() {
-    map.takeAll();
-  }
-}

package/android/src/main/java/io/invertase/firebase/auth/RNFBAuthListenerRegistry.java

@@ -1,76 +0,0 @@
-package io.invertase.firebase.auth;
-
-/*
- * 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;
-
-/**
- * Auth-state / id-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 RNFBAuthListenerRegistry {
-  private final RNFBHandleMap<String, AuthListenerHandle> map = new RNFBHandleMap<>();
-
-  void put(String appName, AuthListenerHandle 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, AuthListenerHandle handle) {
-    try {
-      map.put(appName, handle);
-      return true;
-    } catch (RNFBHandleCollisionException collision) {
-      if (handle != null) {
-        handle.remove();
-      }
-      return false;
-    }
-  }
-
-  AuthListenerHandle get(String appName) {
-    return map.get(appName);
-  }
-
-  AuthListenerHandle take(String appName) {
-    return map.take(appName);
-  }
-
-  void takeAndRemove(String appName) {
-    AuthListenerHandle handle = map.take(appName);
-    if (handle != null) {
-      handle.remove();
-    }
-  }
-
-  void takeAllAndRemove() {
-    List<AuthListenerHandle> remaining = map.takeAll();
-    for (AuthListenerHandle handle : remaining) {
-      if (handle != null) {
-        handle.remove();
-      }
-    }
-  }
-}