fix(firebase_app_check_web): Activate web app check on startup if it …

…was previously activated (#11625) * Activate web app check on startup if it was previously activated * Refactoring * Use the proper firebase app
firebase · Oct 12, 2023 · 493f254 · 493f254
1 parent adc80df
commit 493f254
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 0 deletions.
diff --git a/packages/firebase_app_check/firebase_app_check_web/lib/firebase_app_check_web.dart b/packages/firebase_app_check/firebase_app_check_web/lib/firebase_app_check_web.dart
@@ -3,6 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 import 'dart:async';
+import 'dart:html';
 
 import 'package:firebase_app_check_platform_interface/firebase_app_check_platform_interface.dart';
 import 'package:firebase_core/firebase_core.dart';
@@ -15,6 +16,9 @@ import 'src/internals.dart';
 import 'src/interop/app_check.dart' as app_check_interop;
 
 class FirebaseAppCheckWeb extends FirebaseAppCheckPlatform {
+  static const recaptchaTypeV3 = 'recaptcha-v3';
+  static const recaptchaTypeEnterprise = 'enterprise';
+
   static Map<String, StreamController<String?>> _tokenChangesListeners = {};
 
   /// Stub initializer to allow the [registerWith] to create an instance without
@@ -31,7 +35,27 @@ class FirebaseAppCheckWeb extends FirebaseAppCheckPlatform {
     FirebaseCoreWeb.registerService(
       'app-check',
       productNameOverride: 'app_check',
+      ensurePluginInitialized: (firebaseApp) async {
+        final instance =
+            FirebaseAppCheckWeb(app: Firebase.app(firebaseApp.name));
+        final recaptchaType =
+            window.sessionStorage[_sessionKeyRecaptchaType(firebaseApp.name)];
+        final recaptchaSiteKey = window
+            .sessionStorage[_sessionKeyRecaptchaSiteKey(firebaseApp.name)];
+        if (recaptchaType != null && recaptchaSiteKey != null) {
+          final WebProvider provider;
+          if (recaptchaType == recaptchaTypeV3) {
+            provider = ReCaptchaV3Provider(recaptchaSiteKey);
+          } else if (recaptchaType == recaptchaTypeEnterprise) {
+            provider = ReCaptchaEnterpriseProvider(recaptchaSiteKey);
+          } else {
+            throw Exception('Invalid recaptcha type: $recaptchaType');
+          }
+          await instance.activate(webProvider: provider);
+        }
+      },
     );
+
     FirebaseAppCheckPlatform.instance = FirebaseAppCheckWeb.instance;
   }
 
@@ -40,6 +64,14 @@ class FirebaseAppCheckWeb extends FirebaseAppCheckPlatform {
     return FirebaseAppCheckWeb._();
   }
 
+  static String _sessionKeyRecaptchaType(String appName) {
+    return 'FlutterFire-$appName-recaptchaType';
+  }
+
+  static String _sessionKeyRecaptchaSiteKey(String appName) {
+    return 'FlutterFire-$appName-recaptchaSiteKey';
+  }
+
   /// instance of AppCheck from the web plugin
   app_check_interop.AppCheck? _webAppCheck;
 
@@ -68,6 +100,21 @@ class FirebaseAppCheckWeb extends FirebaseAppCheckPlatform {
     AndroidProvider? androidProvider,
     AppleProvider? appleProvider,
   }) async {
+    // save the recaptcha type and site key for future startups
+    if (webProvider != null) {
+      final String recaptchaType;
+      if (webProvider is ReCaptchaV3Provider) {
+        recaptchaType = recaptchaTypeV3;
+      } else if (webProvider is ReCaptchaEnterpriseProvider) {
+        recaptchaType = recaptchaTypeEnterprise;
+      } else {
+        throw Exception('Invalid web provider: $webProvider');
+      }
+      window.sessionStorage[_sessionKeyRecaptchaType(app.name)] = recaptchaType;
+      window.sessionStorage[_sessionKeyRecaptchaSiteKey(app.name)] =
+          webProvider.siteKey;
+    }
+
     // activate API no longer exists, recaptcha key has to be passed on initialization of app-check instance.
     return convertWebExceptions<Future<void>>(() async {
       _webAppCheck ??= app_check_interop.getAppCheckInstance(

diff --git a/packages/firebase_core/firebase_core_web/lib/src/firebase_core_web.dart b/packages/firebase_core/firebase_core_web/lib/src/firebase_core_web.dart
@@ -299,6 +299,12 @@ class FirebaseCoreWeb extends FirebasePlatform {
       }
     }
 
+    final appCheck = _services.remove('app-check');
+    if (appCheck != null) {
+      // Activate app check first
+      await appCheck.ensurePluginInitialized!(app!);
+    }
+
     await Future.wait(
       _services.values.map((service) {
         final ensureInitializedFunction = service.ensurePluginInitialized;