Skip to content

Commit 91e3998

Browse files
sam-gcsam-gc
committed
Formatting
1 parent 847f6d8 commit 91e3998

File tree

6 files changed

+102
-52
lines changed

6 files changed

+102
-52
lines changed

‎packages-exp/auth-exp/src/core/user/account_info.test.ts

Lines changed: 54 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -65,35 +65,44 @@ describe('core/user/profile', () => {
6565
});
6666

6767
it('calls the setAccountInfo endpoint', async () => {
68-
const ep =mockEndpoint(Endpoint.SET_ACCOUNT_INFO, {});
68+
const ep = mockEndpoint(Endpoint.SET_ACCOUNT_INFO, {});
6969

70-
await updateProfile(user, {displayName: 'displayname', photoURL: 'photo'});
70+
await updateProfile(user, {
71+
displayName: 'displayname',
72+
photoURL: 'photo'
73+
});
7174
expect(ep.calls[0].request).to.eql({
7275
idToken: 'access-token',
7376
displayName: 'displayname',
74-
photoUrl: 'photo',
77+
photoUrl: 'photo'
7578
});
7679
});
7780

7881
it('sets the fields on the user based on the response', async () => {
7982
mockEndpoint(Endpoint.SET_ACCOUNT_INFO, {
8083
displayName: 'response-name',
81-
photoUrl: 'response-photo',
84+
photoUrl: 'response-photo'
8285
});
8386

84-
await updateProfile(user, {displayName: 'displayname', photoURL: 'photo'});
87+
await updateProfile(user, {
88+
displayName: 'displayname',
89+
photoURL: 'photo'
90+
});
8591
expect(user.displayName).to.eq('response-name');
8692
expect(user.photoURL).to.eq('response-photo');
8793
});
8894

