Skip to content

Commit 50bfb92

Browse files
committed
[AUTOMATED]: Prettier Code Styling
1 parent af1571a commit 50bfb92

File tree

4 files changed

+35
-20
lines changed

4 files changed

+35
-20
lines changed

packages-exp/auth-exp/src/core/user/token_manager.test.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe('core/user/token_manager', () => {
3939

4040
describe('#isExpired', () => {
4141
it('is true if past expiration time', () => {
42-
stsTokenManager.expirationTime = 1; // Ancient history
42+
stsTokenManager.expirationTime = 1; // Ancient history
4343
expect(stsTokenManager.isExpired).to.eq(true);
4444
});
4545

@@ -60,7 +60,7 @@ describe('core/user/token_manager', () => {
6060
stsTokenManager.updateFromServerResponse({
6161
idToken: 'id-token',
6262
refreshToken: 'refresh-token',
63-
expiresIn: '60', // From the server this is 30s
63+
expiresIn: '60' // From the server this is 30s
6464
} as IdTokenResponse);
6565

6666
expect(stsTokenManager.expirationTime).to.eq(now + 60_000);
@@ -71,12 +71,18 @@ describe('core/user/token_manager', () => {
7171

7272
describe('#getToken', () => {
7373
it('throws if forceRefresh is true', async () => {
74-
Object.assign(stsTokenManager, {accessToken: 'token', expirationTime: now + 100_000});
74+
Object.assign(stsTokenManager, {
75+
accessToken: 'token',
76+
expirationTime: now + 100_000
77+
});
7578
await expect(stsTokenManager.getToken(true)).to.be.rejectedWith(Error);
7679
});
7780

7881
it('throws if token is expired', async () => {
79-
Object.assign(stsTokenManager, {accessToken: 'token', expirationTime: now - 1});
82+
Object.assign(stsTokenManager, {
83+
accessToken: 'token',
84+
expirationTime: now - 1
85+
});
8086
await expect(stsTokenManager.getToken()).to.be.rejectedWith(Error);
8187
});
8288

@@ -88,12 +94,12 @@ describe('core/user/token_manager', () => {
8894
Object.assign(stsTokenManager, {
8995
accessToken: 'token',
9096
refreshToken: 'refresh',
91-
expirationTime: now + 100_000,
97+
expirationTime: now + 100_000
9298
});
9399

94100
const tokens = await stsTokenManager.getToken();
95101
expect(tokens.accessToken).to.eq('token');
96102
expect(tokens.refreshToken).to.eq('refresh');
97103
});
98104
});
99-
});
105+
});

packages-exp/auth-exp/src/core/user/token_manager.ts

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,39 +25,46 @@ const TOKEN_REFRESH_BUFFER_MS = 30_000;
2525

2626
export interface Tokens {
2727
accessToken: string;
28-
refreshToken: string|null;
28+
refreshToken: string | null;
2929
}
3030

3131
export const DATE_GENERATOR = {
32-
now: () => Date.now(),
32+
now: () => Date.now()
3333
};
3434

3535
export class StsTokenManager {
36-
refreshToken: string|null = null;
37-
accessToken: string|null = null;
38-
expirationTime: number|null = null;
36+
refreshToken: string | null = null;
37+
accessToken: string | null = null;
38+
expirationTime: number | null = null;
3939

4040
get isExpired(): boolean {
41-
return !this.expirationTime ||
42-
DATE_GENERATOR.now() > this.expirationTime - TOKEN_REFRESH_BUFFER_MS;
41+
return (
42+
!this.expirationTime ||
43+
DATE_GENERATOR.now() > this.expirationTime - TOKEN_REFRESH_BUFFER_MS
44+
);
4345
}
4446

45-
updateFromServerResponse({idToken, refreshToken, expiresIn}: IdTokenResponse): void {
47+
updateFromServerResponse({
48+
idToken,
49+
refreshToken,
50+
expiresIn
51+
}: IdTokenResponse): void {
4652
this.refreshToken = refreshToken;
4753
this.accessToken = idToken;
48-
this.expirationTime = DATE_GENERATOR.now() + (Number.parseInt(expiresIn, 10) * 1000);
54+
this.expirationTime =
55+
DATE_GENERATOR.now() + Number.parseInt(expiresIn, 10) * 1000;
4956
}
5057

5158
async getToken(forceRefresh = false): Promise<Tokens> {
5259
if (!forceRefresh && this.accessToken && !this.isExpired) {
5360
return {
5461
accessToken: this.accessToken,
55-
refreshToken: this.refreshToken,
62+
refreshToken: this.refreshToken
5663
};
5764
}
5865

5966
throw new Error('StsTokenManager: token refresh not implemented');
6067
}
6168

6269
// TODO: There are a few more methods in here that need implemented
63-
}
70+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ describe('core/user/user_impl', () => {
7070
stsTokenManager.updateFromServerResponse({
7171
idToken: 'id-token-string',
7272
refreshToken: 'refresh-token-string',
73-
expiresIn: '100000',
73+
expiresIn: '100000'
7474
} as IdTokenResponse);
7575

76-
const user = new UserImpl({uid: 'uid', auth, stsTokenManager});
76+
const user = new UserImpl({ uid: 'uid', auth, stsTokenManager });
7777
const token = await user.getIdToken();
7878
expect(token).to.eq('id-token-string');
7979
expect(user.refreshToken).to.eq('refresh-token-string');

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ export class UserImpl implements User {
5858
}
5959

6060
async getIdToken(forceRefresh?: boolean): Promise<string> {
61-
const {refreshToken, accessToken} = await this.stsTokenManager.getToken(forceRefresh);
61+
const { refreshToken, accessToken } = await this.stsTokenManager.getToken(
62+
forceRefresh
63+
);
6264
this.refreshToken = refreshToken || '';
6365

6466
// TODO: notify listeners at this point

0 commit comments

Comments
 (0)