Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(auth): Properly parse the lastRefreshTime. #888

Merged
merged 4 commits into from
May 12, 2020
Merged

fix(auth): Properly parse the lastRefreshTime. #888

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d5c216
Properly parse the lastRefreshTime.
rsgowman May 12, 2020
611a89c
review feedback
rsgowman May 12, 2020
eda6259
typo
rsgowman May 12, 2020
4d57db9
formatting nits
rsgowman May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/auth/user-record.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You also need to return this in toJSON and add a test for it

return {
  lastSignInTime: this.lastSignInTime,	
  creationTime: this.creationTime,
  lastRefreshTime: this.refreshTime,
};

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's in the followup (#889)

}

/** @return The plain object representation of the user's metadata. */
Expand Down
4 changes: 4 additions & 0 deletions test/integration/auth.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need ! to satisfy the compiler.

expect(creationTime).lte(lastRefreshTime);
expect(lastRefreshTime).lte(creationTime + 3600*1000);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add spaces: 3600 * 1000

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

});
} finally {
admin.auth().deleteUser('lastRefreshTimeUser');
Expand Down
6 changes: 6 additions & 0 deletions test/unit/auth/user-record.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,10 +616,12 @@ describe('UserInfo', () => {
describe('UserMetadata', () => {
const expectedLastLoginAt = 1476235905000;
const expectedCreatedAt = 1476136676000;
const expectedLastRefreshAt = "2016-10-12T01:31:45.000Z"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use single quotes:
'2016-10-12T01:31:45.000Z'

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

const actualMetadata: UserMetadata = new UserMetadata({
localId: 'uid123',
lastLoginAt: expectedLastLoginAt.toString(),
createdAt: expectedCreatedAt.toString(),
lastRefreshAt: expectedLastRefreshAt,
});
const expectedMetadataJSON = {
lastSignInTime: new Date(expectedLastLoginAt).toUTCString(),
Expand Down Expand Up @@ -676,6 +678,10 @@ describe('UserMetadata', () => {
(actualMetadata as any).creationTime = new Date();
}).to.throw(Error);
});

it('should return expected lastRefreshTime', () => {
expect(actualMetadata.lastRefreshTime).to.equal(new Date(expectedLastRefreshAt).toUTCString())
});
});

describe('toJSON', () => {
Expand Down