Setting Store Tokens should only clear tokens that no longer have a value #13584
+8
−2
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -95,13 +95,13 @@ export class DefaultTokenStore implements AuthTokenStore { | |
|
|
||
| async storeTokens(tokens: CognitoAuthTokens): Promise<void> { | ||
| assert(tokens !== undefined, TokenProviderErrorCode.InvalidAuthTokens); | ||
|
There was a problem hiding this comment. we should assert that in the absence of this all keys in https://github.com/aws-amplify/amplify-js/blob/main/packages/auth/src/providers/cognito/tokenProvider/types.ts#L27 are cleared if unspecified. |
||
|
|
||
| const lastAuthUser = tokens.username; | ||
| await this.getKeyValueStorage().setItem( | ||
| this.getLastAuthUserKey(), | ||
| lastAuthUser, | ||
| ); | ||
|
|
||
| const authKeys = await this.getAuthKeys(); | ||
| await this.getKeyValueStorage().setItem( | ||
| authKeys.accessToken, | ||
|
|
@@ -113,13 +113,17 @@ export class DefaultTokenStore implements AuthTokenStore { | |
| authKeys.idToken, | ||
| tokens.idToken.toString(), | ||
| ); | ||
| } else { | ||
| await this.getKeyValueStorage().removeItem(authKeys.idToken); | ||
| } | ||
|
|
||
| if (tokens.refreshToken) { | ||
| await this.getKeyValueStorage().setItem( | ||
| authKeys.refreshToken, | ||
| tokens.refreshToken, | ||
| ); | ||
| } else { | ||
| await this.getKeyValueStorage().removeItem(authKeys.refreshToken); | ||
| } | ||
|
|
||
| if (tokens.deviceMetadata) { | ||
|
|
@@ -146,6 +150,8 @@ export class DefaultTokenStore implements AuthTokenStore { | |
| authKeys.signInDetails, | ||
| JSON.stringify(tokens.signInDetails), | ||
| ); | ||
| } else { | ||
| await this.getKeyValueStorage().removeItem(authKeys.signInDetails); | ||
| } | ||
|
|
||
| await this.getKeyValueStorage().setItem( | ||
|
|
||
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
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.
Typewise,
tokens.username,tokens.accessTokenandtokens.clockDriftare non optional types so technically no need for theif...elseon line 100, 110, and 165 since also in the before changes they were just being set.Maybe we can remove the if...else from those ones?
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.
I've removed the extra if/else statements.