Skip to content

Commit babb14a

Browse files
sam-gcsam-gc
committed
Formatting
1 parent 40780f4 commit babb14a

File tree

10 files changed

+81
-35
lines changed

10 files changed

+81
-35
lines changed

‎packages-exp/auth-exp/demo/src/index.js

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,8 +1239,8 @@ function signInWithPopupRedirect(provider) {
12391239
const glob = {
12401240
signInWithPopup,
12411241
linkWithPopup,
1242-
reauthenticateWithPopup,
1243-
}
1242+
reauthenticateWithPopup
1243+
};
12441244
let action = $('input[name=popup-redirect-action]:checked').val();
12451245
let type = $('input[name=popup-redirect-type]:checked').val();
12461246
let method = null;
@@ -1296,14 +1296,18 @@ function signInWithPopupRedirect(provider) {
12961296
console.log('Provider:');
12971297
console.log(provider);
12981298
if (type == 'popup') {
1299-
glob[method](inst, provider, browserPopupRedirectResolver).then(response => {
1300-
console.log('Popup response:');
1301-
console.log(response);
1302-
alertSuccess(action + ' with ' + provider['providerId'] + ' successful!');
1303-
logAdditionalUserInfo(response);
1304-
onAuthSuccess(activeUser());
1305-
},
1306-
onAuthError);
1299+
glob[method](inst, provider, browserPopupRedirectResolver).then(
1300+
response => {
1301+
console.log('Popup response:');
1302+
console.log(response);
1303+
alertSuccess(
1304+
action + ' with ' + provider['providerId'] + ' successful!'
1305+
);
1306+
logAdditionalUserInfo(response);
1307+
onAuthSuccess(activeUser());
1308+
},
1309+
onAuthError
1310+
);
13071311
} else {
13081312
alertNotImplemented();
13091313
// try {

‎packages-exp/auth-exp/src/core/auth/auth_event_manager.test.ts

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ import * as sinon from 'sinon';
2020
import * as sinonChai from 'sinon-chai';
2121

2222
import {
23-
AuthEvent, AuthEventConsumer, AuthEventError, AuthEventType
23+
AuthEvent,
24+
AuthEventConsumer,
25+
AuthEventError,
26+
AuthEventType
2427
} from '../../model/popup_redirect';
2528
import { AuthErrorCode } from '../errors';
2629
import { AuthEventManager } from './auth_event_manager';
@@ -31,13 +34,13 @@ describe('src/core/auth/auth_event_manager', () => {
3134
let manager: AuthEventManager;
3235

3336
function makeConsumer(
34-
filter: AuthEventType|AuthEventType[]
37+
filter: AuthEventType | AuthEventType[]
3538
): sinon.SinonStubbedInstance<AuthEventConsumer> {
3639
const stub = sinon.stub({
3740
filter: Array.isArray(filter) ? filter : [filter],
3841
onAuthEvent: () => {},
3942
onError: () => {},
40-
eventId: null,
43+
eventId: null
4144
});
4245

4346
return stub;
@@ -139,7 +142,11 @@ describe('src/core/auth/auth_event_manager', () => {
139142
let consumer: AuthEventConsumer;
140143

141144
beforeEach(() => {
142-
consumer = makeConsumer([AuthEventType.SIGN_IN_VIA_REDIRECT, AuthEventType.LINK_VIA_REDIRECT, AuthEventType.REAUTH_VIA_REDIRECT]);
145+
consumer = makeConsumer([
146+
AuthEventType.SIGN_IN_VIA_REDIRECT,
147+
AuthEventType.LINK_VIA_REDIRECT,
148+
AuthEventType.REAUTH_VIA_REDIRECT
149+
]);
143150
});
144151

145152
it('redirect events are queued until the future', () => {
@@ -176,9 +183,10 @@ describe('src/core/auth/auth_event_manager', () => {
176183

177184
it('unknown auth error prevents consumption of future redirect events', () => {
178185
const event = makeEvent(AuthEventType.UNKNOWN);
179-
event.error = {code: 'auth/no-auth-event'} as AuthEventError;
186+
event.error = { code: 'auth/no-auth-event' } as AuthEventError;
180187
expect(manager.onEvent(event)).to.be.true;
181-
expect(manager.onEvent(makeEvent(AuthEventType.SIGN_IN_VIA_REDIRECT))).to.be.false;
188+
expect(manager.onEvent(makeEvent(AuthEventType.SIGN_IN_VIA_REDIRECT))).to
189+
.be.false;
182190

183191
manager.registerConsumer(consumer);
184192
expect(consumer.onAuthEvent).not.to.have.been.called;

‎packages-exp/auth-exp/src/core/auth/auth_event_manager.ts

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
*/
1717

1818
import {
19-
AuthEvent, AuthEventConsumer, AuthEventType, EventManager
19+
AuthEvent,
20+
AuthEventConsumer,
21+
AuthEventType,
22+
EventManager
2023
} from '../../model/popup_redirect';
2124
import { AUTH_ERROR_FACTORY, AuthErrorCode } from '../errors';
2225

@@ -30,7 +33,10 @@ export class AuthEventManager implements EventManager {
3033
registerConsumer(authEventConsumer: AuthEventConsumer): void {
3134
this.consumers.add(authEventConsumer);
3235

33-
if (this.queuedRedirectEvent && this.isEventForConsumer(this.queuedRedirectEvent, authEventConsumer)) {
36+
if (
37+
this.queuedRedirectEvent &&
38+
this.isEventForConsumer(this.queuedRedirectEvent, authEventConsumer)
39+
) {
3440
this.sendToConsumer(this.queuedRedirectEvent, authEventConsumer);
3541
this.queuedRedirectEvent = null;
3642
}
@@ -89,14 +95,22 @@ export class AuthEventManager implements EventManager {
8995
}
9096
}
9197

92-
private isEventForConsumer(event: AuthEvent, consumer: AuthEventConsumer): boolean {
93-
const eventIdMatches = consumer.eventId === null || (!!event.eventId && event.eventId === consumer.eventId);
98+
private isEventForConsumer(
99+
event: AuthEvent,
100+
consumer: AuthEventConsumer
101+
): boolean {
102+
const eventIdMatches =
103+
consumer.eventId === null ||
104+
(!!event.eventId && event.eventId === consumer.eventId);
94105
return consumer.filter.includes(event.type) && eventIdMatches;
95106
}
96107
}
97108

98-
function isNullRedirectEvent({type, error}: AuthEvent): boolean {
99-
return type === AuthEventType.UNKNOWN && error?.code === `auth/${AuthErrorCode.NO_AUTH_EVENT}`;
109+
function isNullRedirectEvent({ type, error }: AuthEvent): boolean {
110+
return (
111+
type === AuthEventType.UNKNOWN &&
112+
error?.code === `auth/${AuthErrorCode.NO_AUTH_EVENT}`
113+
);
100114
}
101115

102116
function isRedirectEvent(type: AuthEventType): boolean {

‎packages-exp/auth-exp/src/core/strategies/abstract_popup_redirect_operation.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ import { FirebaseError } from '@firebase/util';
1919

2020
import { Auth } from '../../model/auth';
2121
import {
22-
AuthEvent, AuthEventConsumer, AuthEventType, EventManager, PopupRedirectResolver
22+
AuthEvent,
23+
AuthEventConsumer,
24+
AuthEventType,
25+
EventManager,
26+
PopupRedirectResolver
2327
} from '../../model/popup_redirect';
2428
import { User, UserCredential } from '../../model/user';
2529
import { AuthErrorCode } from '../errors';
@@ -45,7 +49,7 @@ export abstract class AbstractPopupRedirectOperation
4549

4650
constructor(
4751
protected readonly auth: Auth,
48-
filter: AuthEventType|AuthEventType[],
52+
filter: AuthEventType | AuthEventType[],
4953
protected readonly resolver: PopupRedirectResolver,
5054
protected user?: User
5155
) {

‎packages-exp/auth-exp/src/core/strategies/phone.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ describe('core/strategies/phone', () => {
414414
});
415415
});
416416

417-
describe("updatePhoneNumber", () => {
417+
describe('updatePhoneNumber', () => {
418418
let user: User;
419419
let reloadMock: fetch.Route;
420420
let signInMock: fetch.Route;

‎packages-exp/auth-exp/src/core/strategies/popup.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
import * as externs from '@firebase/auth-types-exp';
1919

2020
import { Auth } from '../../model/auth';
21-
import { AuthEventType, PopupRedirectResolver } from '../../model/popup_redirect';
21+
import {
22+
AuthEventType,
23+
PopupRedirectResolver
24+
} from '../../model/popup_redirect';
2225
import { User } from '../../model/user';
2326
import { AUTH_ERROR_FACTORY, AuthErrorCode } from '../errors';
2427
import { Delay } from '../util/delay';
@@ -115,7 +118,7 @@ class PopupOperation extends AbstractPopupRedirectOperation {
115118
this.authWindow = await this.resolver._openPopup(
116119
this.auth,
117120
this.provider,
118-
this.filter[0], // There's always one, see constructor
121+
this.filter[0], // There's always one, see constructor
119122
eventId
120123
);
121124
this.authWindow.associatedEvent = eventId;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export interface AuthEvent {
6363

6464
export interface AuthEventConsumer {
6565
readonly filter: AuthEventType[];
66-
eventId: string|null;
66+
eventId: string | null;
6767
onAuthEvent(event: AuthEvent): unknown;
6868
onError(error: FirebaseError): unknown;
6969
}

‎packages-exp/auth-exp/src/platform_browser/auth_window.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ export const AUTH_WINDOW = (window as unknown) as AuthWindow;
4141

4242
export function _setWindowLocation(url: string): void {
4343
AUTH_WINDOW.location.href = url;
44-
}
44+
}

‎packages-exp/auth-exp/src/platform_browser/popup_redirect.test.ts

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ import { OAuthProvider } from '../core/providers/oauth';
3030
import { SingletonInstantiator } from '../core/util/instantiator';
3131
import { Auth } from '../model/auth';
3232
import {
33-
AuthEvent, AuthEventType, GapiAuthEvent, PopupRedirectResolver
33+
AuthEvent,
34+
AuthEventType,
35+
GapiAuthEvent,
36+
PopupRedirectResolver
3437
} from '../model/popup_redirect';
3538
import * as authWindow from './auth_window';
3639
import * as gapiLoader from './iframe/gapi';
@@ -46,7 +49,9 @@ describe('src/platform_browser/popup_redirect', () => {
4649

4750
beforeEach(async () => {
4851
auth = await testAuth();
49-
resolver = new (browserPopupRedirectResolver as SingletonInstantiator<PopupRedirectResolver>)();
52+
resolver = new (browserPopupRedirectResolver as SingletonInstantiator<
53+
PopupRedirectResolver
54+
>)();
5055

5156
sinon.stub(gapiLoader, '_loadGapi').returns(
5257
Promise.resolve(({
@@ -141,9 +146,13 @@ describe('src/platform_browser/popup_redirect', () => {
141146
);
142147
expect(newWindowLocation).to.include(`apiKey=${TEST_KEY}`);
143148
expect(newWindowLocation).to.include('appName=test-app');
144-
expect(newWindowLocation).to.include(`authType=${AuthEventType.LINK_VIA_POPUP}`);
149+
expect(newWindowLocation).to.include(
150+
`authType=${AuthEventType.LINK_VIA_POPUP}`
151+
);
145152
expect(newWindowLocation).to.include(`v=${SDK_VERSION}`);
146-
expect(newWindowLocation).to.include('scopes=some-scope-a%2Csome-scope-b');
153+
expect(newWindowLocation).to.include(
154+
'scopes=some-scope-a%2Csome-scope-b'
155+
);
147156
expect(newWindowLocation).to.include(
148157
'customParameters=%7B%22foo%22%3A%22bar%22%7D'
149158
);

‎packages-exp/auth-exp/src/platform_browser/popup_redirect.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ import { _getCurrentUrl } from '../core/util/location';
2828
import { _open, AuthPopup } from '../core/util/popup';
2929
import { ApiKey, AppName, Auth } from '../model/auth';
3030
import {
31-
AuthEventType, EventManager, GapiAuthEvent, GapiOutcome, PopupRedirectResolver
31+
AuthEventType,
32+
EventManager,
33+
GapiAuthEvent,
34+
GapiOutcome,
35+
PopupRedirectResolver
3236
} from '../model/popup_redirect';
3337
import { _setWindowLocation } from './auth_window';
3438
import { _openIframe } from './iframe/iframe';
@@ -85,7 +89,7 @@ class BrowserPopupRedirectResolver implements PopupRedirectResolver {
8589
const eventManager = new AuthEventManager(auth.name);
8690
iframe.register<GapiAuthEvent>(
8791
'authEvent',
88-
({authEvent}: GapiAuthEvent) => {
92+
({ authEvent }: GapiAuthEvent) => {
8993
const handled = eventManager.onEvent(authEvent);
9094
return { status: handled ? GapiOutcome.ACK : GapiOutcome.ERROR };
9195
},

0 commit comments

Comments
 (0)