@react-native-firebase/app-check 26.3.3 → 26.4.1

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.
 
+## [26.4.1](https://github.com/invertase/react-native-firebase/compare/v26.4.0...v26.4.1) (2026-10-23)
+
+**Note:** Version bump only for package @react-native-firebase/app-check
+
+## [26.4.0](https://github.com/invertase/react-native-firebase/compare/v26.3.3...v26.4.0) (2026-09-05)
+
+### Bug Fixes
+
+- **app-check:** use RNFBHandleMap for app-check listeners ([b77e645](https://github.com/invertase/react-native-firebase/commit/b77e645cc2b251a6c46314106a2aa9a88b5b808b))
+
 ## [26.3.3](https://github.com/invertase/react-native-firebase/compare/v26.3.2...v26.3.3) (2026-09-01)
 
 ### Reverts

package/android/build.gradle

@@ -103,6 +103,8 @@ dependencies {
   implementation platform("com.google.firebase:firebase-bom:${ReactNative.ext.getVersion('firebase', 'bom')}")
   implementation 'com.google.firebase:firebase-appcheck-playintegrity'
   implementation "com.google.firebase:firebase-appcheck-debug"
+
+  testImplementation "junit:junit:4.13.2"
 }
 
 ReactNative.shared.applyPackageVersion()

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

@@ -0,0 +1,26 @@
+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.
+ *
+ */
+
+/**
+ * Detach surface stored in {@link RNFBAppCheckListenerRegistry}. Invoked after {@code get}/{@code
+ * take}/{@code takeAll}, never under the HandleMap lock.
+ */
+interface AppCheckListenerHandle {
+  void remove();
+}

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

@@ -36,9 +36,6 @@ import io.invertase.firebase.common.ReactNativeFirebaseJSON;
 import io.invertase.firebase.common.ReactNativeFirebaseMeta;
 import io.invertase.firebase.common.ReactNativeFirebasePreferences;
 import io.invertase.firebase.common.TaskExecutorService;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 import java.util.concurrent.ExecutorService;
 
 public class NativeRNFBTurboAppCheck extends NativeRNFBTurboAppCheckSpec {
@@ -46,8 +43,8 @@ public class NativeRNFBTurboAppCheck extends NativeRNFBTurboAppCheckSpec {
   private static final String LOGTAG = "RNFBAppCheck";
   private static final String KEY_APPCHECK_TOKEN_REFRESH_ENABLED = "app_check_token_auto_refresh";
 
-  private static HashMap<String, FirebaseAppCheck.AppCheckListener> mAppCheckListeners =
-      new HashMap<>();
+  private static final RNFBAppCheckListenerRegistry appCheckListeners =
+      new RNFBAppCheckListenerRegistry();
 
   private final TaskExecutorService executorService;
   private final ReactNativeFirebaseAppCheckProviderFactory providerFactory =
@@ -116,18 +113,7 @@ public class NativeRNFBTurboAppCheck extends NativeRNFBTurboAppCheckSpec {
     super.invalidate();
     Log.d(TAG, "instance-destroyed");
 
-    Iterator appCheckListenerIterator = mAppCheckListeners.entrySet().iterator();
-
-    while (appCheckListenerIterator.hasNext()) {
-      Map.Entry pair = (Map.Entry) appCheckListenerIterator.next();
-      String appName = (String) pair.getKey();
-      FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
-      FirebaseAppCheck firebaseAppCheck = FirebaseAppCheck.getInstance(firebaseApp);
-      FirebaseAppCheck.AppCheckListener mAppCheckListener =
-          (FirebaseAppCheck.AppCheckListener) pair.getValue();
-      firebaseAppCheck.removeAppCheckListener(mAppCheckListener);
-      appCheckListenerIterator.remove();
-    }
+    appCheckListeners.takeAllAndRemove();
 
     executorService.shutdown();
   }
@@ -256,38 +242,32 @@ public class NativeRNFBTurboAppCheck extends NativeRNFBTurboAppCheckSpec {
     FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
     FirebaseAppCheck firebaseAppCheck = FirebaseAppCheck.getInstance(firebaseApp);
 
-    if (mAppCheckListeners.get(appName) == null) {
-      FirebaseAppCheck.AppCheckListener newAppCheckListener =
-          appCheckToken -> {
-            WritableMap eventBody = Arguments.createMap();
-            eventBody.putString("appName", appName);
-            eventBody.putString("token", appCheckToken.getToken());
-            eventBody.putDouble("expireTimeMillis", appCheckToken.getExpireTimeMillis());
-
-            ReactNativeFirebaseEventEmitter emitter =
-                ReactNativeFirebaseEventEmitter.getSharedInstance();
-            ReactNativeFirebaseEvent event =
-                new ReactNativeFirebaseEvent("appCheck_token_changed", eventBody, appName);
-            emitter.sendEvent(event);
-          };
-
-      firebaseAppCheck.addAppCheckListener(newAppCheckListener);
-      mAppCheckListeners.put(appName, newAppCheckListener);
+    if (appCheckListeners.get(appName) != null) {
+      return;
     }
+
+    FirebaseAppCheck.AppCheckListener newAppCheckListener =
+        appCheckToken -> {
+          WritableMap eventBody = Arguments.createMap();
+          eventBody.putString("appName", appName);
+          eventBody.putString("token", appCheckToken.getToken());
+          eventBody.putDouble("expireTimeMillis", appCheckToken.getExpireTimeMillis());
+
+          ReactNativeFirebaseEventEmitter emitter =
+              ReactNativeFirebaseEventEmitter.getSharedInstance();
+          ReactNativeFirebaseEvent event =
+              new ReactNativeFirebaseEvent("appCheck_token_changed", eventBody, appName);
+          emitter.sendEvent(event);
+        };
+
+    firebaseAppCheck.addAppCheckListener(newAppCheckListener);
+    appCheckListeners.putOrDiscard(
+        appName, () -> firebaseAppCheck.removeAppCheckListener(newAppCheckListener));
   }
 
   @Override
   public void removeAppCheckListener(String appName) {
     Log.d(TAG, "removeAppCheckListener " + appName);
-
-    FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
-    FirebaseAppCheck firebaseAppCheck = FirebaseAppCheck.getInstance(firebaseApp);
-
-    FirebaseAppCheck.AppCheckListener mAppCheckListener = mAppCheckListeners.get(appName);
-
-    if (mAppCheckListener != null) {
-      firebaseAppCheck.removeAppCheckListener(mAppCheckListener);
-      mAppCheckListeners.remove(appName);
-    }
+    appCheckListeners.takeAndRemove(appName);
   }
 }

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

@@ -0,0 +1,76 @@
+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();
+      }
+    }
+  }
+}

