Merge 31c4498 into 9a931d8

invertase · Dec 31, 2021 · 1def9c3 · 1def9c3
2 parents 9a931d8 + 31c4498
commit 1def9c3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/...droid/src/main/java/io/invertase/firebase/appcheck/ReactNativeFirebaseAppCheckModule.java b/...droid/src/main/java/io/invertase/firebase/appcheck/ReactNativeFirebaseAppCheckModule.java
@@ -82,7 +82,9 @@ public void getToken(String appName, boolean forceRefresh, Promise promise) {
             getExecutor(),
             (task) -> {
               if (task.isSuccessful()) {
-                promise.resolve(task.getResult().getToken());
+                WritableMap tokenResultMap = Arguments.createMap();
+                tokenResultMap.putString("token", task.getResult().getToken());
+                promise.resolve(tokenResultMap);
               } else {
                 Log.e(
                     TAG,

diff --git a/packages/app-check/e2e/appcheck.e2e.js b/packages/app-check/e2e/appcheck.e2e.js
@@ -43,7 +43,7 @@ describe('appCheck()', function () {
   describe('getToken())', function () {
     it('token fetch attempt should work', async function () {
       // Our tests configure a debug provider with shared secret so we should get a valid token
-      const token = await firebase.appCheck().getToken();
+      const { token } = await firebase.appCheck().getToken();
       token.should.not.equal('');
       const decodedToken = jwt.decode(token);
       decodedToken.aud[1].should.equal('projects/react-native-firebase-testing');
@@ -53,7 +53,7 @@ describe('appCheck()', function () {
 
       // Force refresh should get a different token?
       // TODO sometimes fails on android https://github.com/firebase/firebase-android-sdk/issues/2954
-      const token2 = await firebase.appCheck().getToken(true);
+      const { token: token2 } = await firebase.appCheck().getToken(true);
       token2.should.not.equal('');
       const decodedToken2 = jwt.decode(token2);
       decodedToken2.aud[1].should.equal('projects/react-native-firebase-testing');

diff --git a/packages/app-check/ios/RNFBAppCheck/RNFBAppCheckModule.m b/packages/app-check/ios/RNFBAppCheck/RNFBAppCheckModule.m
@@ -98,7 +98,9 @@ - (dispatch_queue_t)methodQueue {
                          return;
                        }
 
-                       resolve(token.token);
+                       NSMutableDictionary *tokenResultDictionary = [NSMutableDictionary new];
+                       tokenResultDictionary[@"token"] = token.token;
+                       resolve(tokenResultDictionary);
                      }];
 }