Skip to content

Commit 8241146

Browse files
committed
fix: fix verify
1 parent 107d662 commit 8241146

File tree

19 files changed

+32
-48
lines changed

19 files changed

+32
-48
lines changed

packages/cloud_firestore/cloud_firestore/lib/src/firestore.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ part of cloud_firestore;
1717
/// ```
1818
class FirebaseFirestore extends FirebasePluginPlatform {
1919
FirebaseFirestore._({required this.app})
20-
: super(app.name, 'plugins.flutter.io/firebase_firestore') {
21-
FirebasePluginPlatform.verify(instance);
22-
}
20+
: super(app.name, 'plugins.flutter.io/firebase_firestore');
2321

2422
static final Map<String, FirebaseFirestore> _cachedInstances = {};
2523

packages/cloud_functions/cloud_functions/lib/src/firebase_functions.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ part of cloud_functions;
1111
class FirebaseFunctions extends FirebasePluginPlatform {
1212
FirebaseFunctions._({required this.app, String? region})
1313
: _region = region ??= 'us-central1',
14-
super(app.name, 'plugins.flutter.io/firebase_functions') {
15-
FirebasePluginPlatform.verify(instance);
16-
}
14+
super(app.name, 'plugins.flutter.io/firebase_functions');
1715

1816
// Cached and lazily loaded instance of [FirebaseFunctionsPlatform] to avoid
1917
// creating a [MethodChannelFirebaseFunctions] when not needed or creating an

packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ part of firebase_analytics;
77
/// Firebase Analytics API.
88
class FirebaseAnalytics extends FirebasePluginPlatform {
99
FirebaseAnalytics._({required this.app})
10-
: super(app.name, 'plugins.flutter.io/firebase_analytics') {
11-
FirebasePluginPlatform.verify(instance);
12-
}
10+
: super(app.name, 'plugins.flutter.io/firebase_analytics');
1311

1412
/// Namespace for analytics API available on Android only. This is deprecated in favor of
1513
/// `FirebaseAnalytics.instance.setSessionTimeoutDuration()`.

packages/firebase_app_check/firebase_app_check/lib/src/firebase_app_check.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ class FirebaseAppCheck extends FirebasePluginPlatform {
99
static Map<String, FirebaseAppCheck> _firebaseAppCheckInstances = {};
1010

1111
FirebaseAppCheck._({required this.app})
12-
: super(app.name, 'plugins.flutter.io/firebase_app_check') {
13-
FirebasePluginPlatform.verify(instance);
14-
}
12+
: super(app.name, 'plugins.flutter.io/firebase_app_check');
1513

1614
/// Cached instance of [FirebaseAppCheck];
1715
static FirebaseAppCheck? _instance;

packages/firebase_app_installations/firebase_app_installations/lib/src/firebase_app_installations.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ part of firebase_app_installations;
66

77
class FirebaseInstallations extends FirebasePluginPlatform {
88
FirebaseInstallations._({required this.app})
9-
: super(app.name, 'plugins.flutter.io/firebase_app_installations') {
10-
FirebasePluginPlatform.verify(instance);
11-
}
9+
: super(app.name, 'plugins.flutter.io/firebase_app_installations');
1210

1311
// Cached and lazily loaded instance of [FirebaseAppInstallationsPlatform] to avoid
1412
// creating a [MethodChannelFirebaseInstallations] when not needed or creating an

packages/firebase_auth/firebase_auth/lib/src/firebase_auth.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ class FirebaseAuth extends FirebasePluginPlatform {
3737

3838
FirebaseAuth._({required this.app, Persistence? persistence})
3939
: _persistence = persistence,
40-
super(app.name, 'plugins.flutter.io/firebase_auth') {
41-
FirebasePluginPlatform.verify(instance);
42-
}
40+
super(app.name, 'plugins.flutter.io/firebase_auth');
4341

4442
/// Returns an instance using the default [FirebaseApp].
4543
static FirebaseAuth get instance {

packages/firebase_auth/firebase_auth_platform_interface/lib/src/platform_interface/platform_interface_recaptcha_verifier_factory.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ abstract class RecaptchaVerifierFactoryPlatform extends PlatformInterface {
6666
}
6767

6868
/// Ensures that a delegate class extends [RecaptchaVerifierFactoryPlatform].
69-
static void verify(RecaptchaVerifierFactoryPlatform instance) {
69+
static void verifyExtends(RecaptchaVerifierFactoryPlatform instance) {
7070
PlatformInterface.verify(instance, _token);
7171
}
7272

packages/firebase_auth/firebase_auth_platform_interface/test/platform_interface_tests/platform_interface_recaptcha_verifier_factory_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void main() {
4646
group('verify()', () {
4747
test('calls successfully', () {
4848
try {
49-
RecaptchaVerifierFactoryPlatform.verify(
49+
RecaptchaVerifierFactoryPlatform.verifyExtends(
5050
recaptchaVerifierFactoryPlatform);
5151
return;
5252
} catch (_) {

packages/firebase_crashlytics/firebase_crashlytics/lib/src/firebase_crashlytics.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ part of firebase_crashlytics;
1010
/// You can get an instance by calling [FirebaseCrashlytics.instance].
1111
class FirebaseCrashlytics extends FirebasePluginPlatform {
1212
FirebaseCrashlytics._({required this.app})
13-
: super(app.name, 'plugins.flutter.io/firebase_crashlytics') {
14-
FirebasePluginPlatform.verify(instance);
15-
}
13+
: super(app.name, 'plugins.flutter.io/firebase_crashlytics');
1614

1715
/// Cached instance of [FirebaseCrashlytics];
1816
static FirebaseCrashlytics? _instance;
@@ -33,7 +31,6 @@ class FirebaseCrashlytics extends FirebasePluginPlatform {
3331
/// Returns an instance using the default [FirebaseApp].
3432
static FirebaseCrashlytics get instance {
3533
_instance ??= FirebaseCrashlytics._(app: Firebase.app());
36-
3734
return _instance!;
3835
}
3936

packages/firebase_database/firebase_database/lib/src/firebase_database.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ class FirebaseDatabase extends FirebasePluginPlatform {
2121

2222
FirebaseDatabase._({required this.app, this.databaseURL})
2323
: super(app.name, 'plugins.flutter.io/firebase_database') {
24-
FirebasePluginPlatform.verify(instance);
2524
if (databaseURL != null && databaseURL!.endsWith('/')) {
2625
databaseURL = databaseURL!.substring(0, databaseURL!.length - 1);
2726
}

packages/firebase_database/firebase_database/lib/src/query.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ part of firebase_database;
77
/// Represents a query over the data at a particular location.
88
class Query {
99
Query._(this._queryDelegate, [QueryModifiers? modifiers])
10-
: _modifiers = modifiers ?? QueryModifiers([]);
10+
: _modifiers = modifiers ?? QueryModifiers([]) {
11+
QueryPlatform.verify(_queryDelegate);
12+
}
1113

1214
final QueryPlatform _queryDelegate;
1315

packages/firebase_database/firebase_database_platform_interface/lib/src/platform_interface/platform_interface_query.dart

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,16 @@ abstract class QueryPlatform extends PlatformInterface {
1212

1313
static final Object _token = Object();
1414

15+
/// Throws an [AssertionError] if [instance] does not extend
16+
/// [QueryPlatform].
17+
///
18+
/// This is used by the app-facing [Query] to ensure that
19+
/// the object in which it's going to delegate calls has been
20+
/// constructed properly.
21+
static void verify(QueryPlatform instance) {
22+
PlatformInterface.verify(instance, _token);
23+
}
24+
1525
/// Create a [QueryPlatform] instance
1626
QueryPlatform({
1727
required this.database,

packages/firebase_dynamic_links/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ part of firebase_dynamic_links;
99
/// You can get an instance by calling [FirebaseDynamicLinks.instance].
1010
class FirebaseDynamicLinks extends FirebasePluginPlatform {
1111
FirebaseDynamicLinks._({required this.app})
12-
: super(app.name, 'plugins.flutter.io/firebase_dynamic_links') {
13-
FirebasePluginPlatform.verify(instance);
14-
}
12+
: super(app.name, 'plugins.flutter.io/firebase_dynamic_links');
1513

1614
static final Map<String, FirebaseDynamicLinks> _cachedInstances = {};
1715

packages/firebase_in_app_messaging/firebase_in_app_messaging/lib/firebase_in_app_messaging.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ import 'package:firebase_in_app_messaging_platform_interface/firebase_in_app_mes
99

1010
class FirebaseInAppMessaging extends FirebasePluginPlatform {
1111
FirebaseInAppMessaging._({required this.app})
12-
: super(app.name, 'plugins.flutter.io/firebase_in_app_messaging') {
13-
FirebasePluginPlatform.verify(instance);
14-
}
12+
: super(app.name, 'plugins.flutter.io/firebase_in_app_messaging');
1513

1614
/// The [FirebaseApp] for this current [FirebaseAnalytics] instance.
1715
final FirebaseApp app;

packages/firebase_messaging/firebase_messaging/lib/src/messaging.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ class FirebaseMessaging extends FirebasePluginPlatform {
2525
FirebaseApp app;
2626

2727
FirebaseMessaging._({required this.app})
28-
: super(app.name, 'plugins.flutter.io/firebase_messaging') {
29-
FirebasePluginPlatform.verify(instance);
30-
}
28+
: super(app.name, 'plugins.flutter.io/firebase_messaging');
3129

3230
/// Returns an instance using the default [FirebaseApp].
3331
static FirebaseMessaging get instance {

packages/firebase_ml_model_downloader/firebase_ml_model_downloader/lib/src/firebase_ml_model_downloader.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ part of firebase_ml_model_downloader;
66

77
class FirebaseModelDownloader extends FirebasePluginPlatform {
88
FirebaseModelDownloader._({required this.app})
9-
: super(app.name, 'plugins.flutter.io/firebase_ml_model_downloader') {
10-
FirebasePluginPlatform.verify(instance);
11-
}
9+
: super(app.name, 'plugins.flutter.io/firebase_ml_model_downloader');
1210

1311
// Cached and lazily loaded instance of [FirebaseModelDownloaderPlatform] to avoid
1412
// creating a [MethodChannelFirebaseFunctions] when not needed or creating an

packages/firebase_performance/firebase_performance/lib/src/firebase_performance.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ part of firebase_performance;
99
/// You can get an instance by calling [FirebasePerformance.instance].
1010
class FirebasePerformance extends FirebasePluginPlatform {
1111
FirebasePerformance._({required this.app})
12-
: super(app.name, 'plugins.flutter.io/firebase_performance') {
13-
FirebasePluginPlatform.verify(instance);
14-
}
12+
: super(app.name, 'plugins.flutter.io/firebase_performance');
1513

1614
// Cached and lazily loaded instance of [FirebasePerformancePlatform] to avoid
1715
// creating a [MethodChannelFirebasePerformance] when not needed or creating an

packages/firebase_remote_config/firebase_remote_config/lib/src/firebase_remote_config.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ part of firebase_remote_config;
1111
// ignore: prefer_mixin
1212
class FirebaseRemoteConfig extends FirebasePluginPlatform with ChangeNotifier {
1313
FirebaseRemoteConfig._({required this.app})
14-
: super(app.name, 'plugins.flutter.io/firebase_remote_config') {
15-
FirebasePluginPlatform.verify(instance);
16-
}
14+
: super(app.name, 'plugins.flutter.io/firebase_remote_config');
1715

1816
// Cached instances of [FirebaseRemoteConfig].
1917
static final Map<String, FirebaseRemoteConfig>
@@ -39,7 +37,9 @@ class FirebaseRemoteConfig extends FirebasePluginPlatform with ChangeNotifier {
3937
/// Returns an instance using the specified [FirebaseApp].
4038
static FirebaseRemoteConfig instanceFor({required FirebaseApp app}) {
4139
return _firebaseRemoteConfigInstances.putIfAbsent(app.name, () {
42-
return FirebaseRemoteConfig._(app: app);
40+
final instance = FirebaseRemoteConfig._(app: app);
41+
FirebasePluginPlatform.verify(instance);
42+
return instance;
4343
});
4444
}
4545

packages/firebase_storage/firebase_storage/lib/src/firebase_storage.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ part of firebase_storage;
88
/// The entrypoint for [FirebaseStorage].
99
class FirebaseStorage extends FirebasePluginPlatform {
1010
FirebaseStorage._({required this.app, required this.bucket})
11-
: super(app.name, 'plugins.flutter.io/firebase_storage') {
12-
FirebasePluginPlatform.verify(instance);
13-
}
11+
: super(app.name, 'plugins.flutter.io/firebase_storage');
1412

1513
// Cached and lazily loaded instance of [FirebaseStoragePlatform] to avoid
1614
// creating a [MethodChannelStorage] when not needed or creating an

0 commit comments

Comments
 (0)