-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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.
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
fix(@aws-amplify/auth): correctly throw the error when the refresh token is expired #1507
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -858,43 +858,43 @@ export default class AuthClass { | |
} | ||
|
||
// refresh the session if the session expired. | ||
user.getSession(function(err, session) { | ||
user.getSession((err, session) => { | ||
if (err) { | ||
logger.debug('Failed to get the user session', err); | ||
rej(err); | ||
return; | ||
} | ||
}); | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we add a unit test that ensures the these functions are not called concurrently |
||
// get user data from Cognito | ||
user.getUserData((err, data) => { | ||
if (err) { | ||
logger.debug('getting user data failed', err); | ||
// Make sure the user is still valid | ||
if (err.message === 'User is disabled' || err.message === 'User does not exist.') { | ||
rej(err); | ||
} else { | ||
// the error may also be thrown when lack of permissions to get user info etc | ||
// in that case we just bypass the error | ||
res(user); | ||
} | ||
return; | ||
} | ||
const preferredMFA = data.PreferredMfaSetting || 'NOMFA'; | ||
const attributeList = []; | ||
|
||
// get user data from Cognito | ||
user.getUserData((err, data) => { | ||
if (err) { | ||
logger.debug('getting user data failed', err); | ||
// Make sure the user is still valid | ||
if (err.message === 'User is disabled' || err.message === 'User does not exist.') { | ||
rej(err); | ||
} else { | ||
// the error may also be thrown when lack of permissions to get user info etc | ||
// in that case we just bypass the error | ||
res(user); | ||
for (let i = 0; i < data.UserAttributes.length; i++) { | ||
const attribute = { | ||
Name: data.UserAttributes[i].Name, | ||
Value: data.UserAttributes[i].Value, | ||
}; | ||
const userAttribute = new CognitoUserAttribute(attribute); | ||
attributeList.push(userAttribute); | ||
} | ||
return; | ||
} | ||
const preferredMFA = data.PreferredMfaSetting || 'NOMFA'; | ||
const attributeList = []; | ||
|
||
for (let i = 0; i < data.UserAttributes.length; i++) { | ||
const attribute = { | ||
Name: data.UserAttributes[i].Name, | ||
Value: data.UserAttributes[i].Value, | ||
}; | ||
const userAttribute = new CognitoUserAttribute(attribute); | ||
attributeList.push(userAttribute); | ||
} | ||
|
||
const attributes = this.attributesToObject(attributeList); | ||
Object.assign(user, {attributes, preferredMFA}); | ||
res(user); | ||
const attributes = that.attributesToObject(attributeList); | ||
Object.assign(user, {attributes, preferredMFA}); | ||
res(user); | ||
}); | ||
}); | ||
}); | ||
}); | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This test should be re-written to use
expect().toThrow
. The tests are more readable with this changeThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The test will fail when using
toThrow
to catch a rejection. I followed the suggestion in this thread: jestjs/jest#1377 (comment)