Skip to content

Commit 7e7b67b

Browse files
committed
Formatting
1 parent a99eb1c commit 7e7b67b

File tree

9 files changed

+40
-17
lines changed

9 files changed

+40
-17
lines changed

packages-exp/auth-exp/src/core/auth/auth_impl.ts

+16-5
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ export class AuthImpl implements Auth, _FirebaseService {
156156
await this._updateCurrentUser(user);
157157
}
158158

159-
private async initializeCurrentUser(popupRedirectResolver?: externs.PopupRedirectResolver): Promise<void> {
159+
private async initializeCurrentUser(
160+
popupRedirectResolver?: externs.PopupRedirectResolver
161+
): Promise<void> {
160162
// First check to see if we have a pending redirect event.
161163
let storedUser = (await this.assertedPersistence.getCurrentUser()) as User | null;
162164
if (popupRedirectResolver) {
@@ -168,8 +170,11 @@ export class AuthImpl implements Auth, _FirebaseService {
168170
// If the stored user (i.e. the old "currentUser") has a redirectId that
169171
// matches the redirect user, then we want to initially sign in with the
170172
// new user object from result.
171-
if ((!redirectUserEventId || (redirectUserEventId === storedUserEventId)) && result?.user) {
172-
storedUser = result.user as User
173+
if (
174+
(!redirectUserEventId || redirectUserEventId === storedUserEventId) &&
175+
result?.user
176+
) {
177+
storedUser = result.user as User;
173178
}
174179
}
175180

@@ -203,7 +208,9 @@ export class AuthImpl implements Auth, _FirebaseService {
203208
return this.reloadAndSetCurrentUserOrClear(storedUser);
204209
}
205210

206-
private async tryRedirectSignIn(redirectResolver: externs.PopupRedirectResolver): Promise<externs.UserCredential | null> {
211+
private async tryRedirectSignIn(
212+
redirectResolver: externs.PopupRedirectResolver
213+
): Promise<externs.UserCredential | null> {
207214
// The redirect user needs to be checked (and signed in if available)
208215
// during auth initialization. All of the normal sign in and link/reauth
209216
// flows call back into auth and push things onto the promise queue. We
@@ -224,7 +231,11 @@ export class AuthImpl implements Auth, _FirebaseService {
224231
try {
225232
// We know this._popupRedirectResolver is set since redirectResolver
226233
// is passed in. The _completeRedirectFn expects the unwrapped extern.
227-
result = await this._popupRedirectResolver!._completeRedirectFn(this, redirectResolver, true);
234+
result = await this._popupRedirectResolver!._completeRedirectFn(
235+
this,
236+
redirectResolver,
237+
true
238+
);
228239
} catch (e) {
229240
this.redirectInitializerError = e;
230241
await this._setRedirectUser(null);

packages-exp/auth-exp/src/core/strategies/custom_token.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export async function signInWithCustomToken(
2828
): Promise<externs.UserCredential> {
2929
const response: IdTokenResponse = await getIdTokenResponse(authExtern, {
3030
token: customToken,
31-
returnSecureToken: true,
31+
returnSecureToken: true
3232
});
3333
const auth = _castAuth(authExtern);
3434
const cred = await UserCredentialImpl._fromIdTokenResponse(

packages-exp/auth-exp/src/core/strategies/idp.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ export function _signIn(params: IdpTaskParams): Promise<UserCredential> {
9393
export function _reauth(params: IdpTaskParams): Promise<UserCredential> {
9494
const { auth, user } = params;
9595
assert(user, AuthErrorCode.INTERNAL_ERROR, { appName: auth.name });
96-
return _reauthenticate(user, new IdpCredential(params), params.bypassAuthState);
96+
return _reauthenticate(
97+
user,
98+
new IdpCredential(params),
99+
params.bypassAuthState
100+
);
97101
}
98102

99103
export async function _link(params: IdpTaskParams): Promise<UserCredential> {

packages-exp/auth-exp/src/core/user/additional_user_info.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class GenericAdditionalUserInfo implements externs.AdditionalUserInfo {
7979
readonly isNewUser: boolean,
8080
readonly providerId: externs.ProviderId | null,
8181
readonly profile: externs.UserProfile = {}
82-
) { }
82+
) {}
8383
}
8484

8585
class FederatedAdditionalUserInfoWithUsername extends GenericAdditionalUserInfo {
@@ -140,6 +140,5 @@ export function getAdditionalUserInfo(
140140
};
141141
}
142142

143-
144143
return _fromIdTokenResponse(_tokenResponse);
145144
}

packages-exp/auth-exp/src/core/user/reauthenticate.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { UserCredentialImpl } from './user_credential_impl';
2929
export async function _reauthenticate(
3030
user: User,
3131
credential: AuthCredential,
32-
bypassAuthState = false,
32+
bypassAuthState = false
3333
): Promise<UserCredentialImpl> {
3434
const appName = user.auth.name;
3535
const operationType = OperationType.REAUTHENTICATE;
@@ -43,7 +43,7 @@ export async function _reauthenticate(
4343
credential,
4444
user
4545
),
46-
bypassAuthState,
46+
bypassAuthState
4747
);
4848
assert(response.idToken, AuthErrorCode.INTERNAL_ERROR, { appName });
4949
const parsed = _parseToken(response.idToken);

packages-exp/auth-exp/src/core/user/reload.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ export async function _reloadWithoutSaving(user: User): Promise<void> {
5050
const providerData = mergeProviderData(user.providerData, newProviderData);
5151

5252
const oldIsAnonymous = user.isAnonymous;
53-
const newIsAnonymous = !(user.email && coreAccount.passwordHash) && !(providerData?.length);
53+
const newIsAnonymous =
54+
!(user.email && coreAccount.passwordHash) && !providerData?.length;
5455
const isAnonymous = !oldIsAnonymous ? false : newIsAnonymous;
5556

5657
const updates: Partial<User> = {
@@ -63,7 +64,7 @@ export async function _reloadWithoutSaving(user: User): Promise<void> {
6364
tenantId: coreAccount.tenantId || null,
6465
providerData,
6566
metadata: new UserMetadata(coreAccount.createdAt, coreAccount.lastLoginAt),
66-
isAnonymous,
67+
isAnonymous
6768
};
6869

6970
Object.assign(user, updates);

packages-exp/auth-exp/src/model/popup_redirect.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,9 @@ export interface PopupRedirectResolver extends externs.PopupRedirectResolver {
9494
_redirectPersistence: externs.Persistence;
9595

9696
// This is needed so that auth does not have a hard dependency on redirect
97-
_completeRedirectFn: (auth: externs.Auth, resolver: externs.PopupRedirectResolver, bypassAuthState: boolean) => Promise<externs.UserCredential | null>;
97+
_completeRedirectFn: (
98+
auth: externs.Auth,
99+
resolver: externs.PopupRedirectResolver,
100+
bypassAuthState: boolean
101+
) => Promise<externs.UserCredential | null>;
98102
}

packages-exp/auth-exp/src/platform_browser/strategies/abstract_popup_redirect_operation.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export abstract class AbstractPopupRedirectOperation
5959
filter: AuthEventType | AuthEventType[],
6060
protected readonly resolver: PopupRedirectResolver,
6161
protected user?: User,
62-
private readonly bypassAuthState = false,
62+
private readonly bypassAuthState = false
6363
) {
6464
this.filter = Array.isArray(filter) ? filter : [filter];
6565
}

packages-exp/auth-exp/src/platform_browser/strategies/redirect.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export async function linkWithRedirect(
9999
export async function getRedirectResult(
100100
authExtern: externs.Auth,
101101
resolverExtern?: externs.PopupRedirectResolver,
102-
bypassAuthState = false,
102+
bypassAuthState = false
103103
): Promise<externs.UserCredential | null> {
104104
const auth = _castAuth(authExtern);
105105
const resolver = _withDefaultResolver(auth, resolverExtern);
@@ -133,7 +133,11 @@ const redirectOutcomeMap: Map<
133133
class RedirectAction extends AbstractPopupRedirectOperation {
134134
eventId = null;
135135

136-
constructor(auth: Auth, resolver: PopupRedirectResolver, bypassAuthState = false) {
136+
constructor(
137+
auth: Auth,
138+
resolver: PopupRedirectResolver,
139+
bypassAuthState = false
140+
) {
137141
super(
138142
auth,
139143
[

0 commit comments

Comments
 (0)