fix(auth): Properly parse the lastRefreshTime. #888
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It's returned from the server in a different format than the other timestamps. Fixes #887
hiranya911
changed the title
hiranya911
suggested changes
May 12, 2020
hiranya911
reviewed
May 12, 2020
test/integration/auth.spec.ts
Outdated
| @@ -336,6 +336,10 @@ describe('admin.auth', () => { | |||
| .then((userRecord) => { | |||
| expect(userRecord.metadata.lastRefreshTime).to.exist; | |||
| expect(isUTCString(userRecord.metadata.lastRefreshTime!)); | |||
| const creationTime = new Date(userRecord.metadata.creationTime).getTime(); | |||
| const lastRefreshTime = new Date(userRecord.metadata.lastRefreshTime).getTime(); | |||
There was a problem hiding this comment.
You need ! to satisfy the compiler.
bojeil-google
suggested changes
May 12, 2020
test/integration/auth.spec.ts
Outdated
| const creationTime = new Date(userRecord.metadata.creationTime).getTime(); | ||
| const lastRefreshTime = new Date(userRecord.metadata.lastRefreshTime!).getTime(); | ||
| expect(creationTime).lte(lastRefreshTime); | ||
| expect(lastRefreshTime).lte(creationTime + 3600*1000); |
There was a problem hiding this comment.
add spaces: 3600 * 1000
| @@ -326,7 +326,8 @@ export class UserMetadata { | |||
| // These bugs have already been addressed since then. | |||
| utils.addReadonlyGetter(this, 'creationTime', parseDate(response.createdAt)); | |||
| utils.addReadonlyGetter(this, 'lastSignInTime', parseDate(response.lastLoginAt)); | |||
| utils.addReadonlyGetter(this, 'lastRefreshTime', parseDate(response.lastRefreshAt)); | |||
| const lastRefreshAt = response.lastRefreshAt ? new Date(response.lastRefreshAt).toUTCString() : null; | |||
| utils.addReadonlyGetter(this, 'lastRefreshTime', lastRefreshAt); | |||
There was a problem hiding this comment.
You also need to return this in toJSON and add a test for it
return {
lastSignInTime: this.lastSignInTime,
creationTime: this.creationTime,
lastRefreshTime: this.refreshTime,
};
There was a problem hiding this comment.
It's in the followup (#889)
test/unit/auth/user-record.spec.ts
Outdated
| @@ -616,10 +616,12 @@ describe('UserInfo', () => { | |||
| describe('UserMetadata', () => { | |||
| const expectedLastLoginAt = 1476235905000; | |||
| const expectedCreatedAt = 1476136676000; | |||
| const expectedLastRefreshAt = "2016-10-12T01:31:45.000Z" | |||
There was a problem hiding this comment.
Use single quotes:
'2016-10-12T01:31:45.000Z'
bojeil-google
approved these changes
May 12, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It's returned from the server in a different format than the other timestamps.
Fixes #887