Skip to content

Commit 28115ee

Browse files
sam-gcsam-gc
authored
Merge 2daa09e into c8ac613 
2 parents c8ac613 + 2daa09e commit 28115ee

File tree

8 files changed

+32
-31
lines changed

8 files changed

+32
-31
lines changed

‎common/api-review/auth-exp.api.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,10 @@ export class EmailAuthCredential extends AuthCredential {
218218
export class EmailAuthProvider implements AuthProvider {
219219
static credential(email: string, password: string): EmailAuthCredential;
220220
static credentialWithLink(email: string, emailLink: string): EmailAuthCredential;
221-
static readonly EMAIL_LINK_SIGN_IN_METHOD = SignInMethod.EMAIL_LINK;
222-
static readonly EMAIL_PASSWORD_SIGN_IN_METHOD = SignInMethod.EMAIL_PASSWORD;
223-
static readonly PROVIDER_ID = ProviderId.PASSWORD;
224-
readonly providerId = ProviderId.PASSWORD;
221+
static readonly EMAIL_LINK_SIGN_IN_METHOD: 'emailLink';
222+
static readonly EMAIL_PASSWORD_SIGN_IN_METHOD: 'password';
223+
static readonly PROVIDER_ID: 'password';
224+
readonly providerId: "password";
225225
}
226226

227227
export { ErrorFn }
@@ -234,8 +234,8 @@ export class FacebookAuthProvider extends BaseOAuthProvider {
234234
static credential(accessToken: string): OAuthCredential;
235235
static credentialFromError(error: FirebaseError): OAuthCredential | null;
236236
static credentialFromResult(userCredential: UserCredential): OAuthCredential | null;
237-
static readonly FACEBOOK_SIGN_IN_METHOD = SignInMethod.FACEBOOK;
238-
static readonly PROVIDER_ID = ProviderId.FACEBOOK;
237+
static readonly FACEBOOK_SIGN_IN_METHOD: 'facebook.com';
238+
static readonly PROVIDER_ID: 'facebook.com';
239239
}
240240

241241
// @public
@@ -270,8 +270,8 @@ export class GithubAuthProvider extends BaseOAuthProvider {
270270
static credential(accessToken: string): OAuthCredential;
271271
static credentialFromError(error: FirebaseError): OAuthCredential | null;
272272
static credentialFromResult(userCredential: UserCredential): OAuthCredential | null;
273-
static readonly GITHUB_SIGN_IN_METHOD = SignInMethod.GITHUB;
274-
static readonly PROVIDER_ID = ProviderId.GITHUB;
273+
static readonly GITHUB_SIGN_IN_METHOD: 'github.com';
274+
static readonly PROVIDER_ID: 'github.com';
275275
}
276276

277277
// @public
@@ -280,8 +280,8 @@ export class GoogleAuthProvider extends BaseOAuthProvider {
280280
static credential(idToken?: string | null, accessToken?: string | null): OAuthCredential;
281281
static credentialFromError(error: FirebaseError): OAuthCredential | null;
282282
static credentialFromResult(userCredential: UserCredential): OAuthCredential | null;
283-
static readonly GOOGLE_SIGN_IN_METHOD = SignInMethod.GOOGLE;
284-
static readonly PROVIDER_ID = ProviderId.GOOGLE;
283+
static readonly GOOGLE_SIGN_IN_METHOD: 'google.com';
284+
static readonly PROVIDER_ID: 'google.com';
285285
}
286286

287287
// @public
@@ -458,9 +458,9 @@ export class PhoneAuthProvider {
458458
static credential(verificationId: string, verificationCode: string): PhoneAuthCredential;
459459
static credentialFromError(error: FirebaseError): AuthCredential | null;
460460
static credentialFromResult(userCredential: UserCredential): AuthCredential | null;
461-
static readonly PHONE_SIGN_IN_METHOD = SignInMethod.PHONE;
462-
static readonly PROVIDER_ID = ProviderId.PHONE;
463-
readonly providerId = ProviderId.PHONE;
461+
static readonly PHONE_SIGN_IN_METHOD: 'phone';
462+
static readonly PROVIDER_ID: 'phone';
463+
readonly providerId: "phone";
464464
verifyPhoneNumber(phoneOptions: PhoneInfoOptions | string, applicationVerifier: ApplicationVerifier): Promise<string>;
465465
}
466466

@@ -617,8 +617,8 @@ export class TwitterAuthProvider extends BaseOAuthProvider {
617617
static credential(token: string, secret: string): OAuthCredential;
618618
static credentialFromError(error: FirebaseError): OAuthCredential | null;
619619
static credentialFromResult(userCredential: UserCredential): OAuthCredential | null;
620-
static readonly PROVIDER_ID = ProviderId.TWITTER;
621-
static readonly TWITTER_SIGN_IN_METHOD = SignInMethod.TWITTER;
620+
static readonly PROVIDER_ID: 'twitter.com';
621+
static readonly TWITTER_SIGN_IN_METHOD: 'twitter.com';
622622
}
623623

624624
// @public

‎packages-exp/auth-exp/src/core/providers/email.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,17 @@ export class EmailAuthProvider implements AuthProvider {
3535
/**
3636
* Always set to {@link ProviderId}.PASSWORD, even for email link.
3737
*/
38-
static readonly PROVIDER_ID = ProviderId.PASSWORD;
38+
static readonly PROVIDER_ID: 'password' = ProviderId.PASSWORD;
3939
/**
4040
* Always set to {@link SignInMethod}.EMAIL_PASSWORD.
4141
*/
42-
static readonly EMAIL_PASSWORD_SIGN_IN_METHOD = SignInMethod.EMAIL_PASSWORD;
42+
static readonly EMAIL_PASSWORD_SIGN_IN_METHOD: 'password' =
43+
SignInMethod.EMAIL_PASSWORD;
4344
/**
4445
* Always set to {@link SignInMethod}.EMAIL_LINK.
4546
*/
46-
static readonly EMAIL_LINK_SIGN_IN_METHOD = SignInMethod.EMAIL_LINK;
47+
static readonly EMAIL_LINK_SIGN_IN_METHOD: 'emailLink' =
48+
SignInMethod.EMAIL_LINK;
4749
/**
4850
* Always set to {@link ProviderId}.PASSWORD, even for email link.
4951
*/

‎packages-exp/auth-exp/src/core/providers/facebook.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,10 @@ import { BaseOAuthProvider } from './oauth';
6868
*/
6969
export class FacebookAuthProvider extends BaseOAuthProvider {
7070
/** Always set to {@link SignInMethod}.FACEBOOK. */
71-
static readonly FACEBOOK_SIGN_IN_METHOD = SignInMethod.FACEBOOK;
71+
static readonly FACEBOOK_SIGN_IN_METHOD: 'facebook.com' =
72+
SignInMethod.FACEBOOK;
7273
/** Always set to {@link ProviderId}.FACEBOOK. */
73-
static readonly PROVIDER_ID = ProviderId.FACEBOOK;
74+
static readonly PROVIDER_ID: 'facebook.com' = ProviderId.FACEBOOK;
7475

7576
constructor() {
7677
super(ProviderId.FACEBOOK);

‎packages-exp/auth-exp/src/core/providers/github.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ import { BaseOAuthProvider } from './oauth';
7171
*/
7272
export class GithubAuthProvider extends BaseOAuthProvider {
7373
/** Always set to {@link SignInMethod}.GITHUB. */
74-
static readonly GITHUB_SIGN_IN_METHOD = SignInMethod.GITHUB;
74+
static readonly GITHUB_SIGN_IN_METHOD: 'github.com' = SignInMethod.GITHUB;
7575
/** Always set to {@link ProviderId}.GITHUB. */
76-
static readonly PROVIDER_ID = ProviderId.GITHUB;
76+
static readonly PROVIDER_ID: 'github.com' = ProviderId.GITHUB;
7777

7878
constructor() {
7979
super(ProviderId.GITHUB);

‎packages-exp/auth-exp/src/core/providers/google.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ import { BaseOAuthProvider } from './oauth';
7171
*/
7272
export class GoogleAuthProvider extends BaseOAuthProvider {
7373
/** Always set to {@link SignInMethod}.GOOGLE. */
74-
static readonly GOOGLE_SIGN_IN_METHOD = SignInMethod.GOOGLE;
74+
static readonly GOOGLE_SIGN_IN_METHOD: 'google.com' = SignInMethod.GOOGLE;
7575
/** Always set to {@link ProviderId}.GOOGLE. */
76-
static readonly PROVIDER_ID = ProviderId.GOOGLE;
76+
static readonly PROVIDER_ID: 'google.com' = ProviderId.GOOGLE;
7777

7878
constructor() {
7979
super(ProviderId.GOOGLE);

‎packages-exp/auth-exp/src/core/providers/twitter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ import { BaseOAuthProvider } from './oauth';
8686
*/
8787
export class TwitterAuthProvider extends BaseOAuthProvider {
8888
/** Always set to {@link SignInMethod}.TWITTER. */
89-
static readonly TWITTER_SIGN_IN_METHOD = SignInMethod.TWITTER;
89+
static readonly TWITTER_SIGN_IN_METHOD: 'twitter.com' = SignInMethod.TWITTER;
9090
/** Always set to {@link ProviderId}.TWITTER. */
91-
static readonly PROVIDER_ID = ProviderId.TWITTER;
91+
static readonly PROVIDER_ID: 'twitter.com' = ProviderId.TWITTER;
9292

9393
constructor() {
9494
super(ProviderId.TWITTER);

‎packages-exp/auth-exp/src/model/id_token.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { ProviderId } from './public_types';
19-
2018
import { PhoneOrOauthTokenResponse } from '../api/authentication/mfa';
2119

2220
/**
@@ -55,7 +53,7 @@ export interface IdTokenResponse {
5553
idToken?: IdToken;
5654
refreshToken?: string;
5755
expiresIn?: string;
58-
providerId?: ProviderId | string;
56+
providerId?: string;
5957

6058
// Used in AdditionalUserInfo
6159
displayName?: string | null;

‎packages-exp/auth-exp/src/platform_browser/providers/phone.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ import { TaggedWithTokenResponse } from '../../model/id_token';
5353
*/
5454
export class PhoneAuthProvider {
5555
/** Always set to {@link ProviderId}.PHONE. */
56-
static readonly PROVIDER_ID = ProviderId.PHONE;
56+
static readonly PROVIDER_ID: 'phone' = ProviderId.PHONE;
5757
/** Always set to {@link SignInMethod}.PHONE. */
58-
static readonly PHONE_SIGN_IN_METHOD = SignInMethod.PHONE;
58+
static readonly PHONE_SIGN_IN_METHOD: 'phone' = SignInMethod.PHONE;
5959

6060
/** Always set to {@link ProviderId}.PHONE. */
6161
readonly providerId = PhoneAuthProvider.PROVIDER_ID;

0 commit comments

Comments
 (0)