Skip to content

Commit a3865a8

Browse files
committed
Formatting
1 parent 3320a3d commit a3865a8

13 files changed

+235
-80
lines changed

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,7 @@ function signInWithPopupRedirect(provider) {
12481248
signInWithRedirect,
12491249
linkWithRedirect,
12501250
reauthenticateWithRedirect
1251-
}
1251+
};
12521252
let action = $('input[name=popup-redirect-action]:checked').val();
12531253
let type = $('input[name=popup-redirect-type]:checked').val();
12541254
let method = null;
@@ -1319,7 +1319,9 @@ function signInWithPopupRedirect(provider) {
13191319
);
13201320
} else {
13211321
try {
1322-
glob[method](inst, provider, browserPopupRedirectResolver).catch(onAuthError);
1322+
glob[method](inst, provider, browserPopupRedirectResolver).catch(
1323+
onAuthError
1324+
);
13231325
} catch (error) {
13241326
console.log('Error while calling ' + method);
13251327
console.error(error);
@@ -1341,7 +1343,9 @@ function onAuthUserCredentialSuccess(result) {
13411343
* Displays redirect result.
13421344
*/
13431345
function onGetRedirectResult() {
1344-
getRedirectResult(auth, browserPopupRedirectResolver).then(function(response) {
1346+
getRedirectResult(auth, browserPopupRedirectResolver).then(function(
1347+
response
1348+
) {
13451349
log('Redirect results:');
13461350
if (response.credential) {
13471351
log('Credential:');
@@ -1350,14 +1354,15 @@ function onGetRedirectResult() {
13501354
log('No credential');
13511355
}
13521356
if (response.user) {
1353-
log('User\'s id:');
1357+
log("User's id:");
13541358
log(response.user.uid);
13551359
} else {
13561360
log('No user');
13571361
}
13581362
logAdditionalUserInfo(response);
13591363
console.log(response);
1360-
}, onAuthError);
1364+
},
1365+
onAuthError);
13611366
}
13621367

13631368
/**
@@ -1639,7 +1644,7 @@ function initApp() {
16391644
app = initializeApp(config);
16401645
auth = initializeAuth(app, {
16411646
persistence: browserSessionPersistence,
1642-
popupRedirectResolver: browserPopupRedirectResolver,
1647+
popupRedirectResolver: browserPopupRedirectResolver
16431648
});
16441649

16451650
// tempApp = initializeApp({
@@ -1771,10 +1776,13 @@ function initApp() {
17711776
}
17721777

17731778
// We check for redirect result to refresh user's data.
1774-
getRedirectResult(auth, browserPopupRedirectResolver).then(function(response) {
1779+
getRedirectResult(auth, browserPopupRedirectResolver).then(function(
1780+
response
1781+
) {
17751782
refreshUserData();
17761783
logAdditionalUserInfo(response);
1777-
}, onAuthError);
1784+
},
1785+
onAuthError);
17781786

17791787
// Bootstrap tooltips.
17801788
$('[data-toggle="tooltip"]').tooltip();

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

Lines changed: 5 additions & 2 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';
@@ -143,7 +146,7 @@ describe('src/core/auth/auth_event_manager', () => {
143146
AuthEventType.SIGN_IN_VIA_REDIRECT,
144147
AuthEventType.LINK_VIA_REDIRECT,
145148
AuthEventType.REAUTH_VIA_REDIRECT,
146-
AuthEventType.UNKNOWN,
149+
AuthEventType.UNKNOWN
147150
]);
148151
});
149152

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

Lines changed: 4 additions & 1 deletion
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

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

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@ import { getApp } from '@firebase/app-exp';
1919
import { FirebaseApp } from '@firebase/app-types-exp';
2020
import * as externs from '@firebase/auth-types-exp';
2121
import {
22-
CompleteFn, createSubscribe, ErrorFn, NextFn, Observer, Subscribe, Unsubscribe
22+
CompleteFn,
23+
createSubscribe,
24+
ErrorFn,
25+
NextFn,
26+
Observer,
27+
Subscribe,
28+
Unsubscribe
2329
} from '@firebase/util';
2430

2531
import { Auth, Dependencies } from '../../model/auth';
@@ -28,7 +34,8 @@ import { User } from '../../model/user';
2834
import { AuthErrorCode } from '../errors';
2935
import { Persistence } from '../persistence';
3036
import {
31-
_REDIRECT_USER_KEY_NAME, PersistenceUserManager
37+
_REDIRECT_USER_KEY_NAME,
38+
PersistenceUserManager
3239
} from '../persistence/persistence_user_manager';
3340
import { _reloadWithoutSaving } from '../user/reload';
3441
import { assert } from '../util/assert';
@@ -100,7 +107,11 @@ export class AuthImpl implements Auth {
100107
return this.reloadAndSetCurrentUserOrClear(storedUser);
101108
}
102109

103-
assert(this._popupRedirectResolver, this.name, AuthErrorCode.ARGUMENT_ERROR);
110+
assert(
111+
this._popupRedirectResolver,
112+
this.name,
113+
AuthErrorCode.ARGUMENT_ERROR
114+
);
104115
await this.getOrInitRedirectPersistenceManager();
105116

106117
// If the redirect user's event ID matches the current user's event ID,
@@ -177,14 +188,25 @@ export class AuthImpl implements Auth {
177188
);
178189
}
179190

180-
async _setRedirectUser(user: User|null, popupRedirectResolver?: externs.PopupRedirectResolver): Promise<void> {
181-
const redirectManager = await this.getOrInitRedirectPersistenceManager(popupRedirectResolver);
182-
return user === null ? redirectManager.removeCurrentUser() : redirectManager.setCurrentUser(user);
191+
async _setRedirectUser(
192+
user: User | null,
193+
popupRedirectResolver?: externs.PopupRedirectResolver
194+
): Promise<void> {
195+
const redirectManager = await this.getOrInitRedirectPersistenceManager(
196+
popupRedirectResolver
197+
);
198+
return user === null
199+
? redirectManager.removeCurrentUser()
200+
: redirectManager.setCurrentUser(user);
183201
}
184202

185-
private async getOrInitRedirectPersistenceManager(popupRedirectResolver?: externs.PopupRedirectResolver): Promise<PersistenceUserManager> {
203+
private async getOrInitRedirectPersistenceManager(
204+
popupRedirectResolver?: externs.PopupRedirectResolver
205+
): Promise<PersistenceUserManager> {
186206
if (!this.redirectPersistenceManager) {
187-
const resolver: PopupRedirectResolver | null = (popupRedirectResolver && _getInstance(popupRedirectResolver) || this._popupRedirectResolver);
207+
const resolver: PopupRedirectResolver | null =
208+
(popupRedirectResolver && _getInstance(popupRedirectResolver)) ||
209+
this._popupRedirectResolver;
188210
assert(resolver, this.name, AuthErrorCode.ARGUMENT_ERROR);
189211
this.redirectPersistenceManager = await PersistenceUserManager.create(
190212
this,

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ import { testAuth, testUser } from '../../../test/mock_auth';
2929
import { makeMockPopupRedirectResolver } from '../../../test/mock_popup_redirect_resolver';
3030
import { Auth } from '../../model/auth';
3131
import {
32-
AuthEvent, AuthEventType, EventManager, PopupRedirectResolver
32+
AuthEvent,
33+
AuthEventType,
34+
EventManager,
35+
PopupRedirectResolver
3336
} from '../../model/popup_redirect';
3437
import { AuthEventManager } from '../auth/auth_event_manager';
3538
import { AUTH_ERROR_FACTORY, AuthErrorCode } from '../errors';

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,19 @@ 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';
2630
import { debugAssert, fail } from '../util/assert';
2731
import { _link, _reauth, _signIn, IdpTask, IdpTaskParams } from './idp';
2832

2933
interface PendingPromise {
30-
resolve: (cred: UserCredential|null) => void;
34+
resolve: (cred: UserCredential | null) => void;
3135
reject: (error: Error) => void;
3236
}
3337

@@ -54,8 +58,8 @@ export abstract class AbstractPopupRedirectOperation
5458

5559
abstract onExecution(): Promise<void>;
5660

57-
execute(): Promise<UserCredential|null> {
58-
return new Promise<UserCredential|null>(async (resolve, reject) => {
61+
execute(): Promise<UserCredential | null> {
62+
return new Promise<UserCredential | null>(async (resolve, reject) => {
5963
this.pendingPromise = { resolve, reject };
6064

6165
try {
@@ -111,7 +115,7 @@ export abstract class AbstractPopupRedirectOperation
111115
}
112116
}
113117

114-
protected resolve(cred: UserCredential|null): void {
118+
protected resolve(cred: UserCredential | null): void {
115119
debugAssert(this.pendingPromise, 'Pending promise was never set');
116120
this.pendingPromise.resolve(cred);
117121
this.unregisterAndCleanUp();

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

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

23-
import { OperationType, PopupRedirectResolver, ProviderId } from '@firebase/auth-types-exp';
23+
import {
24+
OperationType,
25+
PopupRedirectResolver,
26+
ProviderId
27+
} from '@firebase/auth-types-exp';
2428
import { FirebaseError } from '@firebase/util';
2529

2630
import { delay } from '../../../test/delay';
@@ -39,8 +43,11 @@ import * as eid from '../util/event_id';
3943
import { AuthPopup } from '../util/popup';
4044
import * as idpTasks from './idp';
4145
import {
42-
_AUTH_EVENT_TIMEOUT, _POLL_WINDOW_CLOSE_TIMEOUT, linkWithPopup, reauthenticateWithPopup,
43-
signInWithPopup
46+
_AUTH_EVENT_TIMEOUT,
47+
_POLL_WINDOW_CLOSE_TIMEOUT,
48+
linkWithPopup,
49+
reauthenticateWithPopup,
50+
signInWithPopup
4451
} from './popup';
4552

4653
use(sinonChai);

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

Lines changed: 4 additions & 1 deletion
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 { assert, debugAssert } from '../util/assert';

0 commit comments

Comments
 (0)