8995
it('sets the fields on the password provider', async () => {
9096
mockEndpoint(Endpoint.SET_ACCOUNT_INFO, {
9197
displayName: 'response-name',
92-
photoUrl: 'response-photo',
98+
photoUrl: 'response-photo'
9399
});
94-
user.providerData = [{...PASSWORD_PROVIDER}];
100+
user.providerData = [{ ...PASSWORD_PROVIDER }];
95101

96-
await updateProfile(user, {displayName: 'displayname', photoURL: 'photo'});
102+
await updateProfile(user, {
103+
displayName: 'displayname',
104+
photoURL: 'photo'
105+
});
97106
const provider = user.providerData[0];
98107
expect(provider.displayName).to.eq('response-name');
99108
expect(provider.photoURL).to.eq('response-photo');
@@ -103,14 +112,14 @@ describe('core/user/profile', () => {
103112
describe('#updateEmail', () => {
104113
it('calls the setAccountInfo endpoint and reloads the user', async () => {
105114
const set = mockEndpoint(Endpoint.SET_ACCOUNT_INFO, {});
106-
mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {users: [
107-
{localId: 'new-uid-to-prove-refresh-got-called'},
108-
]});
115+
mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
116+
users: [{ localId: 'new-uid-to-prove-refresh-got-called' }]
117+
});
109118

110119
await updateEmail(user, '[email protected]');
111120
expect(set.calls[0].request).to.eql({
112121
idToken: 'access-token',
113-
email: '[email protected]',
122+
email: '[email protected]'
114123
});
115124

116125
expect(user.uid).to.eq('new-uid-to-prove-refresh-got-called');
@@ -120,14 +129,14 @@ describe('core/user/profile', () => {
120129
describe('#updatePassword', () => {
121130
it('calls the setAccountInfo endpoint and reloads the user', async () => {
122131
const set = mockEndpoint(Endpoint.SET_ACCOUNT_INFO, {});
123-
mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {users: [
124-
{localId: 'new-uid-to-prove-refresh-got-called'},
125-
]});
132+
mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
133+
users: [{ localId: 'new-uid-to-prove-refresh-got-called' }]
134+
});
126135

127136
await updatePassword(user, 'pass');
128137
expect(set.calls[0].request).to.eql({
129138
idToken: 'access-token',
130-
password: 'pass',
139+
password: 'pass'
131140
});
132141

133142
expect(user.uid).to.eq('new-uid-to-prove-refresh-got-called');
@@ -152,89 +161,101 @@ describe('core/user/profile', () => {
152161
mockEndpoint(Endpoint.SET_ACCOUNT_INFO, {
153162
idToken: 'new-id-token',
154163
refreshToken: 'new-refresh-token',
155-
expiresIn: 300,
164+
expiresIn: 300
156165
});
157166

158-
await updateProfile(user, {displayName: 'd'});
167+
await updateProfile(user, { displayName: 'd' });
159168
expect(idTokenChange).to.have.been.called;
160-
expect(auth.persistenceLayer.lastObjectSet).to.eql(user.toPlainObject());
169+
expect(auth.persistenceLayer.lastObjectSet).to.eql(
170+
user.toPlainObject()
171+
);
161172
});
162173

163174
it('does NOT trigger a token update if unnecessary', async () => {
164175
mockEndpoint(Endpoint.SET_ACCOUNT_INFO, {
165176
idToken: 'access-token',
166177
refreshToken: 'refresh-token',
167-
expiresIn: 300,
178+
expiresIn: 300
168179
});
169180

170-
await updateProfile(user, {displayName: 'd'});
181+
await updateProfile(user, { displayName: 'd' });
171182
expect(idTokenChange).not.to.have.been.called;
172-
expect(auth.persistenceLayer.lastObjectSet).to.eql(user.toPlainObject());
183+
expect(auth.persistenceLayer.lastObjectSet).to.eql(
184+
user.toPlainObject()
185+
);
173186
});
174187
});
175188

176189
describe('#updateEmail', () => {
177190
beforeEach(() => {
178191
// This is necessary because this method calls reload; we don't care about that though,
179192
// for these tests we're looking at the change listeners
180-
mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {users: [{}]});
193+
mockEndpoint(Endpoint.GET_ACCOUNT_INFO, { users: [{}] });
181194
});
182195

183196
it('triggers a token update if necessary', async () => {
184197
mockEndpoint(Endpoint.SET_ACCOUNT_INFO, {
185198
idToken: 'new-id-token',
186199
refreshToken: 'new-refresh-token',
187-
expiresIn: 300,
200+
expiresIn: 300
188201
});
189202

190203
await updatePassword(user, '[email protected]');
191204
expect(idTokenChange).to.have.been.called;
192-
expect(auth.persistenceLayer.lastObjectSet).to.eql(user.toPlainObject());
205+
expect(auth.persistenceLayer.lastObjectSet).to.eql(
206+
user.toPlainObject()
207+
);
193208
});
194209

195210
it('does NOT trigger a token update if unnecessary', async () => {
196211
mockEndpoint(Endpoint.SET_ACCOUNT_INFO, {
197212
idToken: 'access-token',
198213
refreshToken: 'refresh-token',
199-
expiresIn: 300,
214+
expiresIn: 300
200215
});
201216

202217
await updateEmail(user, '[email protected]');
203218
expect(idTokenChange).not.to.have.been.called;
204-
expect(auth.persistenceLayer.lastObjectSet).to.eql(user.toPlainObject());
219+
expect(auth.persistenceLayer.lastObjectSet).to.eql(
220+
user.toPlainObject()
221+
);
205222
});
206223
});
207224

208225
describe('#updatePassword', () => {
209226
beforeEach(() => {
210227
// This is necessary because this method calls reload; we don't care about that though,
211228
// for these tests we're looking at the change listeners
212-
mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {users: [{}]});
229+
mockEndpoint(Endpoint.GET_ACCOUNT_INFO, { users: [{}] });
213230
});
214231

215232
it('triggers a token update if necessary', async () => {
216233
mockEndpoint(Endpoint.SET_ACCOUNT_INFO, {
217234
idToken: 'new-id-token',
218235
refreshToken: 'new-refresh-token',
219-
expiresIn: 300,
236+
expiresIn: 300
220237
});
221238

222239
await updatePassword(user, 'pass');
223240
expect(idTokenChange).to.have.been.called;
224-
expect(auth.persistenceLayer.lastObjectSet).to.eql(user.toPlainObject());
241+
expect(auth.persistenceLayer.lastObjectSet).to.eql(
242+
user.toPlainObject()
243+
);
225244
});
226245

227246
it('does NOT trigger a token update if unnecessary', async () => {
228247
mockEndpoint(Endpoint.SET_ACCOUNT_INFO, {
229248
idToken: 'access-token',
230249
refreshToken: 'refresh-token',
231-
expiresIn: 300,
250+
expiresIn: 300
232251
});
233252

234253
await updatePassword(user, 'pass');
235254
expect(idTokenChange).not.to.have.been.called;
236-
expect(auth.persistenceLayer.lastObjectSet).to.eql(user.toPlainObject());
255+
expect(auth.persistenceLayer.lastObjectSet).to.eql(
256+
user.toPlainObject()
257+
);
237258
});
238259
});
239260
});
240-
});
261+
});

‎packages-exp/auth-exp/src/core/user/account_info.ts

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,39 @@
1818
import * as externs from '@firebase/auth-types-exp';
1919

2020
import {
21-
updateEmailPassword as apiUpdateEmailPassword, UpdateEmailPasswordRequest
21+
updateEmailPassword as apiUpdateEmailPassword,
22+
UpdateEmailPasswordRequest
2223
} from '../../api/account_management/email_and_password';
2324
import { updateProfile as apiUpdateProfile } from '../../api/account_management/profile';
2425
import { User } from '../../model/user';
2526
import { _reloadWithoutSaving } from './reload';
2627

2728
interface Profile {
28-
displayName?: string|null;
29-
photoURL?: string|null;
29+
displayName?: string | null;
30+
photoURL?: string | null;
3031
}
3132