package/android/src/test/java/io/invertase/firebase/appcheck/RNFBAppCheckListenerRegistryTest.java

@@ -0,0 +1,171 @@
+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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import io.invertase.firebase.common.RNFBHandleCollisionException;
+import org.junit.Test;
+
+/**
+ * JVM coverage for {@link RNFBAppCheckListenerRegistry}. Does not instantiate {@code
+ * NativeRNFBTurboAppCheck} (React Native / Firebase) — D12.
+ */
+public class RNFBAppCheckListenerRegistryTest {
+
+  private static final class FakeHandle implements AppCheckListenerHandle {
+    int removeCount;
+
+    @Override
+    public void remove() {
+      removeCount++;
+    }
+  }
+
+  @Test
+  public void putGetTake_happyPath() throws Exception {
+    RNFBAppCheckListenerRegistry registry = new RNFBAppCheckListenerRegistry();
+    FakeHandle handle = new FakeHandle();
+    registry.put("app", handle);
+    assertSame(handle, registry.get("app"));
+    assertSame(handle, registry.take("app"));
+    assertNull(registry.get("app"));
+    assertEquals(0, handle.removeCount);
+  }
+
+  @Test
+  public void put_occupiedId_throwsCollision() throws Exception {
+    RNFBAppCheckListenerRegistry registry = new RNFBAppCheckListenerRegistry();
+    FakeHandle first = new FakeHandle();
+    registry.put("app", first);
+    try {
+      registry.put("app", new FakeHandle());
+      fail("expected RNFBHandleCollisionException");
+    } catch (RNFBHandleCollisionException e) {
+      assertTrue(e.getMessage().contains("app"));
+      assertSame(first, registry.get("app"));
+    }
+  }
+
+  @Test
+  public void get_whenFree_isNull() {
+    RNFBAppCheckListenerRegistry registry = new RNFBAppCheckListenerRegistry();
+    assertNull(registry.get("app"));
+  }
+
+  @Test
+  public void get_whenOccupied_returnsHandle() throws Exception {
+    RNFBAppCheckListenerRegistry registry = new RNFBAppCheckListenerRegistry();
+    FakeHandle first = new FakeHandle();
+    registry.put("app", first);
+    assertSame(first, registry.get("app"));
+  }
+
+  @Test
+  public void putOrDiscard_collision_removesIncoming() throws Exception {
+    RNFBAppCheckListenerRegistry registry = new RNFBAppCheckListenerRegistry();
+    FakeHandle first = new FakeHandle();
+    FakeHandle duplicate = new FakeHandle();
+    registry.put("app", first);
+    assertFalse(registry.putOrDiscard("app", duplicate));
+    assertEquals(1, duplicate.removeCount);
+    assertEquals(0, first.removeCount);
+    assertSame(first, registry.get("app"));
+  }
+
+  @Test
+  public void putOrDiscard_storesWhenFree() {
+    RNFBAppCheckListenerRegistry registry = new RNFBAppCheckListenerRegistry();
+    FakeHandle handle = new FakeHandle();
+    assertTrue(registry.putOrDiscard("app", handle));
+    assertSame(handle, registry.get("app"));
+    assertEquals(0, handle.removeCount);
+  }
+
+  @Test
+  public void putOrDiscard_collision_nullIncoming_isNoOp() throws Exception {
+    RNFBAppCheckListenerRegistry registry = new RNFBAppCheckListenerRegistry();
+    FakeHandle first = new FakeHandle();
+    registry.put("app", first);
+    assertFalse(registry.putOrDiscard("app", null));
+    assertSame(first, registry.get("app"));
+  }
+
+  @Test
+  public void takeAndRemove_removesAfterTake() throws Exception {
+    RNFBAppCheckListenerRegistry registry = new RNFBAppCheckListenerRegistry();
+    FakeHandle handle = new FakeHandle();
+    registry.put("app", handle);
+    registry.takeAndRemove("app");
+    assertEquals(1, handle.removeCount);
+    assertNull(registry.get("app"));
+  }
+
+  @Test
+  public void takeAndRemove_missingKey_isNoOp() {
+    RNFBAppCheckListenerRegistry registry = new RNFBAppCheckListenerRegistry();
+    registry.takeAndRemove("missing");
+    assertNull(registry.get("missing"));
+  }
+
+  @Test
+  public void takeAllAndRemove_removesSnapshotAndLeavesEmpty() throws Exception {
+    RNFBAppCheckListenerRegistry registry = new RNFBAppCheckListenerRegistry();
+    FakeHandle a = new FakeHandle();
+    FakeHandle b = new FakeHandle();
+    registry.put("a", a);
+    registry.put("b", b);
+    registry.takeAllAndRemove();
+    assertEquals(1, a.removeCount);
+    assertEquals(1, b.removeCount);
+    assertNull(registry.get("a"));
+    assertNull(registry.get("b"));
+  }
+
+  @Test
+  public void takeAllAndRemove_empty_isNoOp() {
+    RNFBAppCheckListenerRegistry registry = new RNFBAppCheckListenerRegistry();
+    registry.takeAllAndRemove();
+    assertNull(registry.get("app"));
+  }
+
+  @Test
+  public void takeAllAndRemove_nullHandle_isNoOp() throws Exception {
+    RNFBAppCheckListenerRegistry registry = new RNFBAppCheckListenerRegistry();
+    registry.put("app", null);
+    registry.takeAllAndRemove();
+    assertNull(registry.get("app"));
+  }
+
+  @Test
+  public void put_afterTake_allowsReuse() throws Exception {
+    RNFBAppCheckListenerRegistry registry = new RNFBAppCheckListenerRegistry();
+    FakeHandle first = new FakeHandle();
+    FakeHandle second = new FakeHandle();
+    registry.put("app", first);
+    assertSame(first, registry.take("app"));
+    registry.put("app", second);
+    assertSame(second, registry.get("app"));
+    assertEquals(0, first.removeCount);
+  }
+}

