-
Notifications
You must be signed in to change notification settings - Fork 4.3k
feat(cognito): OpenID Connect identity provider #20241
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
Merged
Merged
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
94314cf
feat(cognito): OpenID Connect identity provider
jogold 7ffd9eb
Merge branch 'master' into cognito-idp-oidc
jogold 6e83bf8
Merge branch 'master' into cognito-idp-oidc
jogold 13c295b
Merge branch 'master' into cognito-idp-oidc
jogold f6186fd
Merge branch 'master' into cognito-idp-oidc
jogold 36aec8c
Merge branch 'cognito-idp-oidc' of github.com:jogold/aws-cdk into cog…
jogold 7e96e6f
move up
jogold 0b86bc1
name not required
jogold a489c20
Merge branch 'master' into cognito-idp-oidc
jogold 1a724f7
validate name and default name
jogold d2266e7
Merge branch 'master' into cognito-idp-oidc
jogold 4bf430a
Merge branch 'master' into cognito-idp-oidc
jogold 10771c1
unique id
jogold 5957e37
Merge branch 'cognito-idp-oidc' of github.com:jogold/aws-cdk into cog…
jogold cba729c
Merge branch 'master' into cognito-idp-oidc
mergify[bot] 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 hidden or 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 hidden or 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
148 changes: 148 additions & 0 deletions
148
packages/@aws-cdk/aws-cognito/lib/user-pool-idps/oidc.ts
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| import { Token } from '@aws-cdk/core'; | ||
| import { Construct } from 'constructs'; | ||
| import { CfnUserPoolIdentityProvider } from '../cognito.generated'; | ||
| import { UserPoolIdentityProviderProps } from './base'; | ||
| import { UserPoolIdentityProviderBase } from './private/user-pool-idp-base'; | ||
|
|
||
| /** | ||
| * Properties to initialize UserPoolIdentityProviderOidc | ||
| */ | ||
| export interface UserPoolIdentityProviderOidcProps extends UserPoolIdentityProviderProps { | ||
| /** | ||
| * The client id | ||
| */ | ||
| readonly clientId: string; | ||
|
|
||
| /** | ||
| * The client secret | ||
| */ | ||
| readonly clientSecret: string; | ||
|
|
||
| /** | ||
| * Issuer URL | ||
| */ | ||
| readonly issuerUrl: string; | ||
|
|
||
| /** | ||
| * The name of the provider | ||
| * | ||
| * @default - the ID of the construct | ||
| */ | ||
| readonly name?: string; | ||
|
|
||
| /** | ||
| * The OAuth 2.0 scopes that you will request from OpenID Connect. Scopes are | ||
| * groups of OpenID Connect user attributes to exchange with your app. | ||
| * | ||
| * @default ['openid'] | ||
| */ | ||
| readonly scopes?: string[]; | ||
|
|
||
| /** | ||
| * Identifiers | ||
| * | ||
| * Identifiers can be used to redirect users to the correct IdP in multitenant apps. | ||
| * | ||
| * @default - no identifiers used | ||
| */ | ||
| readonly identifiers?: string[] | ||
|
|
||
| /** | ||
| * The method to use to request attributes | ||
| * | ||
| * @default OidcAttributeRequestMethod.GET | ||
| */ | ||
| readonly attributeRequestMethod?: OidcAttributeRequestMethod | ||
|
|
||
| /** | ||
| * OpenID connect endpoints | ||
| * | ||
| * @default - auto discovered with issuer URL | ||
| */ | ||
| readonly endpoints?: OidcEndpoints; | ||
| } | ||
|
|
||
| /** | ||
| * OpenID Connect endpoints | ||
| */ | ||
| export interface OidcEndpoints { | ||
| /** | ||
| * Authorization endpoint | ||
| */ | ||
| readonly authorization: string; | ||
|
|
||
| /** | ||
| * Token endpoint | ||
| */ | ||
| readonly token: string; | ||
|
|
||
| /** | ||
| * UserInfo endpoint | ||
| */ | ||
| readonly userInfo: string; | ||
|
|
||
| /** | ||
| * Jwks_uri endpoint | ||
| */ | ||
| readonly jwksUri: string; | ||
| } | ||
|
|
||
| /** | ||
| * The method to use to request attributes | ||
| */ | ||
| export enum OidcAttributeRequestMethod { | ||
| /** GET */ | ||
| GET = 'GET', | ||
| /** POST */ | ||
| POST = 'POST' | ||
| } | ||
|
|
||
| /** | ||
| * Represents a identity provider that integrates with OpenID Connect | ||
| * @resource AWS::Cognito::UserPoolIdentityProvider | ||
| */ | ||
| export class UserPoolIdentityProviderOidc extends UserPoolIdentityProviderBase { | ||
| public readonly providerName: string; | ||
|
|
||
| constructor(scope: Construct, id: string, props: UserPoolIdentityProviderOidcProps) { | ||
| super(scope, id, props); | ||
|
|
||
| const scopes = props.scopes ?? ['openid']; | ||
|
|
||
| const resource = new CfnUserPoolIdentityProvider(this, 'Resource', { | ||
| userPoolId: props.userPool.userPoolId, | ||
| providerName: getProviderName(this.node.id, props.name), | ||
| providerType: 'OIDC', | ||
| providerDetails: { | ||
| client_id: props.clientId, | ||
| client_secret: props.clientSecret, | ||
| authorize_scopes: scopes.join(' '), | ||
| attributes_request_method: props.attributeRequestMethod ?? OidcAttributeRequestMethod.GET, | ||
| oidc_issuer: props.issuerUrl, | ||
| authorize_url: props.endpoints?.authorization, | ||
| token_url: props.endpoints?.token, | ||
| attributes_url: props.endpoints?.userInfo, | ||
| jwks_uri: props.endpoints?.jwksUri, | ||
| }, | ||
| idpIdentifiers: props.identifiers, | ||
| attributeMapping: super.configureAttributeMapping(), | ||
| }); | ||
|
|
||
| this.providerName = super.getResourceNameAttribute(resource.ref); | ||
| } | ||
| } | ||
|
|
||
| function getProviderName(id: string, name?: string): string { | ||
| if (name) { | ||
| if (!Token.isUnresolved(name) && (name.length < 3 || name.length > 32)) { | ||
| throw new Error(`Expected provider name to be between 3 and 32 characters, received ${name} (${name.length} characters)`); | ||
| } | ||
| return name; | ||
| } | ||
|
|
||
| if (id.length < 3 || id.length > 32) { | ||
| throw new Error(`Provider name defaults to construct's id (${id}) which is not between 3 and 32 characters. Please specify a valid name with \`name\`.`); | ||
| } | ||
|
|
||
| return id; | ||
| } | ||
This file contains hidden or 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
45 changes: 45 additions & 0 deletions
45
packages/@aws-cdk/aws-cognito/test/integ.user-pool-idp.oidc.ts
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| import { App, CfnOutput, RemovalPolicy, Stack } from '@aws-cdk/core'; | ||
| import { ProviderAttribute, UserPool, UserPoolIdentityProviderOidc } from '../lib'; | ||
|
|
||
| /* | ||
| * Stack verification steps | ||
| * * Visit the URL provided by stack output 'SignInLink' in a browser, and verify the 'cdk' sign in link shows up. | ||
| */ | ||
| const app = new App(); | ||
| const stack = new Stack(app, 'integ-user-pool-idp-google'); | ||
|
|
||
| const userpool = new UserPool(stack, 'pool', { | ||
| removalPolicy: RemovalPolicy.DESTROY, | ||
| }); | ||
|
|
||
| new UserPoolIdentityProviderOidc(stack, 'cdk', { | ||
| userPool: userpool, | ||
| name: 'cdk', | ||
| clientId: 'client-id', | ||
| clientSecret: 'client-secret', | ||
| issuerUrl: 'https://www.issuer-url.com', | ||
| endpoints: { | ||
| authorization: 'https://www.issuer-url.com/authorize', | ||
| token: 'https://www.issuer-url.com/token', | ||
| userInfo: 'https://www.issuer-url.com/userinfo', | ||
| jwksUri: 'https://www.issuer-url.com/jwks', | ||
| }, | ||
| scopes: ['openid', 'phone'], | ||
| attributeMapping: { | ||
| phoneNumber: ProviderAttribute.other('phone_number'), | ||
| }, | ||
| }); | ||
|
|
||
| const client = userpool.addClient('client'); | ||
|
|
||
| const domain = userpool.addDomain('domain', { | ||
| cognitoDomain: { | ||
| domainPrefix: 'cdk-test-pool', | ||
| }, | ||
| }); | ||
|
|
||
| new CfnOutput(stack, 'SignInLink', { | ||
| value: domain.signInUrl(client, { | ||
| redirectUri: 'https://example.com', | ||
| }), | ||
| }); |
1 change: 1 addition & 0 deletions
1
packages/@aws-cdk/aws-cognito/test/user-pool-idp.oidc.integ.snapshot/cdk.out
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {"version":"18.0.0"} |
121 changes: 121 additions & 0 deletions
121
...s-cognito/test/user-pool-idp.oidc.integ.snapshot/integ-user-pool-idp-google.template.json
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| { | ||
| "Resources": { | ||
| "pool056F3F7E": { | ||
| "Type": "AWS::Cognito::UserPool", | ||
| "Properties": { | ||
| "AccountRecoverySetting": { | ||
| "RecoveryMechanisms": [ | ||
| { | ||
| "Name": "verified_phone_number", | ||
| "Priority": 1 | ||
| }, | ||
| { | ||
| "Name": "verified_email", | ||
| "Priority": 2 | ||
| } | ||
| ] | ||
| }, | ||
| "AdminCreateUserConfig": { | ||
| "AllowAdminCreateUserOnly": true | ||
| }, | ||
| "EmailVerificationMessage": "The verification code to your new account is {####}", | ||
| "EmailVerificationSubject": "Verify your new account", | ||
| "SmsVerificationMessage": "The verification code to your new account is {####}", | ||
| "VerificationMessageTemplate": { | ||
| "DefaultEmailOption": "CONFIRM_WITH_CODE", | ||
| "EmailMessage": "The verification code to your new account is {####}", | ||
| "EmailSubject": "Verify your new account", | ||
| "SmsMessage": "The verification code to your new account is {####}" | ||
| } | ||
| }, | ||
| "UpdateReplacePolicy": "Delete", | ||
| "DeletionPolicy": "Delete" | ||
| }, | ||
| "poolclient2623294C": { | ||
| "Type": "AWS::Cognito::UserPoolClient", | ||
| "Properties": { | ||
| "UserPoolId": { | ||
| "Ref": "pool056F3F7E" | ||
| }, | ||
| "AllowedOAuthFlows": [ | ||
| "implicit", | ||
| "code" | ||
| ], | ||
| "AllowedOAuthFlowsUserPoolClient": true, | ||
| "AllowedOAuthScopes": [ | ||
| "profile", | ||
| "phone", | ||
| "email", | ||
| "openid", | ||
| "aws.cognito.signin.user.admin" | ||
| ], | ||
| "CallbackURLs": [ | ||
| "https://example.com" | ||
| ], | ||
| "SupportedIdentityProviders": [ | ||
| { | ||
| "Ref": "cdk52888317" | ||
| }, | ||
| "COGNITO" | ||
| ] | ||
| } | ||
| }, | ||
| "pooldomain430FA744": { | ||
| "Type": "AWS::Cognito::UserPoolDomain", | ||
| "Properties": { | ||
| "Domain": "cdk-test-pool", | ||
| "UserPoolId": { | ||
| "Ref": "pool056F3F7E" | ||
| } | ||
| } | ||
| }, | ||
| "cdk52888317": { | ||
| "Type": "AWS::Cognito::UserPoolIdentityProvider", | ||
| "Properties": { | ||
| "ProviderName": "cdk", | ||
| "ProviderType": "OIDC", | ||
| "UserPoolId": { | ||
| "Ref": "pool056F3F7E" | ||
| }, | ||
| "AttributeMapping": { | ||
| "phone_number": "phone_number" | ||
| }, | ||
| "ProviderDetails": { | ||
| "client_id": "client-id", | ||
| "client_secret": "client-secret", | ||
| "authorize_scopes": "openid phone", | ||
| "attributes_request_method": "GET", | ||
| "oidc_issuer": "https://www.issuer-url.com", | ||
| "authorize_url": "https://www.issuer-url.com/authorize", | ||
| "token_url": "https://www.issuer-url.com/token", | ||
| "attributes_url": "https://www.issuer-url.com/userinfo", | ||
| "jwks_uri": "https://www.issuer-url.com/jwks" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "Outputs": { | ||
| "SignInLink": { | ||
| "Value": { | ||
| "Fn::Join": [ | ||
| "", | ||
| [ | ||
| "https://", | ||
| { | ||
| "Ref": "pooldomain430FA744" | ||
| }, | ||
| ".auth.", | ||
| { | ||
| "Ref": "AWS::Region" | ||
| }, | ||
| ".amazoncognito.com/login?client_id=", | ||
| { | ||
| "Ref": "poolclient2623294C" | ||
| }, | ||
| "&response_type=code&redirect_uri=https://example.com" | ||
| ] | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
14 changes: 14 additions & 0 deletions
14
packages/@aws-cdk/aws-cognito/test/user-pool-idp.oidc.integ.snapshot/integ.json
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "version": "18.0.0", | ||
| "testCases": { | ||
| "integ.user-pool-idp.oidc": { | ||
| "stacks": [ | ||
| "integ-user-pool-idp-google" | ||
| ], | ||
| "diffAssets": false, | ||
| "stackUpdateWorkflow": true | ||
| } | ||
| }, | ||
| "synthContext": {}, | ||
| "enableLookups": false | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.