Skip to content

Commit 6c11b35

Browse files
committed
fix(app_check): fix debug token tests
1 parent e85fbac commit 6c11b35

File tree

9 files changed

+30
-17
lines changed

9 files changed

+30
-17
lines changed

packages/firebase_app_check/firebase_app_check/android/src/main/java/io/flutter/plugins/firebase/appcheck/FlutterFirebaseAppCheckPlugin.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ private Task<Void> activate(Map<String, Object> arguments) {
102102
case debugProvider:
103103
{
104104
FirebaseAppCheck firebaseAppCheck = getAppCheck(arguments);
105-
FlutterFirebaseAppRegistrar.debugToken = (String) arguments.get("androidDebugToken");
105+
FlutterFirebaseAppRegistrar.debugToken =
106+
(String) arguments.get("androidDebugToken");
106107
firebaseAppCheck.installAppCheckProviderFactory(
107108
DebugAppCheckProviderFactory.getInstance());
108109
break;

packages/firebase_app_check/firebase_app_check/android/src/main/java/io/flutter/plugins/firebase/appcheck/FlutterFirebaseAppRegistrar.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,30 @@
66

77
import androidx.annotation.Keep;
88
import androidx.annotation.Nullable;
9-
109
import com.google.firebase.appcheck.debug.InternalDebugSecretProvider;
1110
import com.google.firebase.components.Component;
1211
import com.google.firebase.components.ComponentRegistrar;
1312
import com.google.firebase.platforminfo.LibraryVersionComponent;
14-
1513
import java.util.Arrays;
16-
import java.util.Collections;
1714
import java.util.List;
1815

1916
@Keep
20-
public class FlutterFirebaseAppRegistrar implements ComponentRegistrar, InternalDebugSecretProvider {
17+
public class FlutterFirebaseAppRegistrar
18+
implements ComponentRegistrar, InternalDebugSecretProvider {
2119
private static final String DEBUG_SECRET_NAME = "fire-app-check-debug-secret";
2220

2321
public static String debugToken;
2422

2523
@Override
2624
public List<Component<?>> getComponents() {
27-
Component<?> library = LibraryVersionComponent.create(BuildConfig.LIBRARY_NAME,
28-
BuildConfig.LIBRARY_VERSION);
25+
Component<?> library =
26+
LibraryVersionComponent.create(BuildConfig.LIBRARY_NAME, BuildConfig.LIBRARY_VERSION);
2927

30-
Component<InternalDebugSecretProvider> debugSecretProvider = Component.builder(InternalDebugSecretProvider.class)
28+
Component<InternalDebugSecretProvider> debugSecretProvider =
29+
Component.builder(InternalDebugSecretProvider.class)
3130
.name(DEBUG_SECRET_NAME)
32-
.factory(container -> this).build();
31+
.factory(container -> this)
32+
.build();
3333

3434
return Arrays.<Component<?>>asList(library, debugSecretProvider);
3535
}

packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/FLTAppCheckProvider.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ - (void)configure:(FIRApp *)app
2020
if ([providerName isEqualToString:@"debug"]) {
2121
if (debugToken != nil) {
2222
// We have a debug token, so just need to stuff it in the environment and it will hook up
23-
char *key = "FIRAAppCheckDebugToken", *value = (char *) [debugToken UTF8String];
23+
char *key = "FIRAAppCheckDebugToken", *value = (char *)[debugToken UTF8String];
2424
int overwrite = 1;
2525
setenv(key, value, overwrite);
2626
}
2727

2828
FIRAppCheckDebugProvider *provider = [[FIRAppCheckDebugProvider alloc] initWithApp:app];
29-
if(debugToken == nil) NSLog(@"Firebase App Check Debug Token: %@", [provider localDebugToken]);
29+
if (debugToken == nil) NSLog(@"Firebase App Check Debug Token: %@", [provider localDebugToken]);
3030
self.delegateProvider = provider;
3131
}
3232

packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/include/FLTAppCheckProvider.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010

1111
@property id<FIRAppCheckProvider> delegateProvider;
1212

13-
- (void)configure:(FIRApp *)app providerName:(NSString *)providerName debugToken:(NSString *)debugToken;
13+
- (void)configure:(FIRApp *)app
14+
providerName:(NSString *)providerName
15+
debugToken:(NSString *)debugToken;
1416

1517
- (id)initWithApp:(FIRApp *)app;
1618

packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/include/FLTAppCheckProviderFactory.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
@property NSMutableDictionary *_Nullable providers;
99

10-
- (void)configure:(FIRApp *_Nonnull)app providerName:(NSString *_Nonnull)providerName debugToken:(NSString *)debugToken;
10+
- (void)configure:(FIRApp *_Nonnull)app
11+
providerName:(NSString *_Nonnull)providerName
12+
debugToken:(NSString *)debugToken;
1113

1214
@end

packages/firebase_app_check/firebase_app_check_platform_interface/lib/src/method_channel/method_channel_firebase_app_check.dart

+2-4
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,12 @@ class MethodChannelFirebaseAppCheck extends FirebaseAppCheckPlatform {
8787
// Allow value to pass for debug mode for unit testing
8888
if (defaultTargetPlatform == TargetPlatform.android || kDebugMode)
8989
'androidProvider': getAndroidProviderString(androidProvider),
90-
if(androidDebugToken != null)
91-
'androidDebugToken': androidDebugToken,
90+
if (androidDebugToken != null) 'androidDebugToken': androidDebugToken,
9291
if (defaultTargetPlatform == TargetPlatform.iOS ||
9392
defaultTargetPlatform == TargetPlatform.macOS ||
9493
kDebugMode)
9594
'appleProvider': getAppleProviderString(appleProvider),
96-
if(appleDebugToken != null)
97-
'appleDebugToken': appleDebugToken,
95+
if (appleDebugToken != null) 'appleDebugToken': appleDebugToken,
9896
});
9997
} on PlatformException catch (e, s) {
10098
convertPlatformException(e, s);

packages/firebase_app_check/firebase_app_check_web/lib/firebase_app_check_web.dart

+2
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ class FirebaseAppCheckWeb extends FirebaseAppCheckPlatform {
9999
WebProvider? webProvider,
100100
AndroidProvider? androidProvider,
101101
AppleProvider? appleProvider,
102+
String? androidDebugToken,
103+
String? appleDebugToken,
102104
}) async {
103105
// save the recaptcha type and site key for future startups
104106
if (webProvider != null) {

packages/firebase_app_check/firebase_app_check_web/test/firebase_app_check_web_test.mocks.dart

+4
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ class MockFirebaseAppCheckWeb extends _i1.Mock
131131
_i3.WebProvider? webProvider,
132132
_i3.AndroidProvider? androidProvider,
133133
_i3.AppleProvider? appleProvider,
134+
String? androidDebugToken,
135+
String? appleDebugToken,
134136
}) =>
135137
(super.noSuchMethod(
136138
Invocation.method(
@@ -140,6 +142,8 @@ class MockFirebaseAppCheckWeb extends _i1.Mock
140142
#webProvider: webProvider,
141143
#androidProvider: androidProvider,
142144
#appleProvider: appleProvider,
145+
#androidDebugToken: androidDebugToken,
146+
#appleDebugToken: appleDebugToken,
143147
},
144148
),
145149
returnValue: _i5.Future<void>.value(),

packages/firebase_data_connect/firebase_data_connect/test/src/network/rest_transport_test.mocks.dart

+4
Original file line numberDiff line numberDiff line change
@@ -781,6 +781,8 @@ class MockFirebaseAppCheck extends _i1.Mock implements _i10.FirebaseAppCheck {
781781
_i11.WebProvider? webProvider,
782782
_i11.AndroidProvider? androidProvider = _i11.AndroidProvider.playIntegrity,
783783
_i11.AppleProvider? appleProvider = _i11.AppleProvider.deviceCheck,
784+
String? androidDebugToken,
785+
String? appleDebugToken,
784786
}) =>
785787
(super.noSuchMethod(
786788
Invocation.method(
@@ -790,6 +792,8 @@ class MockFirebaseAppCheck extends _i1.Mock implements _i10.FirebaseAppCheck {
790792
#webProvider: webProvider,
791793
#androidProvider: androidProvider,
792794
#appleProvider: appleProvider,
795+
#androidDebugToken: androidDebugToken,
796+
#appleDebugToken: appleDebugToken,
793797
},
794798
),
795799
returnValue: _i6.Future<void>.value(),

0 commit comments

Comments
 (0)