Skip to content

Commit

Permalink
Merge pull request #289 from alex-chew/fix-dev-mode-login-logout-redi…
Browse files Browse the repository at this point in the history
…rect

Fix dev mode login/logout redirect
  • Loading branch information
echo-bravo-yahoo authored Jul 2, 2019
2 parents 0378040 + 1239363 commit 84bd22c
Show file tree
Hide file tree
Showing 36 changed files with 722 additions and 2,996 deletions.
12 changes: 6 additions & 6 deletions cloudformation/template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1121,20 +1121,20 @@ Resources:
SupportedIdentityProviders: [ "COGNITO" ] # should (eventually) allow people to add values
CallbackURL: !If [ DevelopmentMode,
[
'http://localhost:3000/login',
!Join [ '', [ 'https://', !GetAtt DevPortalSiteS3Bucket.RegionalDomainName ]]
'http://localhost:3000/index.html?action=login',
!Join [ '', [ 'https://', !GetAtt DevPortalSiteS3Bucket.RegionalDomainName, '/index.html?action=login' ]]
],
[
!Join [ '', [ 'https://', !If [ UseCustomDomainName, !Ref CustomDomainName, !GetAtt DefaultCloudfrontDistribution.DomainName ], '/login' ]]
!Join [ '', [ 'https://', !If [ UseCustomDomainName, !Ref CustomDomainName, !GetAtt DefaultCloudfrontDistribution.DomainName ], '/index.html?action=login' ]]
]
]
LogoutURL: !If [ DevelopmentMode,
[
'http://localhost:3000',
!Join [ '', [ 'https://', !GetAtt DevPortalSiteS3Bucket.RegionalDomainName]]
'http://localhost:3000/index.html?action=logout',
!Join [ '', [ 'https://', !GetAtt DevPortalSiteS3Bucket.RegionalDomainName, '/index.html?action=logout' ]]
],
[
!Join [ '', [ 'https://', !If [ UseCustomDomainName, !Ref CustomDomainName, !GetAtt DefaultCloudfrontDistribution.DomainName ]]]
!Join [ '', [ 'https://', !If [ UseCustomDomainName, !Ref CustomDomainName, !GetAtt DefaultCloudfrontDistribution.DomainName ], '/index.html?action=logout' ]]
]
]
AllowedOAuthFlowsUserPoolClient: true
Expand Down
Loading

0 comments on commit 84bd22c

Please sign in to comment.