Skip to content

Commit ee79ab3

Browse files
committed
feat(sdk): firebase-ios-sdk to 8.7.0 / firebase-android-sdk 28.4.1
- add app distribution gradle plugin dependency in test app - remove ios app check force refresh token workaround, underlying bug fixed feature release for them, so feature release for us
1 parent aa48ea7 commit ee79ab3

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

packages/app-check/e2e/appcheck.e2e.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,15 @@ describe('appCheck()', function () {
5252
}
5353

5454
// Force refresh should get a different token?
55-
// TODO iOS tokens are stale because of https://github.com/firebase/firebase-ios-sdk/issues/8544
56-
if (device.getPlatform() === 'android') {
57-
const token2 = await firebase.appCheck().getToken(true);
58-
token2.should.not.equal('');
59-
const decodedToken2 = jwt.decode(token2);
60-
decodedToken2.aud[1].should.equal('projects/react-native-firebase-testing');
61-
if (decodedToken2.exp < Date.now()) {
62-
Promise.reject('Token already expired');
63-
}
64-
(token === token2).should.be.false();
55+
// TODO sometimes fails on android https://github.com/firebase/firebase-android-sdk/issues/2954
56+
const token2 = await firebase.appCheck().getToken(true);
57+
token2.should.not.equal('');
58+
const decodedToken2 = jwt.decode(token2);
59+
decodedToken2.aud[1].should.equal('projects/react-native-firebase-testing');
60+
if (decodedToken2.exp < Date.now()) {
61+
Promise.reject('Token already expired');
6562
}
63+
(token === token2).should.be.false();
6664
});
6765
});
6866
describe('activate())', function () {

packages/app-check/ios/RNFBAppCheck/RNFBAppCheckModule.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ - (dispatch_queue_t)methodQueue {
7575
: (RCTPromiseResolveBlock)resolve
7676
: (RCTPromiseRejectBlock)reject) {
7777
FIRAppCheck *appCheck = [FIRAppCheck appCheckWithApp:firebaseApp];
78-
[appCheck tokenForcingRefresh:NO // TODO Cannot use forceRefresh argument, if we send 'YES' in
79-
// https://github.com/firebase/firebase-ios-sdk/issues/8544
78+
[appCheck tokenForcingRefresh:forceRefresh
8079
completion:^(FIRAppCheckToken *_Nullable token, NSError *_Nullable error) {
8180
if (error != nil) {
8281
// Handle any errors if the token was not retrieved.

packages/app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@
6565
},
6666
"sdkVersions": {
6767
"ios": {
68-
"firebase": "8.6.0"
68+
"firebase": "8.7.0"
6969
},
7070
"android": {
7171
"minSdk": 16,
7272
"targetSdk": 30,
7373
"compileSdk": 30,
7474
"buildTools": "30.0.2",
75-
"firebase": "28.3.1",
75+
"firebase": "28.4.1",
7676
"firebaseCrashlyticsGradle": "2.7.1",
7777
"firebasePerfGradle": "1.4.0",
7878
"gmsGoogleServicesGradle": "4.3.10",

tests/android/app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
22
apply plugin: 'com.google.gms.google-services'
33
apply plugin: 'com.google.firebase.crashlytics'
44
apply plugin: 'com.google.firebase.firebase-perf'
5+
apply plugin: 'com.google.firebase.appdistribution'
56

67
import com.android.build.OutputFile
78

@@ -39,7 +40,7 @@ def useIntlJsc = false
3940
/**
4041
* Architectures to build native code for in debug.
4142
*/
42-
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
43+
def nativeArchitectures = project.getProperties().get('reactNativeDebugArchitectures')
4344

4445
android {
4546
ndkVersion rootProject.ext.ndkVersion

tests/android/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ buildscript {
3636
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
3737
classpath 'com.google.firebase:perf-plugin:1.4.0'
3838
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
39+
classpath 'com.google.firebase:firebase-appdistribution-gradle:2.2.0'
3940
}
4041
}
4142

0 commit comments

Comments
 (0)