Skip to content

Commit

Permalink
chore: Sync console-preview with next/main (#12216)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jimblanc
jimblanc authored Oct 5, 2023
2 parents 7049e04 + 0d030ed commit d807e55
Show file tree
Hide file tree
Showing 8 changed files with 143 additions and 77 deletions.
10 changes: 5 additions & 5 deletions packages/analytics/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,18 @@
],
"dependencies": {
"tslib": "^2.5.0",
"uuid": "^9.0.0"
"uuid": "^9.0.0",
"@aws-sdk/client-kinesis": "3.398.0",
"@aws-sdk/client-firehose": "3.398.0",
"@aws-sdk/client-personalize-events": "3.398.0",
"@smithy/util-utf8": "2.0.0"
},
"peerDependencies": {
"@aws-amplify/core": "^6.0.0"
},
"devDependencies": {
"@aws-amplify/core": "6.0.0",
"@aws-sdk/client-kinesis": "3.398.0",
"@aws-sdk/client-firehose": "3.398.0",
"@aws-sdk/client-personalize-events": "3.398.0",
"@aws-sdk/types": "3.398.0",
"@smithy/util-utf8": "2.0.0",
"@types/uuid": "^9.0.0",
"typescript": "5.0.2"
},
Expand Down
51 changes: 51 additions & 0 deletions packages/auth/__tests__/providers/cognito/tokenProvider.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,57 @@ describe('Loading tokens', () => {
expect(result?.deviceMetadata?.randomPassword).toBe('random-password');
expect(result?.deviceMetadata?.deviceKey).toBe('device-key');
});

test('load device tokens from store', async () => {
const tokenStore = new DefaultTokenStore();
const memoryStorage = new MemoryStorage();
const userPoolClientId = 'userPoolClientId';
const userSub1 = '[email protected]';
const userSub1Encoded = 'user1%40email.com';
const userSub2 = '[email protected]';

memoryStorage.setItem(
`CognitoIdentityServiceProvider.${userPoolClientId}.${userSub1Encoded}.deviceKey`,
'user1-device-key'
);
memoryStorage.setItem(
`CognitoIdentityServiceProvider.${userPoolClientId}.${userSub1Encoded}.deviceGroupKey`,
'user1-device-group-key'
);
memoryStorage.setItem(
`CognitoIdentityServiceProvider.${userPoolClientId}.${userSub1Encoded}.randomPasswordKey`,
'user1-random-password'
);
memoryStorage.setItem(
`CognitoIdentityServiceProvider.${userPoolClientId}.${userSub2}.deviceKey`,
'user2-device-key'
);
memoryStorage.setItem(
`CognitoIdentityServiceProvider.${userPoolClientId}.${userSub2}.deviceGroupKey`,
'user2-device-group-key'
);
memoryStorage.setItem(
`CognitoIdentityServiceProvider.${userPoolClientId}.${userSub2}.randomPasswordKey`,
'user2-random-password'
);

tokenStore.setKeyValueStorage(memoryStorage);
tokenStore.setAuthConfig({
Cognito: {
userPoolId: 'us-east-1:1111111',
userPoolClientId,
},
});
const user1DeviceMetadata = await tokenStore.getDeviceMetadata(userSub1);
expect(user1DeviceMetadata?.randomPassword).toBe('user1-random-password');
expect(user1DeviceMetadata?.deviceGroupKey).toBe('user1-device-group-key');
expect(user1DeviceMetadata?.deviceKey).toBe('user1-device-key');

const user2DeviceMetadata = await tokenStore.getDeviceMetadata(userSub2);
expect(user2DeviceMetadata?.randomPassword).toBe('user2-random-password');
expect(user2DeviceMetadata?.deviceGroupKey).toBe('user2-device-group-key');
expect(user2DeviceMetadata?.deviceKey).toBe('user2-device-key');
});
});