32-
export async function updateProfile(externUser: externs.User, {displayName, photoURL: photoUrl}: Profile): Promise<void> {
33+
export async function updateProfile(
34+
externUser: externs.User,
35+
{ displayName, photoURL: photoUrl }: Profile
36+
): Promise<void> {
3337
if (displayName === undefined && photoUrl === undefined) {
3438
return;
3539
}
3640

3741
const user = externUser as User;
38-
const {auth} = user;
42+
const { auth } = user;
3943
const idToken = await user.getIdToken();
40-
const profileRequest = {idToken, displayName, photoUrl};
44+
const profileRequest = { idToken, displayName, photoUrl };
4145
const response = await apiUpdateProfile(user.auth, profileRequest);
4246

4347
user.displayName = response.displayName || null;
4448
user.photoURL = response.photoUrl || null;
4549

4650
// Update the password provider as well
47-
const passwordProvider = user.providerData.find(p => p.providerId === externs.ProviderId.PASSWORD);
51+
const passwordProvider = user.providerData.find(
52+
p => p.providerId === externs.ProviderId.PASSWORD
53+
);
4854
if (passwordProvider) {
4955
passwordProvider.displayName = user.displayName;
5056
passwordProvider.photoURL = user.photoURL;
@@ -57,35 +63,45 @@ export async function updateProfile(externUser: externs.User, {displayName, phot
5763
}
5864
}
5965

60-
export function updateEmail(externUser: externs.User, newEmail: string): Promise<void> {
66+
export function updateEmail(
67+
externUser: externs.User,
68+
newEmail: string
69+
): Promise<void> {
6170
const user = externUser as User;
6271
return updateEmailOrPassword(user, newEmail, null);
6372
}
6473

65-
export function updatePassword(externUser: externs.User, newPassword: string): Promise<void> {
74+
export function updatePassword(
75+
externUser: externs.User,
76+
newPassword: string
77+
): Promise<void> {
6678
const user = externUser as User;
6779
return updateEmailOrPassword(user, null, newPassword);
6880
}
6981

70-
async function updateEmailOrPassword(user: User, email: string|null, password: string|null): Promise<void> {
71-
const {auth} = user;
82+
async function updateEmailOrPassword(
83+
user: User,
84+
email: string | null,
85+
password: string | null
86+
): Promise<void> {
87+
const { auth } = user;
7288
const idToken = await user.getIdToken();
73-
const request: UpdateEmailPasswordRequest = {idToken};
89+
const request: UpdateEmailPasswordRequest = { idToken };
7490

7591
if (email) {
7692
request.email = email;
7793
}
78-
94+
7995
if (password) {
8096
request.password = password;
8197
}
8298

8399
const response = await apiUpdateEmailPassword(auth, request);
84-
100+
85101
const tokensRefreshed = user._updateTokensIfNecessary(response);
86102
await _reloadWithoutSaving(user);
87103
await auth._persistUserIfCurrent(user);
88104
if (tokensRefreshed) {
89105
auth._notifyListenersIfCurrent(user);
90106
}
91-
}
107+
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ import { mockEndpoint } from '../../../test/api/helper';
2626
import { testAuth, TestAuth, testUser } from '../../../test/mock_auth';
2727
import * as fetch from '../../../test/mock_fetch';
2828
import { Endpoint } from '../../api';
29-
import { APIUserInfo, ProviderUserInfo } from '../../api/account_management/account';
29+
import {
30+
APIUserInfo,
31+
ProviderUserInfo
32+
} from '../../api/account_management/account';
3033
import { _reloadWithoutSaving, reload } from './reload';
3134

3235
use(chaiAsPromised);

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717

1818
import * as externs from '@firebase/auth-types-exp';
1919

20-
import { getAccountInfo, ProviderUserInfo } from '../../api/account_management/account';
20+
import {
21+
getAccountInfo,
22+
ProviderUserInfo
23+
} from '../../api/account_management/account';
2124
import { User } from '../../model/user';
2225
import { assert } from '../util/assert';
2326

‎packages-exp/auth-exp/src/core/user/user_impl.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ export class UserImpl implements User {
9999
}
100100

101101
_updateTokensIfNecessary(response: IdTokenResponse): boolean {
102-
if (response.idToken && response.idToken !== this.stsTokenManager.accessToken) {
102+
if (
103+
response.idToken &&
104+
response.idToken !== this.stsTokenManager.accessToken
105+
) {
103106
this.stsTokenManager.updateFromServerResponse(response);
104107
return true;
105108
}

‎packages-exp/auth-exp/src/index.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ export {
4444
} from './core/strategies/email';
4545

4646
// core/user
47-
export { updateProfile, updateEmail, updatePassword } from './core/user/account_info';
47+
export {
48+
updateProfile,
49+
updateEmail,
50+
updatePassword
51+
} from './core/user/account_info';
4852
export { getIdToken, getIdTokenResult } from './core/user/id_token_result';
4953
export { reload } from './core/user/reload';
5054

0 commit comments

Comments
 (0)