-
Notifications
You must be signed in to change notification settings - Fork 4k
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
feat(cognito): user pool identity provider with support for Facebook & Amazon #8134
Merged
Merged
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
287aa8b
Identity Provider basics
b3533a3
overhaul - rev2
4f4f26e
SupportedIdentityProviders on Client
33b765d
Add README entry
05a9e53
drop apple
00ce0d5
split & rename
5fde776
Merge branch 'master' into nija-at/cognito-userpool-idp
ericzbeard 24c675d
Merge branch 'master' into cognito-userpool-idp
05b06f0
fix up integ test
ee21d0e
PR feedback
f2bba19
More feedback
a2a036e
Merge branch 'master' into nija-at/cognito-userpool-idp
mergify[bot] 6d78104
Merge branch 'master' into nija-at/cognito-userpool-idp
a910700
Merge branch 'master' into nija-at/cognito-userpool-idp
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 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 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,220 @@ | ||
import { Construct, IResource, Resource } from '@aws-cdk/core'; | ||
import { CfnUserPoolIdentityProvider } from './cognito.generated'; | ||
import { IUserPool } from './user-pool'; | ||
|
||
/** | ||
* Represents a UserPoolIdentityProvider | ||
*/ | ||
export interface IUserPoolIdentityProvider extends IResource { | ||
/** | ||
* The primary identifier of this identity provider | ||
* @attribute | ||
*/ | ||
readonly providerName: string; | ||
} | ||
|
||
/** | ||
* Properties to initialize UserPoolFacebookIdentityProvider | ||
*/ | ||
export interface UserPoolFacebookIdentityProviderProps { | ||
/** | ||
* The user pool to which this construct provides identities. | ||
*/ | ||
readonly userPool: IUserPool; | ||
|
||
/** | ||
* The client id recognized by Facebook APIs. | ||
*/ | ||
readonly clientId: string; | ||
/** | ||
* The client secret to be accompanied with clientUd for Facebook to authenticate the client. | ||
* @see https://developers.facebook.com/docs/facebook-login/security#appsecret | ||
*/ | ||
readonly clientSecret: string; | ||
/** | ||
* The list of facebook permissions to obtain for getting access to the Facebook profile. | ||
* @see https://developers.facebook.com/docs/facebook-login/permissions | ||
* @default [ public_profile ] | ||
*/ | ||
readonly scopes?: string[]; | ||
/** | ||
* The Facebook API version to use | ||
* @default - to the oldest version supported by Facebook | ||
*/ | ||
readonly apiVersion?: string; | ||
} | ||
|
||
/** | ||
* Represents a identity provider that integrates with 'Facebook Login' | ||
* @resource AWS::Cognito::UserPoolIdentityProvider | ||
*/ | ||
export class UserPoolFacebookIdentityProvider extends Resource implements IUserPoolIdentityProvider { | ||
public readonly providerName: string; | ||
|
||
constructor(scope: Construct, id: string, props: UserPoolFacebookIdentityProviderProps) { | ||
super(scope, id); | ||
|
||
const scopes = props.scopes ?? [ 'public_profile' ]; | ||
|
||
const resource = new CfnUserPoolIdentityProvider(this, 'Resource', { | ||
userPoolId: props.userPool.userPoolId, | ||
providerName: 'Facebook', // must be 'Facebook' when the type is 'Facebook' | ||
providerType: 'Facebook', | ||
providerDetails: { | ||
client_id: props.clientId, | ||
client_secret: props.clientSecret, | ||
authorize_scopes: scopes.join(','), | ||
api_version: props.apiVersion, | ||
}, | ||
}); | ||
|
||
this.providerName = super.getResourceNameAttribute(resource.ref); | ||
} | ||
} | ||
|
||
/** | ||
* Properties to initialize UserPoolAmazonIdentityProvider | ||
*/ | ||
export interface UserPoolAmazonIdentityProviderProps { | ||
nija-at marked this conversation as resolved.
Show resolved
Hide resolved
|
||
/** | ||
* The user pool to which this construct provides identities. | ||
*/ | ||
readonly userPool: IUserPool; | ||
|
||
/** | ||
* The client id recognized by 'Login with Amazon' APIs. | ||
* @see https://developer.amazon.com/docs/login-with-amazon/security-profile.html#client-identifier | ||
*/ | ||
readonly clientId: string; | ||
/** | ||
* The client secret to be accompanied with clientId for 'Login with Amazon' APIs to authenticate the client. | ||
* @see https://developer.amazon.com/docs/login-with-amazon/security-profile.html#client-identifier | ||
*/ | ||
readonly clientSecret: string; | ||
/** | ||
* The types of user profile data to obtain for the Amazon profile. | ||
* @see https://developer.amazon.com/docs/login-with-amazon/customer-profile.html | ||
* @default [ profile ] | ||
*/ | ||
readonly scopes?: string[]; | ||
} | ||
|
||
/** | ||
* Represents a identity provider that integrates with 'Login with Amazon' | ||
* @resource AWS::Cognito::UserPoolIdentityProvider | ||
*/ | ||
export class UserPoolAmazonIdentityProvider extends Resource implements IUserPoolIdentityProvider { | ||
nija-at marked this conversation as resolved.
Show resolved
Hide resolved
|
||
public readonly providerName: string; | ||
|
||
constructor(scope: Construct, id: string, props: UserPoolAmazonIdentityProviderProps) { | ||
super(scope, id); | ||
|
||
const scopes = props.scopes ?? [ 'profile' ]; | ||
|
||
const resource = new CfnUserPoolIdentityProvider(this, 'Resource', { | ||
userPoolId: props.userPool.userPoolId, | ||
providerName: 'LoginWithAmazon', // must be 'LoginWithAmazon' when the type is 'LoginWithAmazon' | ||
providerType: 'LoginWithAmazon', | ||
providerDetails: { | ||
client_id: props.clientId, | ||
client_secret: props.clientSecret, | ||
authorize_scopes: scopes.join(' '), | ||
}, | ||
}); | ||
|
||
this.providerName = super.getResourceNameAttribute(resource.ref); | ||
} | ||
} | ||
|
||
/** | ||
* Properties to initialize UserPoolAppleIdentityProvider | ||
*/ | ||
export interface UserPoolAppleIdentityProviderProps { | ||
/** | ||
* The user pool to which this construct provides identities. | ||
*/ | ||
readonly userPool: IUserPool; | ||
|
||
/** | ||
* The Services id received when the 'Sign in with Apple' client was created. | ||
*/ | ||
readonly servicesId: string; | ||
/** | ||
* The team id received when the 'Sign in with Apple' client was created. | ||
*/ | ||
readonly teamId: string; | ||
/** | ||
* The key id received when the 'Sign in with Apple' client was created. | ||
*/ | ||
readonly keyId: string; | ||
/** | ||
* The private key received when the 'Sign in with Apple' client was created. | ||
*/ | ||
readonly privateKey: string; | ||
/** | ||
* The types of user profile data to obtain for the Amazon profile. | ||
* @see https://developer.amazon.com/docs/login-with-amazon/customer-profile.html | ||
* @default [ public_profile, email ] | ||
*/ | ||
readonly scopes?: string[]; | ||
} | ||
|
||
/** | ||
* Represents a identity provider that integrates with 'Login with Amazon' | ||
* @resource AWS::Cognito::UserPoolIdentityProvider | ||
*/ | ||
export class UserPoolAppleIdentityProvider extends Resource implements IUserPoolIdentityProvider { | ||
public readonly providerName: string; | ||
|
||
constructor(scope: Construct, id: string, props: UserPoolAppleIdentityProviderProps) { | ||
super(scope, id); | ||
|
||
const scopes = props.scopes ?? [ 'public_profile', 'email' ]; | ||
|
||
const resource = new CfnUserPoolIdentityProvider(this, 'Resource', { | ||
userPoolId: props.userPool.userPoolId, | ||
providerName: 'SignInWithApple', // must be 'SignInWithApple' when the type is 'SignInWithApple' | ||
providerType: 'SignInWithApple', | ||
providerDetails: { | ||
client_id: props.servicesId, | ||
team_id: props.teamId, | ||
key_id: props.keyId, | ||
private_key: props.privateKey, | ||
authorize_scopes: scopes.join(' '), | ||
}, | ||
}); | ||
|
||
this.providerName = super.getResourceNameAttribute(resource.ref); | ||
} | ||
} | ||
|
||
/** | ||
* Options to integrate with the various social identity providers. | ||
*/ | ||
export class UserPoolIdentityProvider { | ||
/** | ||
* Federate with 'Facebook Login' | ||
* @see https://developers.facebook.com/docs/facebook-login/ | ||
*/ | ||
public static facebook(scope: Construct, id: string, options: UserPoolFacebookIdentityProviderProps) { | ||
return new UserPoolFacebookIdentityProvider(scope, id, options); | ||
} | ||
|
||
/** | ||
* Federate with 'Login with Amazon' | ||
* @see https://developer.amazon.com/apps-and-games/login-with-amazon | ||
*/ | ||
public static amazon(scope: Construct, id: string, options: UserPoolAmazonIdentityProviderProps) { | ||
return new UserPoolAmazonIdentityProvider(scope, id, options); | ||
} | ||
|
||
/** | ||
* Federate with 'Sign in with Apple' | ||
* @see https://developer.apple.com/sign-in-with-apple/ | ||
*/ | ||
public static apple(scope: Construct, id: string, options: UserPoolAppleIdentityProviderProps) { | ||
return new UserPoolAppleIdentityProvider(scope, id, options); | ||
} | ||
|
||
private constructor() {} | ||
} |
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
97 changes: 97 additions & 0 deletions
97
packages/@aws-cdk/aws-cognito/test/integ.user-pool-idp.expected.json
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 |
---|---|---|
@@ -0,0 +1,97 @@ | ||
{ | ||
"Resources": { | ||
"poolsmsRole04048F13": { | ||
"Type": "AWS::IAM::Role", | ||
"Properties": { | ||
"AssumeRolePolicyDocument": { | ||
"Statement": [ | ||
{ | ||
"Action": "sts:AssumeRole", | ||
"Condition": { | ||
"StringEquals": { | ||
"sts:ExternalId": "integuserpoolidppoolAE0BD80C" | ||
} | ||
}, | ||
"Effect": "Allow", | ||
"Principal": { | ||
"Service": "cognito-idp.amazonaws.com" | ||
} | ||
} | ||
], | ||
"Version": "2012-10-17" | ||
}, | ||
"Policies": [ | ||
{ | ||
"PolicyDocument": { | ||
"Statement": [ | ||
{ | ||
"Action": "sns:Publish", | ||
"Effect": "Allow", | ||
"Resource": "*" | ||
} | ||
], | ||
"Version": "2012-10-17" | ||
}, | ||
"PolicyName": "sns-publish" | ||
} | ||
] | ||
} | ||
}, | ||
"pool056F3F7E": { | ||
"Type": "AWS::Cognito::UserPool", | ||
"Properties": { | ||
"AdminCreateUserConfig": { | ||
"AllowAdminCreateUserOnly": true | ||
}, | ||
"EmailVerificationMessage": "The verification code to your new account is {####}", | ||
"EmailVerificationSubject": "Verify your new account", | ||
"SmsConfiguration": { | ||
"ExternalId": "integuserpoolidppoolAE0BD80C", | ||
"SnsCallerArn": { | ||
"Fn::GetAtt": [ | ||
"poolsmsRole04048F13", | ||
"Arn" | ||
] | ||
} | ||
}, | ||
"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 {####}" | ||
} | ||
} | ||
}, | ||
"amazon2D32744A": { | ||
"Type": "AWS::Cognito::UserPoolIdentityProvider", | ||
"Properties": { | ||
"ProviderName": "LoginWithAmazon", | ||
"ProviderType": "LoginWithAmazon", | ||
"UserPoolId": { | ||
"Ref": "pool056F3F7E" | ||
}, | ||
"ProviderDetails": { | ||
"client_id": "amzn-client-id", | ||
"client_secret": "amzn-client-secret", | ||
"authorize_scopes": "profile" | ||
} | ||
} | ||
}, | ||
"facebook4309A463": { | ||
"Type": "AWS::Cognito::UserPoolIdentityProvider", | ||
"Properties": { | ||
"ProviderName": "Facebook", | ||
"ProviderType": "Facebook", | ||
"UserPoolId": { | ||
"Ref": "pool056F3F7E" | ||
}, | ||
"ProviderDetails": { | ||
"client_id": "amzn-client-id", | ||
"client_secret": "amzn-client-secret", | ||
"authorize_scopes": "public_profile" | ||
} | ||
} | ||
} | ||
} | ||
} |
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 |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import { App, Stack } from '@aws-cdk/core'; | ||
import { UserPool, UserPoolIdentityProvider } from '../lib'; | ||
|
||
const app = new App(); | ||
const stack = new Stack(app, 'integ-user-pool-idp'); | ||
|
||
const userpool = new UserPool(stack, 'pool'); | ||
|
||
UserPoolIdentityProvider.amazon(stack, 'amazon', { | ||
clientId: 'amzn-client-id', | ||
clientSecret: 'amzn-client-secret', | ||
userPool: userpool, | ||
}); | ||
|
||
UserPoolIdentityProvider.facebook(stack, 'facebook', { | ||
clientId: 'amzn-client-id', | ||
clientSecret: 'amzn-client-secret', | ||
userPool: userpool, | ||
}); |
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.
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.
This could be typed
UserPoolClientIdentityProvider
.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'm not so confident that they are one and the same. They are the same at the moment, for the providers I've chosen to implement.
Ex: the list here does not match up with here.
It's not clear yet if this is a documentation gap, or something more.
Leaving this as is for now.