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

Commit 9424cb5

Browse files
committed
[auth] - Rename GetAuthTokenResult to IdTokenResult to follow web api
1 parent 25ea7a0 commit 9424cb5

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

demo/app/main-view-model.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
AddEventListenerResult,
44
admob as firebaseAdMob,
55
crashlytics as firebaseCrashlytics,
6-
GetAuthTokenResult,
6+
IdTokenResult,
77
GetRemoteConfigResult,
88
LogComplexEventTypeParameter,
99
performance as firebasePerformance,
@@ -1026,7 +1026,7 @@ export class HelloWorldModel extends Observable {
10261026
{
10271027
forceRefresh: false
10281028
})
1029-
.then((result: GetAuthTokenResult) => console.log("Auth token retrieved: " + JSON.stringify(result)))
1029+
.then((result: IdTokenResult) => console.log("Auth token retrieved: " + JSON.stringify(result)))
10301030
.catch(errorMessage => console.log("Auth token retrieval error: " + errorMessage));
10311031
},
10321032
errorMessage => {

src/firebase.android.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
FBErrorData,
1010
firestore,
1111
GetAuthTokenOptions,
12-
GetAuthTokenResult,
12+
IdTokenResult,
1313
OnDisconnect as OnDisconnectBase, QueryOptions,
1414
User
1515
} from "./firebase";
@@ -732,7 +732,7 @@ firebase.unlink = providerId => {
732732
});
733733
};
734734

735-
firebase.getAuthToken = (arg: GetAuthTokenOptions): Promise<GetAuthTokenResult> => {
735+
firebase.getAuthToken = (arg: GetAuthTokenOptions): Promise<IdTokenResult> => {
736736
return new Promise((resolve, reject) => {
737737
try {
738738
const firebaseAuth = com.google.firebase.auth.FirebaseAuth.getInstance();
@@ -811,12 +811,12 @@ function toLoginResult(user, additionalUserInfo?): User {
811811
},
812812
getIdToken: (forceRefresh?: boolean) => new Promise((resolve, reject) => {
813813
firebase.getAuthToken({forceRefresh})
814-
.then((result: GetAuthTokenResult) => resolve(result.token))
814+
.then((result: IdTokenResult) => resolve(result.token))
815815
.catch(reject);
816816
}),
817817
getIdTokenResult: (forceRefresh?: boolean) => new Promise((resolve, reject) => {
818818
firebase.getAuthToken({forceRefresh})
819-
.then((result: GetAuthTokenResult) => resolve(result))
819+
.then((result: IdTokenResult) => resolve(result))
820820
.catch(reject);
821821
}),
822822
sendEmailVerification: (actionCodeSettings?: ActionCodeSettings) => firebase.sendEmailVerification(actionCodeSettings)

src/firebase.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ export interface GetAuthTokenOptions {
204204
forceRefresh?: boolean;
205205
}
206206

207-
export interface GetAuthTokenResult { // Need to rename to IdTokenResult for webAPI
207+
export interface IdTokenResult {
208208
token: string;
209209
claims: { [key: string]: any; };
210210
signInProvider: string;
@@ -360,7 +360,7 @@ export interface User {
360360

361361
getIdToken(forceRefresh?: boolean): Promise<string>;
362362

363-
getIdTokenResult(forceRefresh?: boolean): Promise<any>; // Returns GetAuthTokenResult, but we should rename to IdTokenResult to be web compatible
363+
getIdTokenResult(forceRefresh?: boolean): Promise<IdTokenResult>;
364364

365365
sendEmailVerification(actionCodeSettings?: ActionCodeSettings): Promise<void>;
366366
}

src/firebase.ios.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
FBDataSingleEvent,
66
firestore,
77
GetAuthTokenOptions,
8-
GetAuthTokenResult,
8+
IdTokenResult,
99
OnDisconnect as OnDisconnectBase, QueryOptions,
1010
User
1111
} from "./firebase";
@@ -689,12 +689,12 @@ function toLoginResult(user, additionalUserInfo?: FIRAdditionalUserInfo): User {
689689
},
690690
getIdToken: (forceRefresh?: boolean) => new Promise((resolve, reject) => {
691691
firebase.getAuthToken({forceRefresh})
692-
.then((result: GetAuthTokenResult) => resolve(result.token))
692+
.then((result: IdTokenResult) => resolve(result.token))
693693
.catch(reject);
694694
}),
695695
getIdTokenResult: (forceRefresh?: boolean) => new Promise((resolve, reject) => {
696696
firebase.getAuthToken({forceRefresh})
697-
.then((result: GetAuthTokenResult) => resolve(result))
697+
.then((result: IdTokenResult) => resolve(result))
698698
.catch(reject);
699699
}),
700700
sendEmailVerification: (actionCodeSettings?: ActionCodeSettings) => firebase.sendEmailVerification(actionCodeSettings)
@@ -712,7 +712,7 @@ function toLoginResult(user, additionalUserInfo?: FIRAdditionalUserInfo): User {
712712
return loginResult;
713713
}
714714

715-
firebase.getAuthToken = (arg: GetAuthTokenOptions): Promise<GetAuthTokenResult> => {
715+
firebase.getAuthToken = (arg: GetAuthTokenOptions): Promise<IdTokenResult> => {
716716
return new Promise((resolve, reject) => {
717717
try {
718718
const fAuth = FIRAuth.auth();

0 commit comments

Comments
 (0)