diff --git a/.gitignore b/.gitignore index 5a1a2e02..26f49bcb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .DS_Store package-lock.json *.js +*.map !src/*-hooks.js build/ *.log.* diff --git a/publish/scripts/installer.js b/publish/scripts/installer.js index 76b4a7a3..5631ab54 100755 --- a/publish/scripts/installer.js +++ b/publish/scripts/installer.js @@ -455,7 +455,7 @@ const pattern3 = /\\n\\s*\\/\\/Crashlytics 3 BEGIN[\\s\\S]*\\/\\/Crashlytics 3 E const string1 = \` //Crashlytics 1 BEGIN #else -@import FirebaseCrashlytics; +#import #endif //Crashlytics 1 END \`; diff --git a/src/firebase.ios.ts b/src/firebase.ios.ts index 88a67db1..6e40374e 100755 --- a/src/firebase.ios.ts +++ b/src/firebase.ios.ts @@ -13,6 +13,7 @@ firebase._gIDAuthentication = null; firebase._cachedDynamicLink = null; firebase._configured = false; firebase._currentNonce = null; +firebase._ASFullName = null; const useExternalPushProvider = NSBundle.mainBundle.infoDictionary.objectForKey("UseExternalPushProvider") === true; @@ -636,6 +637,7 @@ function toLoginResult(user, additionalUserInfo?: FIRAdditionalUserInfo): User { providers.push({id: pid, token: gidCurrentIdToken}); } else if (pid === "apple.com") { // TODO + providers.push({id: pid, fullName: firebase._ASFullName }); } else { providers.push({id: pid}); } @@ -2454,6 +2456,8 @@ class ASAuthorizationControllerDelegateImpl extends NSObject /* implements ASAut throw new Error("Unable to serialize id token from data: " + appleIDCredential.identityToken); } + firebase._ASFullName = appleIDCredential.fullName; + // Initialize a Firebase credential. const fIROAuthCredential = FIROAuthProvider.credentialWithProviderIDIDTokenRawNonce( "apple.com", idToken, rawNonce); diff --git a/src/package.json b/src/package.json index 65b39c5e..b93bfe61 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-plugin-firebase", - "version": "10.6.0", + "version": "10.6.1", "description": "Fire. Base. Firebase!", "main": "firebase", "typings": "index.d.ts",