Skip to content

Commit 612ea70

Browse files
sam-gcsam-gc
committed
Formatting
1 parent c08b194 commit 612ea70

File tree

3 files changed

+75
-40
lines changed

3 files changed

+75
-40
lines changed

‎packages-exp/auth-exp/src/platform_cordova/plugins.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ declare namespace cordova.InAppBrowser {
2929
}
3030

3131
declare namespace universalLinks {
32-
function subscribe(n: null, cb: (event: Record<string, string>|null) => void): void;
32+
function subscribe(
33+
n: null,
34+
cb: (event: Record<string, string> | null) => void
35+
): void;
3336
}
3437

3538
declare namespace BuildInfo {

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

Lines changed: 54 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,18 @@ import {
2828
EventManager,
2929
PopupRedirectResolver
3030
} from '../../model/popup_redirect';
31-
import { CordovaAuthEventManager, cordovaPopupRedirectResolver } from './popup_redirect';
31+
import {
32+
CordovaAuthEventManager,
33+
cordovaPopupRedirectResolver
34+
} from './popup_redirect';
3235
import { GoogleAuthProvider } from '../../core/providers/google';
3336
import * as utils from './utils';
3437
import * as events from './events';
3538
import { FirebaseError } from '@firebase/util';
36-
import { stubSingleTimeout, TimerTripFn } from '../../../test/helpers/timeout_stub';
39+
import {
40+
stubSingleTimeout,
41+
TimerTripFn
42+
} from '../../../test/helpers/timeout_stub';
3743

3844
use(chaiAsPromised);
3945
use(sinonChai);
@@ -91,19 +97,21 @@ describe('platform_cordova/popup_redirect/popup_redirect', () => {
9197
const NO_EVENT_TIMER_ID = 10001;
9298
const PACKAGE_NAME = 'my.package';
9399
const NOT_PACKAGE_NAME = 'not.my.package';
94-
let universalLinksCb: ((eventData: Record<string, string>|null) => unknown)|null;
100+
let universalLinksCb:
101+
| ((eventData: Record<string, string> | null) => unknown)
102+
| null;
95103
let tripNoEventTimer: TimerTripFn;
96104

97105
beforeEach(() => {
98106
tripNoEventTimer = stubSingleTimeout(NO_EVENT_TIMER_ID);
99107
window.universalLinks = {
100-
subscribe(_unused, cb) {
108+
subscribe(_unused, cb) {
101109
universalLinksCb = cb;
102-
},
110+
}
103111
};
104112
window.BuildInfo = {
105113
packageName: PACKAGE_NAME,
106-
displayName: '',
114+
displayName: ''
107115
};
108116
sinon.stub(window, 'clearTimeout');
109117
});
@@ -122,23 +130,25 @@ describe('platform_cordova/popup_redirect/popup_redirect', () => {
122130
it('clears local storage and dispatches no-event event', async () => {
123131
const promise = event(await resolver._initialize(auth));
124132
tripNoEventTimer();
125-
const {error, ...rest} = await promise;
133+
const { error, ...rest } = await promise;
126134

127-
expect(error).to.be.instanceOf(FirebaseError).with.property('code', 'auth/no-auth-event');
135+
expect(error)
136+
.to.be.instanceOf(FirebaseError)
137+
.with.property('code', 'auth/no-auth-event');
128138
expect(rest).to.eql({
129139
type: AuthEventType.UNKNOWN,
130140
eventId: null,
131141
sessionId: null,
132142
urlResponse: null,
133143
postBody: null,
134-
tenantId: null,
144+
tenantId: null
135145
});
136146
expect(events._getAndRemoveEvent).to.have.been.called;
137147
});
138148
});
139149

140150
context('when an event is present', () => {
141-
it('clears the no event timeout',async () => {
151+
it('clears the no event timeout', async () => {
142152
await resolver._initialize(auth);
143153
await universalLinksCb!({});
144154
expect(window.clearTimeout).to.have.been.calledWith(NO_EVENT_TIMER_ID);
@@ -147,54 +157,62 @@ describe('platform_cordova/popup_redirect/popup_redirect', () => {
147157
it('signals no event if no url in event data', async () => {
148158
const promise = event(await resolver._initialize(auth));
149159
await universalLinksCb!({});
150-
const {error, ...rest} = await promise;
160+
const { error, ...rest } = await promise;
151161

152-
expect(error).to.be.instanceOf(FirebaseError).with.property('code', 'auth/no-auth-event');
162+
expect(error)
163+
.to.be.instanceOf(FirebaseError)
164+
.with.property('code', 'auth/no-auth-event');
153165
expect(rest).to.eql({
154166
type: AuthEventType.UNKNOWN,
155167
eventId: null,
156168
sessionId: null,
157169
urlResponse: null,
158170
postBody: null,
159-
tenantId: null,
171+
tenantId: null
160172
});
161173
});
162174

163175
it('signals no event if partial parse turns up null', async () => {
164176
const promise = event(await resolver._initialize(auth));
165177
eventsStubs._eventFromPartialAndUrl.returns(null);
166-
eventsStubs._getAndRemoveEvent.returns(Promise.resolve({
167-
type: AuthEventType.REAUTH_VIA_REDIRECT,
168-
} as AuthEvent));
169-
await universalLinksCb!({url: 'foo-bar'});
170-
const {error, ...rest} = await promise;
178+
eventsStubs._getAndRemoveEvent.returns(
179+
Promise.resolve({
180+
type: AuthEventType.REAUTH_VIA_REDIRECT
181+
} as AuthEvent)
182+
);
183+
await universalLinksCb!({ url: 'foo-bar' });
184+
const { error, ...rest } = await promise;
171185

172-
expect(error).to.be.instanceOf(FirebaseError).with.property('code', 'auth/no-auth-event');
186+
expect(error)
187+
.to.be.instanceOf(FirebaseError)
188+
.with.property('code', 'auth/no-auth-event');
173189
expect(rest).to.eql({
174190
type: AuthEventType.UNKNOWN,
175191
eventId: null,
176192
sessionId: null,
177193
urlResponse: null,
178194
postBody: null,
179-
tenantId: null,
195+
tenantId: null
180196
});
181197
});
182198

183199
it('signals the final event if partial expansion success', async () => {
184200
const finalEvent = {
185201
type: AuthEventType.REAUTH_VIA_REDIRECT,
186-
postBody: 'foo',
202+
postBody: 'foo'
187203
};
188-
eventsStubs._getAndRemoveEvent.returns(Promise.resolve({
189-
type: AuthEventType.REAUTH_VIA_REDIRECT,
190-
} as AuthEvent));
204+
eventsStubs._getAndRemoveEvent.returns(
205+
Promise.resolve({
206+
type: AuthEventType.REAUTH_VIA_REDIRECT
207+
} as AuthEvent)
208+
);
191209

192210
const promise = event(await resolver._initialize(auth));
193211
eventsStubs._eventFromPartialAndUrl.returns(finalEvent as AuthEvent);
194-
await universalLinksCb!({url: 'foo-bar'});
212+
await universalLinksCb!({ url: 'foo-bar' });
195213
expect(await promise).to.eq(finalEvent);
196214
expect(events._eventFromPartialAndUrl).to.have.been.calledWith(
197-
{type: AuthEventType.REAUTH_VIA_REDIRECT},
215+
{ type: AuthEventType.REAUTH_VIA_REDIRECT },
198216
'foo-bar'
199217
);
200218
});
@@ -218,18 +236,20 @@ describe('platform_cordova/popup_redirect/popup_redirect', () => {
218236
it('signals the final event if partial expansion success', async () => {
219237
const finalEvent = {
220238
type: AuthEventType.REAUTH_VIA_REDIRECT,
221-
postBody: 'foo',
239+
postBody: 'foo'
222240
};
223-
eventsStubs._getAndRemoveEvent.returns(Promise.resolve({
224-
type: AuthEventType.REAUTH_VIA_REDIRECT,
225-
} as AuthEvent));
241+
eventsStubs._getAndRemoveEvent.returns(
242+
Promise.resolve({
243+
type: AuthEventType.REAUTH_VIA_REDIRECT
244+
} as AuthEvent)
245+
);
226246

227247
const promise = event(await resolver._initialize(auth));
228248
eventsStubs._eventFromPartialAndUrl.returns(finalEvent as AuthEvent);
229249
handleOpenUrl(`${PACKAGE_NAME}://foo`);
230250
expect(await promise).to.eq(finalEvent);
231251
expect(events._eventFromPartialAndUrl).to.have.been.calledWith(
232-
{type: AuthEventType.REAUTH_VIA_REDIRECT},
252+
{ type: AuthEventType.REAUTH_VIA_REDIRECT },
233253
`${PACKAGE_NAME}://foo`
234254
);
235255
});
@@ -240,7 +260,9 @@ describe('platform_cordova/popup_redirect/popup_redirect', () => {
240260

241261
await resolver._initialize(auth);
242262
handleOpenUrl(`${PACKAGE_NAME}://foo`);
243-
expect(oldHandleOpenUrl).to.have.been.calledWith(`${PACKAGE_NAME}://foo`);
263+
expect(oldHandleOpenUrl).to.have.been.calledWith(
264+
`${PACKAGE_NAME}://foo`
265+
);
244266
});
245267
});
246268
});

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

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,14 @@ import {
3232
_generateHandlerUrl,
3333
_performRedirect
3434
} from './utils';
35-
import { _eventFromPartialAndUrl, _generateNewEvent, _getAndRemoveEvent } from './events';
35+
import {
36+
_eventFromPartialAndUrl,
37+
_generateNewEvent,
38+
_getAndRemoveEvent
39+
} from './events';
3640
import { AuthEventManager } from '../../core/auth/auth_event_manager';
3741

38-
/**
42+
/**
3943
* How long to wait for the initial auth event before concluding no
4044
* redirect pending
4145
*/
@@ -114,7 +118,7 @@ class CordovaPopupRedirectResolver implements PopupRedirectResolver {
114118
urlResponse: null,
115119
postBody: null,
116120
tenantId: null,
117-
error: _createError(AuthErrorCode.NO_AUTH_EVENT),
121+
error: _createError(AuthErrorCode.NO_AUTH_EVENT)
118122
};
119123

120124
const noEventTimeout = setTimeout(async () => {
@@ -124,12 +128,14 @@ class CordovaPopupRedirectResolver implements PopupRedirectResolver {
124128
manager.onEvent(noEvent);
125129
}, INITIAL_EVENT_TIMEOUT_MS);
126130

127-
const universalLinksCb = async (eventData: Record<string, string>|null): Promise<void> => {
131+
const universalLinksCb = async (
132+
eventData: Record<string, string> | null
133+
): Promise<void> => {
128134
// We have an event so we can clear the no event timeout
129135
clearTimeout(noEventTimeout);
130136

131137
const partialEvent = await _getAndRemoveEvent(auth);
132-
let finalEvent: AuthEvent|null = noEvent;
138+
let finalEvent: AuthEvent | null = noEvent;
133139
// Start with the noEvent
134140
if (partialEvent && eventData?.['url']) {
135141
finalEvent = _eventFromPartialAndUrl(partialEvent, eventData['url']);
@@ -144,10 +150,14 @@ class CordovaPopupRedirectResolver implements PopupRedirectResolver {
144150
// Do not overwrite the existing developer's URL handler.
145151
const existingHandleOpenUrl = window.handleOpenUrl;
146152
window.handleOpenUrl = async url => {
147-
if (url.toLowerCase().startsWith(`${BuildInfo.packageName.toLowerCase()}://`)) {
153+
if (
154+
url
155+
.toLowerCase()
156+
.startsWith(`${BuildInfo.packageName.toLowerCase()}://`)
157+
) {
148158
// We want this intentionally to float
149159
// eslint-disable-next-line @typescript-eslint/no-floating-promises
150-
universalLinksCb({url});
160+
universalLinksCb({ url });
151161
}
152162
// Call the developer's handler if it is present.
153163
if (typeof existingHandleOpenUrl === 'function') {

0 commit comments

Comments
 (0)