From 90552fe47901a90dc0dbd8033094dd3d063b332c Mon Sep 17 00:00:00 2001
From: Guillaume Bernos <guillaume@bernos.dev>
Date: Wed, 12 Oct 2022 11:01:34 +0200
Subject: [PATCH] fix: fix verify

---
 .../cloud_firestore/lib/src/firestore.dart               | 6 +++---
 .../cloud_functions/lib/src/firebase_functions.dart      | 5 ++---
 .../firebase_analytics/lib/src/firebase_analytics.dart   | 9 +++++----
 .../platform_interface_recaptcha_verifier_factory.dart   | 2 +-
 ...atform_interface_recaptcha_verifier_factory_test.dart | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart b/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart
index 14ace2d8e83f..9ae3ee1d0649 100644
--- a/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart
+++ b/packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart
@@ -17,9 +17,7 @@ part of cloud_firestore;
 /// ```
 class FirebaseFirestore extends FirebasePluginPlatform {
   FirebaseFirestore._({required this.app})
-      : super(app.name, 'plugins.flutter.io/firebase_firestore') {
-    FirebasePluginPlatform.verify(instance);
-  }
+      : super(app.name, 'plugins.flutter.io/firebase_firestore');
 
   static final Map<String, FirebaseFirestore> _cachedInstances = {};
 
@@ -37,6 +35,8 @@ class FirebaseFirestore extends FirebasePluginPlatform {
     }
 
     FirebaseFirestore newInstance = FirebaseFirestore._(app: app);
+    FirebasePluginPlatform.verify(newInstance);
+
     _cachedInstances[app.name] = newInstance;
 
     return newInstance;
diff --git a/packages/cloud_functions/cloud_functions/lib/src/firebase_functions.dart b/packages/cloud_functions/cloud_functions/lib/src/firebase_functions.dart
index 2c1a0275e626..5b3f20f70707 100644
--- a/packages/cloud_functions/cloud_functions/lib/src/firebase_functions.dart
+++ b/packages/cloud_functions/cloud_functions/lib/src/firebase_functions.dart
@@ -11,9 +11,7 @@ part of cloud_functions;
 class FirebaseFunctions extends FirebasePluginPlatform {
   FirebaseFunctions._({required this.app, String? region})
       : _region = region ??= 'us-central1',
-        super(app.name, 'plugins.flutter.io/firebase_functions') {
-    FirebasePluginPlatform.verify(instance);
-  }
+        super(app.name, 'plugins.flutter.io/firebase_functions');
 
   // Cached and lazily loaded instance of [FirebaseFunctionsPlatform] to avoid
   // creating a [MethodChannelFirebaseFunctions] when not needed or creating an
@@ -52,6 +50,7 @@ class FirebaseFunctions extends FirebasePluginPlatform {
 
     FirebaseFunctions newInstance =
         FirebaseFunctions._(app: app, region: region);
+    FirebasePluginPlatform.verify(newInstance);
     _cachedInstances[cachedKey] = newInstance;
 
     return newInstance;
diff --git a/packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart b/packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart
index 5fb6bde5442a..83d193528f2a 100755
--- a/packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart
+++ b/packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart
@@ -7,9 +7,7 @@ part of firebase_analytics;
 /// Firebase Analytics API.
 class FirebaseAnalytics extends FirebasePluginPlatform {
   FirebaseAnalytics._({required this.app})
-      : super(app.name, 'plugins.flutter.io/firebase_analytics') {
-    FirebasePluginPlatform.verify(instance);
-  }
+      : super(app.name, 'plugins.flutter.io/firebase_analytics');
 
   /// Namespace for analytics API available on Android only. This is deprecated in favor of
   /// `FirebaseAnalytics.instance.setSessionTimeoutDuration()`.
@@ -48,7 +46,10 @@ class FirebaseAnalytics extends FirebasePluginPlatform {
   factory FirebaseAnalytics.instanceFor({required FirebaseApp app}) {
     if (kIsWeb || app.name == defaultFirebaseAppName) {
       return _firebaseAnalyticsInstances.putIfAbsent(app.name, () {
-        return FirebaseAnalytics._(app: app);
+        final instance = FirebaseAnalytics._(app: app);
+        FirebasePluginPlatform.verify(instance);
+
+        return instance;
       });
     }
 
diff --git a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_recaptcha_verifier_factory.dart b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_recaptcha_verifier_factory.dart
index 65fb3241aae6..7a3befbc7ff2 100644
--- a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_recaptcha_verifier_factory.dart
+++ b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_recaptcha_verifier_factory.dart
@@ -66,7 +66,7 @@ abstract class RecaptchaVerifierFactoryPlatform extends PlatformInterface {
   }
 
   /// Ensures that a delegate class extends [RecaptchaVerifierFactoryPlatform].
-  static void verify(RecaptchaVerifierFactoryPlatform instance) {
+  static void verifyExtends(RecaptchaVerifierFactoryPlatform instance) {
     PlatformInterface.verify(instance, _token);
   }
 
diff --git a/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_recaptcha_verifier_factory_test.dart b/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_recaptcha_verifier_factory_test.dart
index a33a1b365049..1e538d219237 100644
--- a/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_recaptcha_verifier_factory_test.dart
+++ b/packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_recaptcha_verifier_factory_test.dart
@@ -46,7 +46,7 @@ void main() {
     group('verify()', () {
       test('calls successfully', () {
         try {
-          RecaptchaVerifierFactoryPlatform.verify(
+          RecaptchaVerifierFactoryPlatform.verifyExtends(
               recaptchaVerifierFactoryPlatform);
           return;
         } catch (_) {