Skip to content

Commit 216aa70

Browse files
committed
Formatting
1 parent 53506d0 commit 216aa70

File tree

5 files changed

+70
-36
lines changed

5 files changed

+70
-36
lines changed

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,21 @@ import { expect, use } from 'chai';
1919
import * as sinon from 'sinon';
2020
import * as sinonChai from 'sinon-chai';
2121

22-
import { AuthEvent, AuthEventConsumer, AuthEventType } from '../../model/popup_redirect';
22+
import {
23+
AuthEvent,
24+
AuthEventConsumer,
25+
AuthEventType
26+
} from '../../model/popup_redirect';
2327
import { AuthEventManager } from './auth_event_manager';
2428

2529
use(sinonChai);
2630

2731
describe('src/core/auth/auth_event_manager', () => {
2832
let manager: AuthEventManager;
2933

30-
function makeConsumer(filter: AuthEventType ): sinon.SinonStubbedInstance<AuthEventConsumer> {
34+
function makeConsumer(
35+
filter: AuthEventType
36+
): sinon.SinonStubbedInstance<AuthEventConsumer> {
3137
const stub = sinon.stub({
3238
filter,
3339
isMatchingEvent: () => true,
@@ -43,7 +49,7 @@ describe('src/core/auth/auth_event_manager', () => {
4349
function makeEvent(type: AuthEventType, eventId = 'event'): AuthEvent {
4450
return {
4551
type,
46-
eventId,
52+
eventId
4753
} as AuthEvent;
4854
}
4955

@@ -101,4 +107,4 @@ describe('src/core/auth/auth_event_manager', () => {
101107
expect(consumer.onAuthEvent).not.to.have.been.called;
102108
expect(consumer.isMatchingEvent).to.have.been.called;
103109
});
104-
});
110+
});

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { AuthEvent, AuthEventConsumer, EventManager } from '../../model/popup_redirect';
18+
import {
19+
AuthEvent,
20+
AuthEventConsumer,
21+
EventManager
22+
} from '../../model/popup_redirect';
1923

2024
export class AuthEventManager implements EventManager {
2125
private readonly consumers: Set<AuthEventConsumer> = new Set();
@@ -30,7 +34,10 @@ export class AuthEventManager implements EventManager {
3034

3135
onEvent(event: AuthEvent): void {
3236
this.consumers.forEach(consumer => {
33-
if (consumer.filter === event.type && consumer.isMatchingEvent(event.eventId)) {
37+
if (
38+
consumer.filter === event.type &&
39+
consumer.isMatchingEvent(event.eventId)
40+
) {
3441
consumer.onAuthEvent(event);
3542
}
3643
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@ export interface PopupRedirectResolver extends externs.PopupRedirectResolver {
8080
authType: AuthEventType,
8181
eventId?: string
8282
): Promise<AuthPopup>;
83-
}
83+
}

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

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ import { TEST_AUTH_DOMAIN, TEST_KEY, testAuth } from '../../test/mock_auth';
2828
import { AuthEventManager } from '../core/auth/auth_event_manager';
2929
import { OAuthProvider } from '../core/providers/oauth';
3030
import { Auth } from '../model/auth';
31-
import { AuthEvent, AuthEventType, GapiAuthEvent } from '../model/popup_redirect';
31+
import {
32+
AuthEvent,
33+
AuthEventType,
34+
GapiAuthEvent
35+
} from '../model/popup_redirect';
3236
import * as gapiLoader from './iframe/gapi';
3337
import { BrowserPopupRedirectResolver } from './popup_redirect';
3438

@@ -38,7 +42,7 @@ use(sinonChai);
3842
describe('src/platform_browser/popup_redirect', () => {
3943
let resolver: BrowserPopupRedirectResolver;
4044
let auth: Auth;
41-
45+
4246
beforeEach(async () => {
4347
auth = await testAuth();
4448
resolver = new BrowserPopupRedirectResolver();
@@ -49,7 +53,7 @@ describe('src/platform_browser/popup_redirect', () => {
4953
});
5054

5155
context('#openPopup', () => {
52-
let popupUrl: string|undefined;
56+
let popupUrl: string | undefined;
5357
let provider: OAuthProvider;
5458
const event = AuthEventType.LINK_VIA_POPUP;
5559

@@ -64,43 +68,53 @@ describe('src/platform_browser/popup_redirect', () => {
6468
it('builds the correct url', async () => {
6569
provider.addScope('some-scope-a');
6670
provider.addScope('some-scope-b');
67-
provider.setCustomParameters({foo: 'bar'});
71+
provider.setCustomParameters({ foo: 'bar' });
6872

6973
await resolver.openPopup(auth, provider, event);
70-
expect(popupUrl).to.include(`https://${TEST_AUTH_DOMAIN}/__/auth/handler`);
74+
expect(popupUrl).to.include(
75+
`https://${TEST_AUTH_DOMAIN}/__/auth/handler`
76+
);
7177
expect(popupUrl).to.include(`apiKey=${TEST_KEY}`);
7278
expect(popupUrl).to.include('appName=test-app');
7379
expect(popupUrl).to.include(`authType=${AuthEventType.LINK_VIA_POPUP}`);
7480
expect(popupUrl).to.include(`v=${SDK_VERSION}`);
7581
expect(popupUrl).to.include('scopes=some-scope-a%2Csome-scope-b');
76-
expect(popupUrl).to.include('customParameters=%7B%22foo%22%3A%22bar%22%7D');
82+
expect(popupUrl).to.include(
83+
'customParameters=%7B%22foo%22%3A%22bar%22%7D'
84+
);
7785
});
7886

7987
it('throws an error if authDomain is unspecified', async () => {
8088
delete auth.config.authDomain;
8189

82-
await expect(resolver.openPopup(auth, provider, event)).to.be.rejectedWith(
83-
FirebaseError, 'auth/auth-domain-config-required',
84-
);
90+
await expect(
91+
resolver.openPopup(auth, provider, event)
92+
).to.be.rejectedWith(FirebaseError, 'auth/auth-domain-config-required');
8593
});
8694

8795
it('throws an error if apiKey is unspecified', async () => {
8896
delete auth.config.apiKey;
8997

90-
await expect(resolver.openPopup(auth, provider, event)).to.be.rejectedWith(
91-
FirebaseError, 'auth/invalid-api-key',
92-
);
98+
await expect(
99+
resolver.openPopup(auth, provider, event)
100+
).to.be.rejectedWith(FirebaseError, 'auth/invalid-api-key');
93101
});
94102
});
95103

96104
context('#initialize', () => {
97105
let onIframeMessage: (event: GapiAuthEvent) => Promise<void>;
98106
beforeEach(() => {
99-
sinon.stub(gapiLoader, '_loadGapi').returns(Promise.resolve({
100-
open: () => Promise.resolve({
101-
register: (_message: string, cb: (event: GapiAuthEvent) => Promise<void>) => onIframeMessage = cb
102-
})
103-
} as unknown as gapi.iframes.Context));
107+
sinon.stub(gapiLoader, '_loadGapi').returns(
108+
Promise.resolve(({
109+
open: () =>
110+
Promise.resolve({
111+
register: (
112+
_message: string,
113+
cb: (event: GapiAuthEvent) => Promise<void>
114+
) => (onIframeMessage = cb)
115+
})
116+
} as unknown) as gapi.iframes.Context)
117+
);
104118
});
105119

106120
it('only registers once, returns same event manager', async () => {
@@ -109,19 +123,19 @@ describe('src/platform_browser/popup_redirect', () => {
109123
});
110124

111125
it('iframe event goes through to the manager', async () => {
112-
const manager = await resolver.initialize(auth) as AuthEventManager;
126+
const manager = (await resolver.initialize(auth)) as AuthEventManager;
113127
sinon.spy(manager, 'onEvent');
114128
const response = await onIframeMessage({
115129
type: 'authEvent',
116-
authEvent: {type: AuthEventType.LINK_VIA_POPUP} as AuthEvent
130+
authEvent: { type: AuthEventType.LINK_VIA_POPUP } as AuthEvent
117131
});
118132

119-
expect(manager.onEvent).to.have.been.calledWith(
120-
{type: AuthEventType.LINK_VIA_POPUP}
121-
);
133+
expect(manager.onEvent).to.have.been.calledWith({
134+
type: AuthEventType.LINK_VIA_POPUP
135+
});
122136
expect(response).to.eql({
123-
status: 'ACK',
137+
status: 'ACK'
124138
});
125139
});
126140
});
127-
});
141+
});

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

Lines changed: 12 additions & 5 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 { _openIframe } from './iframe/iframe';
3438

@@ -38,7 +42,7 @@ import { _openIframe } from './iframe/iframe';
3842
const WIDGET_URL = '__/auth/handler';
3943

4044
export class BrowserPopupRedirectResolver implements PopupRedirectResolver {
41-
private eventManager: EventManager|null = null;
45+
private eventManager: EventManager | null = null;
4246

4347
// Wrapping in async even though we don't await anywhere in order
4448
// to make sure errors are raised as promise rejections
@@ -59,7 +63,8 @@ export class BrowserPopupRedirectResolver implements PopupRedirectResolver {
5963

6064
const iframe = await _openIframe(auth);
6165
const eventManager = new AuthEventManager();
62-
iframe.register<GapiAuthEvent>('authEvent',
66+
iframe.register<GapiAuthEvent>(
67+
'authEvent',
6368
async (message: GapiAuthEvent) => {
6469
await eventManager.onEvent(message.authEvent);
6570

@@ -129,8 +134,10 @@ function getRedirectUrl(
129134
// TODO: maybe set fw as Frameworks.join(",")
130135

131136
const url = new URL(
132-
`https://${auth.config.authDomain}/${WIDGET_URL}?${querystring(params as Record<string, string|number>).slice(1)}`
137+
`https://${auth.config.authDomain}/${WIDGET_URL}?${querystring(
138+
params as Record<string, string | number>
139+
).slice(1)}`
133140
);
134141

135142
return url.toString();
136-
}
143+
}

0 commit comments

Comments
 (0)