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

Feature/ccm 8434 cis2 signout #152

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+18 −2
Open

Feature/ccm 8434 cis2 signout #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79093e1
CCM-8434: set logout redirect urls
harrim91 Jan 28, 2025
82277a5
CCM-8434: remove sandbox client secret
harrim91 Jan 28, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ amplifyconfiguration*
.next
.env
.idea
.node-version

sandbox_tf_outputs.json
sandbox_cognito_auth_token.json
11 changes: 11 additions & 0 deletions infrastructure/terraform/components/app/cognito_user_pool_client.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@ resource "aws_cognito_user_pool_client" "main" {
] : []
])

logout_urls = flatten([
var.cognito_user_pool_additional_callback_urls,
[
"https://${var.environment}.${local.acct.dns_zone["name"]}/auth/",
Copy link
Collaborator

Choose a reason for hiding this comment

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

as we've learned from other recent bug fixes, we probably don't want the trailing slashes at the end of callback_urls and logout_urls

"https://${aws_amplify_app.main.default_domain}/auth/"
],
var.cognito_user_pool_use_environment_specific_gateway_callback_url ? [
"https://${var.environment}.${var.cognito_user_pool_environment_specific_gateway_callback_url_suffix}"
] : []
])

supported_identity_providers = flatten(
concat(local.cognito_idp, local.cis2_idp)
)
Expand Down
6 changes: 5 additions & 1 deletion infrastructure/terraform/components/sandbox/cognito_user_pool_client.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ resource "aws_cognito_user_pool_client" "main" {
"http://localhost:3000/auth/"
]

logout_urls = [
"http://localhost:3000/auth/"
]

allowed_oauth_flows_user_pool_client = true
allowed_oauth_flows = ["code"]
allowed_oauth_scopes = [
Expand All @@ -21,5 +25,5 @@ resource "aws_cognito_user_pool_client" "main" {
"ALLOW_USER_SRP_AUTH"
]

generate_secret = true
generate_secret = false
}
2 changes: 1 addition & 1 deletion scripts/generate-outputs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const amplifyOutputs = {
domain: cognitoDomain,
scopes: ['email', 'openid'],
redirect_sign_in_uri: [redirectDomain],
redirect_sign_out_uri: [],
redirect_sign_out_uri: [redirectDomain],
response_type: 'code',
},
},
Expand Down
Loading