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

Setting Store Tokens should only clear tokens that no longer have a value #13584

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
+7 −1
Open

Setting Store Tokens should only clear tokens that no longer have a value #13584

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cb661c9
Setting Store Tokens should only clear tokens that no longer have a v…
jon-armen Jul 12, 2024
2b1aa72
Merge branch 'main' into jarmen/optimize-token-storage-events
jon-armen Dec 16, 2024
b27a09f
Merge branch 'main' into jarmen/optimize-token-storage-events
jon-armen Dec 20, 2024
c7900e9
Removing if/else pattern where arguments are not optional
jon-armen Dec 20, 2024
438a1a7
Merge branch 'main' into jarmen/optimize-token-storage-events
AllanZhengYP Jan 3, 2025
5ea9b0d
Merge branch 'main' into jarmen/optimize-token-storage-events
joon-won Jan 7, 2025
0bd1293
Remove attempt to set oauthMetadata
jon-armen Jan 7, 2025
51ac44d
Merge branch 'main' into jarmen/optimize-token-storage-events
jon-armen Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/auth/src/providers/cognito/tokenProvider/TokenStore.ts
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

Typewise, tokens.username, tokens.accessToken and tokens.clockDrift are non optional types so technically no need for the if...else on 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?

Copy link
Author

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.

Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,13 @@ export class DefaultTokenStore implements AuthTokenStore {

async storeTokens(tokens: CognitoAuthTokens): Promise<void> {
assert(tokens !== undefined, TokenProviderErrorCode.InvalidAuthTokens);
await this.clearTokens();
Copy link

Choose a reason for hiding this comment

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

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,
Expand All @@ -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) {
Expand All @@ -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(
Expand Down