@react-native-firebase/app-check 14.2.2 → 14.3.1

package/CHANGELOG.md

@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [14.3.1](https://github.com/invertase/react-native-firebase/compare/v14.3.0...v14.3.1) (2022-02-07)
+
+### Bug Fixes
+
+- **app-check, activate:** correctly check activate parameters ([a583494](https://github.com/invertase/react-native-firebase/commit/a583494d645fe74b043b0dedcf5f2e334e020edf)), closes [#5981](https://github.com/invertase/react-native-firebase/issues/5981)
+- **app-check, activate:** return Promise(void) on ios not void ([0f23441](https://github.com/invertase/react-native-firebase/commit/0f234413542907cd29fb72ccaf6138ff15844443)), closes [#6052](https://github.com/invertase/react-native-firebase/issues/6052)
+
+# [14.3.0](https://github.com/invertase/react-native-firebase/compare/v14.2.4...v14.3.0) (2022-01-26)
+
+### Features
+
+- **app-check:** android debug token argument for app-check ([#6026](https://github.com/invertase/react-native-firebase/issues/6026)) ([6f67503](https://github.com/invertase/react-native-firebase/commit/6f6750309cc6b275772cb9c1bac7e67c2eb7d4ba))
+
+## [14.2.4](https://github.com/invertase/react-native-firebase/compare/v14.2.3...v14.2.4) (2022-01-24)
+
+**Note:** Version bump only for package @react-native-firebase/app-check
+
+## [14.2.3](https://github.com/invertase/react-native-firebase/compare/v14.2.2...v14.2.3) (2022-01-20)
+
+**Note:** Version bump only for package @react-native-firebase/app-check
+
 ## [14.2.2](https://github.com/invertase/react-native-firebase/compare/v14.2.1...v14.2.2) (2022-01-06)
 
 **Note:** Version bump only for package @react-native-firebase/app-check

package/android/build.gradle

@@ -66,6 +66,9 @@ project.ext {
 android {
   defaultConfig {
     multiDexEnabled true
+    // Here we add a build config field to allow devs to provide a
+    // FIREBASE_APP_CHECK_DEBUG_TOKEN to be used in debug mode.
+    buildConfigField "String", "FIREBASE_APP_CHECK_DEBUG_TOKEN", "\"${System.env.FIREBASE_APP_CHECK_DEBUG_TOKEN}\""
   }
   lintOptions {
     disable 'GradleCompatible'

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

@@ -23,10 +23,12 @@ import android.util.Log;
 import com.facebook.react.bridge.*;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.appcheck.AppCheckProviderFactory;
 import com.google.firebase.appcheck.FirebaseAppCheck;
 import com.google.firebase.appcheck.debug.DebugAppCheckProviderFactory;
 import com.google.firebase.appcheck.safetynet.SafetyNetAppCheckProviderFactory;
 import io.invertase.firebase.common.ReactNativeFirebaseModule;
+import java.lang.reflect.*;
 
 public class ReactNativeFirebaseAppCheckModule extends ReactNativeFirebaseModule {
   private static final String TAG = "AppCheck";
@@ -51,7 +53,26 @@ public class ReactNativeFirebaseAppCheckModule extends ReactNativeFirebaseModule
       }
 
       if (isDebuggable) {
-        firebaseAppCheck.installAppCheckProviderFactory(DebugAppCheckProviderFactory.getInstance());
+
+        if (BuildConfig.FIREBASE_APP_CHECK_DEBUG_TOKEN != "null") {
+          // Get DebugAppCheckProviderFactory class
+          Class<DebugAppCheckProviderFactory> debugACFactoryClass =
+              DebugAppCheckProviderFactory.class;
+
+          // Get the (undocumented) constructor accepting a debug token as string
+          Class<?>[] argType = {String.class};
+          Constructor c = debugACFactoryClass.getDeclaredConstructor(argType);
+
+          // Create a object containing the constructor arguments
+          // and initialize a new instance.
+          Object[] cArgs = {BuildConfig.FIREBASE_APP_CHECK_DEBUG_TOKEN};
+          firebaseAppCheck.installAppCheckProviderFactory(
+              (AppCheckProviderFactory) c.newInstance(cArgs));
+        } else {
+          firebaseAppCheck.installAppCheckProviderFactory(
+              DebugAppCheckProviderFactory.getInstance());
+        }
+
       } else {
         firebaseAppCheck.installAppCheckProviderFactory(
             SafetyNetAppCheckProviderFactory.getInstance());

package/ios/RNFBAppCheck/RNFBAppCheckModule.m

@@ -39,7 +39,9 @@ RCT_EXPORT_MODULE();
 RCT_EXPORT_METHOD(activate
                   : (FIRApp *)firebaseApp
                   : (nonnull NSString *)siteKeyOrProvider
-                  : (BOOL)isTokenAutoRefreshEnabled) {
+                  : (BOOL)isTokenAutoRefreshEnabled
+                  : (RCTPromiseResolveBlock)resolve rejecter
+                  : (RCTPromiseRejectBlock)reject) {
   // From SDK docs:
   // NOTE: Make sure to call this method before FirebaseApp.configure().
   // If this method is called after configuring Firebase, the changes will not take effect.
@@ -49,6 +51,7 @@ RCT_EXPORT_METHOD(activate
 
   FIRAppCheck *appCheck = [FIRAppCheck appCheckWithApp:firebaseApp];
   appCheck.isTokenAutoRefreshEnabled = isTokenAutoRefreshEnabled;
+  resolve([NSNull null]);
 }
 
 RCT_EXPORT_METHOD(setTokenAutoRefreshEnabled

package/lib/index.js

@@ -15,7 +15,7 @@
  *
  */
 
-import { isIOS } from '@react-native-firebase/app/lib/common';
+import { isBoolean, isIOS, isString } from '@react-native-firebase/app/lib/common';
 import {
   createModuleNamespace,
   FirebaseModule,
@@ -32,6 +32,25 @@ const nativeModuleName = 'RNFBAppCheckModule';
 
 class FirebaseAppCheckModule extends FirebaseModule {
   activate(siteKeyOrProvider, isTokenAutoRefreshEnabled) {
+    if (!isString(siteKeyOrProvider)) {
+      throw new Error('siteKeyOrProvider must be a string value to match firebase-js-sdk API');
+    }
+
+    // If the caller did not specify token refresh, attempt to use app-check specific setting:
+    if (!isBoolean(isTokenAutoRefreshEnabled)) {
+      isTokenAutoRefreshEnabled = this.firebaseJson.app_check_token_auto_refresh;
+    }
+
+    // If that was not defined, attempt to use app-wide data collection setting per docs:
+    if (!isBoolean(isTokenAutoRefreshEnabled)) {
+      isTokenAutoRefreshEnabled = this.firebaseJson.app_data_collection_default_enabled;
+    }
+
+    // If that also was not defined, the default is documented as true.
+    if (!isBoolean(isTokenAutoRefreshEnabled)) {
+      isTokenAutoRefreshEnabled = true;
+    }
+
     return this.native.activate(siteKeyOrProvider, isTokenAutoRefreshEnabled);
   }
 

package/lib/version.js

@@ -1,2 +1,2 @@
 // generated by genversion
-module.exports = '14.2.2';
+module.exports = '14.3.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/app-check",
-  "version": "14.2.2",
+  "version": "14.3.1",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - App Check",
   "main": "lib/index.js",
@@ -23,10 +23,10 @@
     "appCheck"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "14.2.2"
+    "@react-native-firebase/app": "14.3.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7b0de31e45be9ca7571583e77d1b06c3088df053"
+  "gitHead": "211b7531b731a1fd7feb11ee1d1822470a31eac2"
 }