describe('saving tokens', () => {
Expand Down
5 changes: 1 addition & 4 deletions packages/auth/src/providers/cognito/apis/signInWithRedirect.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,7 @@ async function handleCodeFlow({
}
const code = url.searchParams.get('code');

const currentUrlPathname = url.pathname ?? '/';
const redirectUriPathname = new URL(redirectUri).pathname ?? '/';

if (!code || currentUrlPathname !== redirectUriPathname) {
if (!code) {
return;
}

Expand Down
8 changes: 4 additions & 4 deletions packages/auth/src/providers/cognito/tokenProvider/TokenOrchestrator.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ export class TokenOrchestrator implements AuthTokenOrchestrator {
return this.getTokenStore().clearTokens();
}

getDeviceMetadata(): Promise<DeviceMetadata | null> {
return this.getTokenStore().getDeviceMetadata();
getDeviceMetadata(username?: string): Promise<DeviceMetadata | null> {
return this.getTokenStore().getDeviceMetadata(username);
}
clearDeviceMetadata(): Promise<void> {
return this.getTokenStore().clearDeviceMetadata();
clearDeviceMetadata(username?: string): Promise<void> {
return this.getTokenStore().clearDeviceMetadata(username);
}
}
34 changes: 26 additions & 8 deletions packages/auth/src/providers/cognito/tokenProvider/TokenStore.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ export class DefaultTokenStore implements AuthTokenStore {
]);
}

async getDeviceMetadata(): Promise<DeviceMetadata | null> {
const authKeys = await this.getAuthKeys();
async getDeviceMetadata(username?: string): Promise<DeviceMetadata | null> {
const authKeys = await this.getDeviceAuthKeys(username);
const deviceKey = await this.getKeyValueStorage().getItem(
authKeys.deviceKey
);
Expand All @@ -165,25 +165,43 @@ export class DefaultTokenStore implements AuthTokenStore {
}
: null;
}
async clearDeviceMetadata(): Promise<void> {
const authKeys = await this.getAuthKeys();
async clearDeviceMetadata(username?: string): Promise<void> {
const authKeys = await this.getDeviceAuthKeys(username);
await Promise.all([
this.getKeyValueStorage().removeItem(authKeys.deviceKey),
this.getKeyValueStorage().removeItem(authKeys.deviceGroupKey),
this.getKeyValueStorage().removeItem(authKeys.randomPasswordKey),
]);
}

private async getAuthKeys(): Promise<
AuthKeys<keyof typeof AuthTokenStorageKeys>
> {
private async getAuthKeys(
username?: string
): Promise<AuthKeys<keyof typeof AuthTokenStorageKeys>> {
assertTokenProviderConfig(this.authConfig?.Cognito);
const lastAuthUser = await this.getLastAuthUser();
const lastAuthUser = username ?? (await this.getLastAuthUser());
return createKeysForAuthStorage(
this.name,
`${this.authConfig.Cognito.userPoolClientId}.${lastAuthUser}`
);
}
private async getDeviceAuthKeys(
username?: string
): Promise<AuthKeys<keyof typeof AuthTokenStorageKeys>> {
let authKeys: AuthKeys<keyof typeof AuthTokenStorageKeys>;
if (username) {
const authEncodedKeys = await this.getAuthKeys(
encodeURIComponent(username)
);
const authNonEncodedKeys = await this.getAuthKeys(username);
const isEncodedKeysPresent = !!(await this.getKeyValueStorage().getItem(
authEncodedKeys.randomPasswordKey
));
authKeys = isEncodedKeysPresent ? authEncodedKeys : authNonEncodedKeys;
} else {
authKeys = await this.getAuthKeys();
}
return authKeys;
}

private getLastAuthUserKey() {
assertTokenProviderConfig(this.authConfig?.Cognito);
Expand Down
8 changes: 4 additions & 4 deletions packages/auth/src/providers/cognito/tokenProvider/types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ export interface AuthTokenStore {
storeTokens(tokens: CognitoAuthTokens): Promise<void>;
clearTokens(): Promise<void>;
setKeyValueStorage(keyValueStorage: KeyValueStorageInterface): void;
getDeviceMetadata(): Promise<DeviceMetadata | null>;
clearDeviceMetadata(): Promise<void>;
getDeviceMetadata(username?: string): Promise<DeviceMetadata | null>;
clearDeviceMetadata(username?: string): Promise<void>;
}

export interface AuthTokenOrchestrator {
Expand All @@ -46,8 +46,8 @@ export interface AuthTokenOrchestrator {
getTokens: (options?: FetchAuthSessionOptions) => Promise<AuthTokens | null>;
setTokens: ({ tokens }: { tokens: CognitoAuthTokens }) => Promise<void>;
clearTokens: () => Promise<void>;
getDeviceMetadata(): Promise<DeviceMetadata | null>;
clearDeviceMetadata(): Promise<void>;
getDeviceMetadata(username?: string): Promise<DeviceMetadata | null>;
clearDeviceMetadata(username?: string): Promise<void>;
}

export interface CognitoUserPoolTokenProviderType extends TokenProvider {
Expand Down
16 changes: 8 additions & 8 deletions packages/auth/src/providers/cognito/utils/signInHelpers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export async function handleCustomChallenge({
ANSWER: challengeResponse,
};

const deviceMetadata = await tokenOrchestrator?.getDeviceMetadata();
const deviceMetadata = await tokenOrchestrator?.getDeviceMetadata(username);
if (deviceMetadata && deviceMetadata.deviceKey) {
challengeResponses['DEVICE_KEY'] = deviceMetadata.deviceKey;
}
Expand Down Expand Up @@ -267,7 +267,7 @@ export async function handleUserPasswordAuthFlow(
USERNAME: username,
PASSWORD: password,
};
const deviceMetadata = await tokenOrchestrator.getDeviceMetadata();
const deviceMetadata = await tokenOrchestrator.getDeviceMetadata(username);

if (deviceMetadata && deviceMetadata.deviceKey) {
authParameters['DEVICE_KEY'] = deviceMetadata.deviceKey;
Expand Down Expand Up @@ -310,7 +310,7 @@ export async function handleUserSRPAuthFlow(
USERNAME: username,
SRP_A: authenticationHelper.A.toString(16),
};
const deviceMetadata = await tokenOrchestrator.getDeviceMetadata();
const deviceMetadata = await tokenOrchestrator.getDeviceMetadata(username);

if (deviceMetadata && deviceMetadata.deviceKey) {
authParameters['DEVICE_KEY'] = deviceMetadata.deviceKey;
Expand Down Expand Up @@ -346,7 +346,7 @@ export async function handleCustomAuthFlowWithoutSRP(
const authParameters: Record<string, string> = {
USERNAME: username,
};
const deviceMetadata = await tokenOrchestrator.getDeviceMetadata();
const deviceMetadata = await tokenOrchestrator.getDeviceMetadata(username);

if (deviceMetadata && deviceMetadata.deviceKey) {
authParameters['DEVICE_KEY'] = deviceMetadata.deviceKey;
Expand Down Expand Up @@ -386,7 +386,7 @@ export async function handleCustomSRPAuthFlow(
const userPoolName = userPoolId?.split('_')[1] || '';
const authenticationHelper = await getAuthenticationHelper(userPoolName);

const deviceMetadata = await tokenOrchestrator.getDeviceMetadata();
const deviceMetadata = await tokenOrchestrator.getDeviceMetadata(username);

const authParameters: Record<string, string> = {
USERNAME: username,
Expand Down Expand Up @@ -427,7 +427,7 @@ async function handleDeviceSRPAuth({
}: HandleDeviceSRPInput): Promise<RespondToAuthChallengeCommandOutput> {
const userPoolId = config.userPoolId;
const clientId = config.userPoolClientId;
const deviceMetadata = await tokenOrchestrator?.getDeviceMetadata();
const deviceMetadata = await tokenOrchestrator?.getDeviceMetadata(username);
assertDeviceMetadata(deviceMetadata);
const authenticationHelper = await getAuthenticationHelper(
deviceMetadata.deviceGroupKey
Expand Down Expand Up @@ -470,7 +470,7 @@ async function handleDevicePasswordVerifier(
{ userPoolId, userPoolClientId }: CognitoUserPoolConfig,
tokenOrchestrator?: AuthTokenOrchestrator
): Promise<RespondToAuthChallengeCommandOutput> {
const deviceMetadata = await tokenOrchestrator?.getDeviceMetadata();
const deviceMetadata = await tokenOrchestrator?.getDeviceMetadata(username);
assertDeviceMetadata(deviceMetadata);

const serverBValue = new BigInteger(challengeParameters?.SRP_B, 16);
Expand Down Expand Up @@ -554,7 +554,7 @@ export async function handlePasswordVerifierChallenge(
}),
} as { [key: string]: string };

const deviceMetadata = await tokenOrchestrator.getDeviceMetadata();
const deviceMetadata = await tokenOrchestrator.getDeviceMetadata(username);
if (deviceMetadata && deviceMetadata.deviceKey) {
challengeResponses['DEVICE_KEY'] = deviceMetadata.deviceKey;
}
Expand Down
Loading

0 comments on commit d807e55

Please sign in to comment.