package/dist/module/version.js

@@ -1,5 +1,5 @@
 "use strict";
 
 // Generated by genversion.
-export const version = '26.3.3';
+export const version = '26.4.1';
 //# sourceMappingURL=version.js.map

package/dist/typescript/lib/index.d.ts

@@ -1,7 +1,7 @@
 import type { FirebaseApp } from '@react-native-firebase/app';
 import './types/internal';
 import type { AppCheck, AppCheckOptions, AppCheckTokenResult, PartialObserver, Unsubscribe } from './types/appcheck';
-export declare const SDK_VERSION = "26.3.3";
+export declare const SDK_VERSION = "26.4.1";
 export { CustomProvider, ReactNativeFirebaseAppCheckProvider } from './providers';
 /**
  * Initializes App Check for the given Firebase app.

package/dist/typescript/lib/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "26.3.3";
+export declare const version = "26.4.1";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '26.3.3';
+export const version = '26.4.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/app-check",
-  "version": "26.3.3",
+  "version": "26.4.1",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - App Check",
   "main": "./dist/module/index.js",
@@ -30,6 +30,7 @@
     "android:codegen": "node ../../scripts/codegen-package.mjs app-check android",
     "ios:codegen": "node ../../scripts/codegen-package.mjs app-check ios"
   },
+  "homepage": "https://rnfirebase.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/invertase/react-native-firebase",
@@ -44,11 +45,11 @@
     "appCheck"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "26.3.3",
+    "@react-native-firebase/app": "26.4.1",
     "expo": ">=47.0.0"
   },
   "devDependencies": {
-    "@react-native-firebase/app": "26.3.3",
+    "@react-native-firebase/app": "26.4.1",
     "expo": "^55.0.18",
     "react-native-builder-bob": "^0.41.0",
     "typescript": "^6.0.3"
@@ -100,5 +101,5 @@
     "node_modules/",
     "dist/"
   ],
-  "gitHead": "04b90008385bf69be74f3a333d0dfea43ba32e64"
+  "gitHead": "a3efad5f425135a5d2e66857ffae84ebaa02a7ba"
 }