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

feat(apigatewayv2-authorizers): http api - allow multiple user pool clients per HttpUserPoolAuthorizer #16903

Merged
merged 5 commits into from
Nov 6, 2021
Merged

feat(apigatewayv2-authorizers): http api - allow multiple user pool clients per HttpUserPoolAuthorizer #16903

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81f9fda
feat: allow multiple userPoolClients for HttpUserPoolAuthorizer
tmokmss Oct 11, 2021
b7d8002
fix
tmokmss Oct 11, 2021
b208f15
Merge branch 'master' into allow_multiple_user_pool_clients
tmokmss Oct 11, 2021
9068e9d
add test
tmokmss Nov 6, 2021
55fb0d9
Merge branch 'master' into allow_multiple_user_pool_clients
mergify[bot] Nov 6, 2021
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
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigatewayv2-authorizers/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ const userPoolClient = userPool.addClient('UserPoolClient');

const authorizer = new HttpUserPoolAuthorizer({
userPool,
userPoolClient,
userPoolClients: [userPoolClient],
});

const api = new HttpApi(stack, 'HttpApi');
Expand Down
10 changes: 5 additions & 5 deletions packages/@aws-cdk/aws-apigatewayv2-authorizers/lib/http/user-pool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import { Stack, Token } from '@aws-cdk/core';
*/
export interface UserPoolAuthorizerProps {
/**
* The user pool client that should be used to authorize requests with the user pool.
* The user pool clients that should be used to authorize requests with the user pool.
*/
readonly userPoolClient: IUserPoolClient;
readonly userPoolClients: IUserPoolClient[];

/**
* The associated user pool
Expand All @@ -33,7 +33,7 @@ export interface UserPoolAuthorizerProps {
*
* @default ['$request.header.Authorization']
*/
readonly identitySource?: string[],
readonly identitySource?: string[];
}

/**
Expand All @@ -56,7 +56,7 @@ export class HttpUserPoolAuthorizer implements IHttpRouteAuthorizer {
identitySource: this.props.identitySource ?? ['$request.header.Authorization'],
type: HttpAuthorizerType.JWT,
authorizerName: this.props.authorizerName,
jwtAudience: [this.props.userPoolClient.userPoolClientId],
jwtAudience: this.props.userPoolClients.map((c) => c.userPoolClientId),
jwtIssuer: `https://cognito-idp.${region}.amazonaws.com/${this.props.userPool.userPoolId}`,
});
}
Expand All @@ -66,4 +66,4 @@ export class HttpUserPoolAuthorizer implements IHttpRouteAuthorizer {
authorizationType: 'JWT',
};
}
}
}
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigatewayv2-authorizers/test/http/integ.user-pool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const userPoolClient = userPool.addClient('my-client');

const authorizer = new HttpUserPoolAuthorizer({
userPool,
userPoolClient,
userPoolClients: [userPoolClient],
});

const handler = new lambda.Function(stack, 'lambda', {
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-apigatewayv2-authorizers/test/http/user-pool.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe('HttpUserPoolAuthorizer', () => {
const userPoolClient = userPool.addClient('UserPoolClient');
const authorizer = new HttpUserPoolAuthorizer({
userPool,
userPoolClient,
userPoolClients: [userPoolClient],
});

// WHEN
Expand Down Expand Up @@ -52,7 +52,7 @@ describe('HttpUserPoolAuthorizer', () => {
const userPoolClient = userPool.addClient('UserPoolClient');
const authorizer = new HttpUserPoolAuthorizer({
userPool,
userPoolClient,
userPoolClients: [userPoolClient],
});

// WHEN
Expand Down