Skip to content

Commit

Permalink
fix: fix verify
Browse files Browse the repository at this point in the history
  • Loading branch information
Lyokone committed Oct 12, 2022
1 parent 90552fe commit 86ab64f
Show file tree
Hide file tree
Showing 12 changed files with 39 additions and 43 deletions.
Expand Up @@ -9,9 +9,7 @@ class FirebaseAppCheck extends FirebasePluginPlatform {
static Map<String, FirebaseAppCheck> _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;
Expand Down Expand Up @@ -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;
});
}

Expand Down
Expand Up @@ -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
Expand Down Expand Up @@ -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;
});
}

Expand Down
Expand Up @@ -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 {
Expand All @@ -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;
});
}

Expand Down
Expand Up @@ -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;
Expand All @@ -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!;
}

Expand Down
Expand Up @@ -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);
}
Expand Down Expand Up @@ -54,6 +53,7 @@ class FirebaseDatabase extends FirebasePluginPlatform {

FirebaseDatabase newInstance =
FirebaseDatabase._(app: app, databaseURL: databaseURL);
FirebasePluginPlatform.verify(newInstance);
_cachedInstances[cacheKey] = newInstance;

return newInstance;
Expand Down
Expand Up @@ -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<String, FirebaseDynamicLinks> _cachedInstances = {};

Expand All @@ -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;
});
}

Expand Down
Expand Up @@ -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;
Expand Down Expand Up @@ -42,6 +40,7 @@ class FirebaseInAppMessaging extends FirebasePluginPlatform {
}

FirebaseInAppMessaging newInstance = FirebaseInAppMessaging._(app: app);
FirebasePluginPlatform.verify(newInstance);
_cachedInstances[app.name] = newInstance;

return newInstance;
Expand Down
Expand Up @@ -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 {
Expand All @@ -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;
});
}

Expand Down
Expand Up @@ -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
Expand Down Expand Up @@ -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;
});
}

Expand Down
Expand Up @@ -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
Expand Down Expand Up @@ -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;
});
}

Expand Down
Expand Up @@ -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<String, FirebaseRemoteConfig>
Expand All @@ -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;
});
}

Expand Down
Expand Up @@ -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
Expand Down Expand Up @@ -90,6 +88,7 @@ class FirebaseStorage extends FirebasePluginPlatform {
}

FirebaseStorage newInstance = FirebaseStorage._(app: app, bucket: _bucket);
FirebasePluginPlatform.verify(newInstance);
_cachedInstances[key] = newInstance;

return newInstance;
Expand Down

0 comments on commit 86ab64f

Please sign in to comment.