From 86ab64fc169b74621ac4a11fbe8aa14ba22332d5 Mon Sep 17 00:00:00 2001 From: Guillaume Bernos Date: Wed, 12 Oct 2022 11:21:49 +0200 Subject: [PATCH] fix: fix verify --- .../firebase_app_check/lib/src/firebase_app_check.dart | 8 ++++---- .../lib/src/firebase_app_installations.dart | 8 ++++---- .../firebase_auth/lib/src/firebase_auth.dart | 8 ++++---- .../lib/src/firebase_crashlytics.dart | 6 ++---- .../firebase_database/lib/src/firebase_database.dart | 2 +- .../lib/src/firebase_dynamic_links.dart | 8 ++++---- .../lib/firebase_in_app_messaging.dart | 5 ++--- .../firebase_messaging/lib/src/messaging.dart | 8 ++++---- .../lib/src/firebase_ml_model_downloader.dart | 8 ++++---- .../lib/src/firebase_performance.dart | 8 ++++---- .../lib/src/firebase_remote_config.dart | 8 ++++---- .../firebase_storage/lib/src/firebase_storage.dart | 5 ++--- 12 files changed, 39 insertions(+), 43 deletions(-) diff --git a/packages/firebase_app_check/firebase_app_check/lib/src/firebase_app_check.dart b/packages/firebase_app_check/firebase_app_check/lib/src/firebase_app_check.dart index 7c632be9698d..6fd0eb1cf79e 100644 --- a/packages/firebase_app_check/firebase_app_check/lib/src/firebase_app_check.dart +++ b/packages/firebase_app_check/firebase_app_check/lib/src/firebase_app_check.dart @@ -9,9 +9,7 @@ class FirebaseAppCheck extends FirebasePluginPlatform { static Map _firebaseAppCheckInstances = {}; FirebaseAppCheck._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_app_check') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_app_check'); /// Cached instance of [FirebaseAppCheck]; static FirebaseAppCheck? _instance; @@ -45,7 +43,9 @@ class FirebaseAppCheck extends FirebasePluginPlatform { /// Returns an instance using a specified [FirebaseApp]. static FirebaseAppCheck instanceFor({required FirebaseApp app}) { return _firebaseAppCheckInstances.putIfAbsent(app.name, () { - return FirebaseAppCheck._(app: app); + final instance = FirebaseAppCheck._(app: app); + FirebasePluginPlatform.verify(instance); + return instance; }); } diff --git a/packages/firebase_app_installations/firebase_app_installations/lib/src/firebase_app_installations.dart b/packages/firebase_app_installations/firebase_app_installations/lib/src/firebase_app_installations.dart index f62ca4179024..408d0979c0ad 100644 --- a/packages/firebase_app_installations/firebase_app_installations/lib/src/firebase_app_installations.dart +++ b/packages/firebase_app_installations/firebase_app_installations/lib/src/firebase_app_installations.dart @@ -6,9 +6,7 @@ part of firebase_app_installations; class FirebaseInstallations extends FirebasePluginPlatform { FirebaseInstallations._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_app_installations') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_app_installations'); // Cached and lazily loaded instance of [FirebaseAppInstallationsPlatform] to avoid // creating a [MethodChannelFirebaseInstallations] when not needed or creating an @@ -37,7 +35,9 @@ class FirebaseInstallations extends FirebasePluginPlatform { /// Returns an instance using a specified [FirebaseApp]. static FirebaseInstallations instanceFor({required FirebaseApp app}) { return _cachedInstances.putIfAbsent(app.name, () { - return FirebaseInstallations._(app: app); + final instance = FirebaseInstallations._(app: app); + FirebasePluginPlatform.verify(instance); + return instance; }); } diff --git a/packages/firebase_auth/firebase_auth/lib/src/firebase_auth.dart b/packages/firebase_auth/firebase_auth/lib/src/firebase_auth.dart index 44ded36b36d2..d9c9fe01a3fd 100644 --- a/packages/firebase_auth/firebase_auth/lib/src/firebase_auth.dart +++ b/packages/firebase_auth/firebase_auth/lib/src/firebase_auth.dart @@ -37,9 +37,7 @@ class FirebaseAuth extends FirebasePluginPlatform { FirebaseAuth._({required this.app, Persistence? persistence}) : _persistence = persistence, - super(app.name, 'plugins.flutter.io/firebase_auth') { - FirebasePluginPlatform.verify(instance); - } + super(app.name, 'plugins.flutter.io/firebase_auth'); /// Returns an instance using the default [FirebaseApp]. static FirebaseAuth get instance { @@ -53,7 +51,9 @@ class FirebaseAuth extends FirebasePluginPlatform { factory FirebaseAuth.instanceFor( {required FirebaseApp app, Persistence? persistence}) { return _firebaseAuthInstances.putIfAbsent(app.name, () { - return FirebaseAuth._(app: app, persistence: persistence); + final instance = FirebaseAuth._(app: app, persistence: persistence); + FirebasePluginPlatform.verify(instance); + return instance; }); } diff --git a/packages/firebase_crashlytics/firebase_crashlytics/lib/src/firebase_crashlytics.dart b/packages/firebase_crashlytics/firebase_crashlytics/lib/src/firebase_crashlytics.dart index f19f369c2f69..69e886d0b971 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/lib/src/firebase_crashlytics.dart +++ b/packages/firebase_crashlytics/firebase_crashlytics/lib/src/firebase_crashlytics.dart @@ -10,9 +10,7 @@ part of firebase_crashlytics; /// You can get an instance by calling [FirebaseCrashlytics.instance]. class FirebaseCrashlytics extends FirebasePluginPlatform { FirebaseCrashlytics._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_crashlytics') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_crashlytics'); /// Cached instance of [FirebaseCrashlytics]; static FirebaseCrashlytics? _instance; @@ -33,7 +31,7 @@ class FirebaseCrashlytics extends FirebasePluginPlatform { /// Returns an instance using the default [FirebaseApp]. static FirebaseCrashlytics get instance { _instance ??= FirebaseCrashlytics._(app: Firebase.app()); - + FirebasePluginPlatform.verify(_instance!); return _instance!; } diff --git a/packages/firebase_database/firebase_database/lib/src/firebase_database.dart b/packages/firebase_database/firebase_database/lib/src/firebase_database.dart index cc8f8e2e589b..e083dc653707 100644 --- a/packages/firebase_database/firebase_database/lib/src/firebase_database.dart +++ b/packages/firebase_database/firebase_database/lib/src/firebase_database.dart @@ -21,7 +21,6 @@ class FirebaseDatabase extends FirebasePluginPlatform { FirebaseDatabase._({required this.app, this.databaseURL}) : super(app.name, 'plugins.flutter.io/firebase_database') { - FirebasePluginPlatform.verify(instance); if (databaseURL != null && databaseURL!.endsWith('/')) { databaseURL = databaseURL!.substring(0, databaseURL!.length - 1); } @@ -54,6 +53,7 @@ class FirebaseDatabase extends FirebasePluginPlatform { FirebaseDatabase newInstance = FirebaseDatabase._(app: app, databaseURL: databaseURL); + FirebasePluginPlatform.verify(newInstance); _cachedInstances[cacheKey] = newInstance; return newInstance; diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart b/packages/firebase_dynamic_links/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart index 5f4c17fcc4cf..57e4c69742c7 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart @@ -9,9 +9,7 @@ part of firebase_dynamic_links; /// You can get an instance by calling [FirebaseDynamicLinks.instance]. class FirebaseDynamicLinks extends FirebasePluginPlatform { FirebaseDynamicLinks._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_dynamic_links') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_dynamic_links'); static final Map _cachedInstances = {}; @@ -28,7 +26,9 @@ class FirebaseDynamicLinks extends FirebasePluginPlatform { if (defaultTargetPlatform == TargetPlatform.android || app.name == defaultFirebaseAppName) { return _cachedInstances.putIfAbsent(app.name, () { - return FirebaseDynamicLinks._(app: app); + FirebaseDynamicLinks newInstance = FirebaseDynamicLinks._(app: app); + FirebasePluginPlatform.verify(newInstance); + return newInstance; }); } diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/lib/firebase_in_app_messaging.dart b/packages/firebase_in_app_messaging/firebase_in_app_messaging/lib/firebase_in_app_messaging.dart index 4a2a68bca5da..fc85b86531e5 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/lib/firebase_in_app_messaging.dart +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/lib/firebase_in_app_messaging.dart @@ -9,9 +9,7 @@ import 'package:firebase_in_app_messaging_platform_interface/firebase_in_app_mes class FirebaseInAppMessaging extends FirebasePluginPlatform { FirebaseInAppMessaging._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_in_app_messaging') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_in_app_messaging'); /// The [FirebaseApp] for this current [FirebaseAnalytics] instance. final FirebaseApp app; @@ -42,6 +40,7 @@ class FirebaseInAppMessaging extends FirebasePluginPlatform { } FirebaseInAppMessaging newInstance = FirebaseInAppMessaging._(app: app); + FirebasePluginPlatform.verify(newInstance); _cachedInstances[app.name] = newInstance; return newInstance; diff --git a/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart b/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart index 9d1daf4539f1..5b205d851eef 100644 --- a/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart +++ b/packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart @@ -25,9 +25,7 @@ class FirebaseMessaging extends FirebasePluginPlatform { FirebaseApp app; FirebaseMessaging._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_messaging') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_messaging'); /// Returns an instance using the default [FirebaseApp]. static FirebaseMessaging get instance { @@ -39,7 +37,9 @@ class FirebaseMessaging extends FirebasePluginPlatform { /// Returns an instance using a specified [FirebaseApp]. factory FirebaseMessaging._instanceFor({required FirebaseApp app}) { return _firebaseMessagingInstances.putIfAbsent(app.name, () { - return FirebaseMessaging._(app: app); + final instance = FirebaseMessaging._(app: app); + FirebasePluginPlatform.verify(instance); + return instance; }); } diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/src/firebase_ml_model_downloader.dart b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/src/firebase_ml_model_downloader.dart index 7a3ed559dd3b..54c41893903d 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/src/firebase_ml_model_downloader.dart +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/src/firebase_ml_model_downloader.dart @@ -6,9 +6,7 @@ part of firebase_ml_model_downloader; class FirebaseModelDownloader extends FirebasePluginPlatform { FirebaseModelDownloader._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_ml_model_downloader') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_ml_model_downloader'); // Cached and lazily loaded instance of [FirebaseModelDownloaderPlatform] to avoid // creating a [MethodChannelFirebaseFunctions] when not needed or creating an @@ -38,7 +36,9 @@ class FirebaseModelDownloader extends FirebasePluginPlatform { /// Returns an instance using a specified [FirebaseApp]. factory FirebaseModelDownloader.instanceFor({required FirebaseApp app}) { return _cachedInstances.putIfAbsent(app.name, () { - return FirebaseModelDownloader._(app: app); + FirebaseModelDownloader newInstance = FirebaseModelDownloader._(app: app); + FirebasePluginPlatform.verify(newInstance); + return newInstance; }); } diff --git a/packages/firebase_performance/firebase_performance/lib/src/firebase_performance.dart b/packages/firebase_performance/firebase_performance/lib/src/firebase_performance.dart index dada0c9fbc87..8031d46e99d5 100644 --- a/packages/firebase_performance/firebase_performance/lib/src/firebase_performance.dart +++ b/packages/firebase_performance/firebase_performance/lib/src/firebase_performance.dart @@ -9,9 +9,7 @@ part of firebase_performance; /// You can get an instance by calling [FirebasePerformance.instance]. class FirebasePerformance extends FirebasePluginPlatform { FirebasePerformance._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_performance') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_performance'); // Cached and lazily loaded instance of [FirebasePerformancePlatform] to avoid // creating a [MethodChannelFirebasePerformance] when not needed or creating an @@ -42,7 +40,9 @@ class FirebasePerformance extends FirebasePluginPlatform { /// Returns an instance using a specified [FirebaseApp]. factory FirebasePerformance.instanceFor({required FirebaseApp app}) { return _firebasePerformanceInstances.putIfAbsent(app.name, () { - return FirebasePerformance._(app: app); + final instance = FirebasePerformance._(app: app); + FirebasePluginPlatform.verify(instance); + return instance; }); } diff --git a/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart b/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart index 3667731bc350..d07d072c3045 100644 --- a/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart +++ b/packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart @@ -11,9 +11,7 @@ part of firebase_remote_config; // ignore: prefer_mixin class FirebaseRemoteConfig extends FirebasePluginPlatform with ChangeNotifier { FirebaseRemoteConfig._({required this.app}) - : super(app.name, 'plugins.flutter.io/firebase_remote_config') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_remote_config'); // Cached instances of [FirebaseRemoteConfig]. static final Map @@ -39,7 +37,9 @@ class FirebaseRemoteConfig extends FirebasePluginPlatform with ChangeNotifier { /// Returns an instance using the specified [FirebaseApp]. static FirebaseRemoteConfig instanceFor({required FirebaseApp app}) { return _firebaseRemoteConfigInstances.putIfAbsent(app.name, () { - return FirebaseRemoteConfig._(app: app); + final instance = FirebaseRemoteConfig._(app: app); + FirebasePluginPlatform.verify(instance); + return instance; }); } diff --git a/packages/firebase_storage/firebase_storage/lib/src/firebase_storage.dart b/packages/firebase_storage/firebase_storage/lib/src/firebase_storage.dart index a8da0739c390..e3c6711de377 100644 --- a/packages/firebase_storage/firebase_storage/lib/src/firebase_storage.dart +++ b/packages/firebase_storage/firebase_storage/lib/src/firebase_storage.dart @@ -8,9 +8,7 @@ part of firebase_storage; /// The entrypoint for [FirebaseStorage]. class FirebaseStorage extends FirebasePluginPlatform { FirebaseStorage._({required this.app, required this.bucket}) - : super(app.name, 'plugins.flutter.io/firebase_storage') { - FirebasePluginPlatform.verify(instance); - } + : super(app.name, 'plugins.flutter.io/firebase_storage'); // Cached and lazily loaded instance of [FirebaseStoragePlatform] to avoid // creating a [MethodChannelStorage] when not needed or creating an @@ -90,6 +88,7 @@ class FirebaseStorage extends FirebasePluginPlatform { } FirebaseStorage newInstance = FirebaseStorage._(app: app, bucket: _bucket); + FirebasePluginPlatform.verify(newInstance); _cachedInstances[key] = newInstance; return newInstance;