Skip to content

Commit 348717b

Browse files
authored
fix: Output OAuth settings to config without requiring domain prefix (#957)
* fix: oauth config is output even if domainPrefix is missing * fix: cleanup * fix: bug where oauthClientId was not being set * chore: update test and add changeset
1 parent 9f1a78b commit 348717b

File tree

5 files changed

+38
-29
lines changed

5 files changed

+38
-29
lines changed

.changeset/metal-radios-pay.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@aws-amplify/auth-construct-alpha': patch
3+
'@aws-amplify/client-config': patch
4+
---
5+
6+
Fix bug in frontend config where oauth would not be output if domain prefix was not defined.

package-lock.json

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/auth-construct/src/construct.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,7 @@ void describe('Auth construct', () => {
556556
verificationMechanisms: '["EMAIL"]',
557557
usernameAttributes: '["EMAIL"]',
558558
googleClientId: 'googleClientId',
559+
oauthClientId: expectedWebClientId, // same thing
559560
oauthDomain: `test-prefix.auth.${expectedRegion}.amazoncognito.com`,
560561
oauthScope: '["email","profile"]',
561562
oauthRedirectSignIn: 'http://callback.com',

packages/auth-construct/src/construct.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ export class AmplifyAuth
885885
output.oauthRedirectSignOut = this.oAuthSettings.logoutUrls
886886
? this.oAuthSettings.logoutUrls.join(',')
887887
: '';
888-
output.webClientId = this.resources.userPoolClient.userPoolClientId;
888+
output.oauthClientId = this.resources.userPoolClient.userPoolClientId;
889889
output.oauthResponseType = 'code';
890890
}
891891
}

packages/client-config/src/client-config-contributor/auth_client_config_contributor.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,11 @@ export class AuthClientConfigContributor implements ClientConfigContributor {
8787
);
8888
}
8989

90-
if (authOutput.payload.oauthDomain) {
90+
if (authOutput.payload.oauthClientId) {
9191
authClientConfig.oauth = {};
92-
authClientConfig.oauth.domain = authOutput.payload.oauthDomain;
92+
if (authOutput.payload.oauthDomain) {
93+
authClientConfig.oauth.domain = authOutput.payload.oauthDomain;
94+
}
9395
parseAndAssignObject(
9496
authClientConfig.oauth,
9597
'scope',

0 commit comments

Comments
 (0)