Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit fcc9071

Browse files
committed
fix(auth): login scoping for promise resolution
1 parent 9492dfb commit fcc9071

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

src/firebase.android.ts

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,8 +1027,8 @@ firebase.login = arg => {
10271027
return new Promise((resolve, reject) => {
10281028
try {
10291029
// need these to support using phone auth more than once
1030-
this.resolve = resolve;
1031-
this.reject = reject;
1030+
firebase.resolve = resolve;
1031+
firebase.reject = reject;
10321032

10331033
if (!firebase._isGooglePlayServicesAvailable()) {
10341034
reject("Google Play services is required for this feature, but not available on this device");
@@ -1046,11 +1046,15 @@ firebase.login = arg => {
10461046
if (firebase._mGoogleApiClient) {
10471047
com.google.android.gms.auth.api.Auth.GoogleSignInApi.revokeAccess(firebase._mGoogleApiClient);
10481048
}
1049-
this.reject("Logging in the user failed. " + (task.getException() && task.getException().getReason ? task.getException().getReason() : task.getException()));
1049+
if (firebase.reject) {
1050+
firebase.reject("Logging in the user failed. " + (task.getException() && task.getException().getReason ? task.getException().getReason() : task.getException()));
1051+
}
10501052
} else {
10511053
const user = task.getResult().getUser();
10521054
let additionalUserInfo = task.getResult().getAdditionalUserInfo();
1053-
this.resolve(toLoginResult(user, additionalUserInfo));
1055+
if (firebase.resolve) {
1056+
firebase.resolve(toLoginResult(user, additionalUserInfo));
1057+
}
10541058
}
10551059
}
10561060
});
@@ -1144,9 +1148,13 @@ firebase.login = arg => {
11441148
firebase._verifyPhoneNumberInProgress = false;
11451149
const errorMessage = firebaseException.getMessage();
11461150
if (errorMessage.includes("INVALID_APP_CREDENTIAL")) {
1147-
this.reject("Please upload the SHA1 fingerprint of your debug and release keystores to the Firebase console, see https://github.com/EddyVerbruggen/nativescript-plugin-firebase/blob/master/docs/AUTHENTICATION.md#phone-verification");
1151+
if (firebase.reject) {
1152+
firebase.reject("Please upload the SHA1 fingerprint of your debug and release keystores to the Firebase console, see https://github.com/EddyVerbruggen/nativescript-plugin-firebase/blob/master/docs/AUTHENTICATION.md#phone-verification");
1153+
}
11481154
} else {
1149-
this.reject(errorMessage);
1155+
if (firebase.reject) {
1156+
firebase.reject(errorMessage);
1157+
}
11501158
}
11511159
},
11521160
onCodeSent: (verificationId, forceResendingToken) => {
@@ -1156,8 +1164,8 @@ firebase.login = arg => {
11561164
if (firebase._verifyPhoneNumberInProgress) {
11571165
firebase._verifyPhoneNumberInProgress = false;
11581166
firebase.requestPhoneAuthVerificationCode(userResponse => {
1159-
if (userResponse === undefined && this.reject) {
1160-
this.reject("Prompt was canceled");
1167+
if (userResponse === undefined && firebase.reject) {
1168+
firebase.reject("Prompt was canceled");
11611169
return;
11621170
}
11631171
const authCredential = com.google.firebase.auth.PhoneAuthProvider.getCredential(verificationId, userResponse);

src/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/firebase",
3-
"version": "11.0.0-rc.6",
3+
"version": "11.0.0-rc.7",
44
"description": "Fire. Base. Firebase!",
55
"main": "firebase",
66
"typings": "index.d.ts",

0 commit comments

Comments
 (0)