Skip to content

chore: fix oauth outputs #5028

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

Merged
merged 2 commits into from
Jun 17, 2024
Merged

chore: fix oauth outputs #5028

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
2f22a50
chore: fix oauth outputs
Jordan-Nelson Jun 14, 2024
0651ded
fix naming typo
Jun 14, 2024
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
2 changes: 2 additions & 0 deletions packages/amplify_core/lib/src/config/amplify_outputs/auth/auth_outputs.g.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 27 additions & 5 deletions packages/amplify_core/lib/src/config/amplify_outputs/auth/oauth_outputs.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ class OAuthOutputs
required this.domain,
required this.scopes,
required this.redirectSignInUri,
this.redirectSignInUriQueryParameters,
this.signInUri,
this.signInUriQueryParameters,
required this.redirectSignOutUri,
this.redirectSignOutUriQueryParameters,
this.signOutUri,
this.signOutUriQueryParameters,
this.tokenUri,
this.tokenUriQueryParameters,
required this.responseType,
Expand All @@ -43,22 +45,36 @@ class OAuthOutputs
/// URIs used to redirect after signing in using an identity provider.
final List<String> redirectSignInUri;

/// An optional URI to use when signing in.
///
/// Note: This attribute is not part of the Amplify Outputs schema.
/// This exists for backwards compatibility with the Gen 1 config.
@internal
final String? signInUri;

/// Optional query params in the sign in URI.
///
/// Note: This attribute is not part of the Amplify Outputs schema.
/// This exists for backwards compatibility with the Gen 1 config.
@internal
final Map<String, String>? redirectSignInUriQueryParameters;
final Map<String, String>? signInUriQueryParameters;

/// URIs used to redirect after signing out.
final List<String> redirectSignOutUri;

/// Optional query params in the sign in URI.
/// An optional URI to use when signing out.
///
/// Note: This attribute is not part of the Amplify Outputs schema.
/// This exists for backwards compatibility with the Gen 1 config.
@internal
final String? signOutUri;

/// Optional query params in the sign out URI.
///
/// Note: This attribute is not part of the Amplify Outputs schema.
/// This exists for backwards compatibility with the Gen 1 config.
@internal
final Map<String, String>? redirectSignOutUriQueryParameters;
final Map<String, String>? signOutUriQueryParameters;

/// The OAuth token URI.
///
Expand All @@ -85,7 +101,13 @@ class OAuthOutputs
domain,
scopes,
redirectSignInUri,
signInUri,
signInUriQueryParameters,
redirectSignOutUri,
signOutUri,
signOutUriQueryParameters,
tokenUri,
tokenUriQueryParameters,
responseType,
];

Expand Down
54 changes: 43 additions & 11 deletions packages/amplify_core/lib/src/config/amplify_outputs/auth/oauth_outputs.g.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/amplify_core/lib/src/config/auth/auth_config.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ class AuthConfig extends AmplifyPluginConfigMap {
domain: oAuthConfig.webDomain,
scopes: oAuthConfig.scopes,
redirectSignInUri: oAuthConfig.signInRedirectUri.split(','),
redirectSignInUriQueryParameters:
oAuthConfig.signInUriQueryParameters,
signInUri: oAuthConfig.signInUri,
signInUriQueryParameters: oAuthConfig.signInUriQueryParameters,
redirectSignOutUri: oAuthConfig.signOutRedirectUri.split(','),
redirectSignOutUriQueryParameters:
oAuthConfig.signOutUriQueryParameters,
signOutUri: oAuthConfig.signOutUri,
signOutUriQueryParameters: oAuthConfig.signOutUriQueryParameters,
tokenUri: oAuthConfig.tokenUri,
tokenUriQueryParameters: oAuthConfig.tokenUriQueryParameters,
// Amplify Flutter only supports responseType:code
Expand Down
29 changes: 19 additions & 10 deletions packages/amplify_core/test/config/amplify_outputs_mapping/amplify_outputs_mapping_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,22 @@ void main() {
final amplifyConfig = AmplifyConfig.fromJson(configJson);
final mappedOutputs = amplifyConfig.toAmplifyOutputs();
final oauth = mappedOutputs.auth?.oauth as OAuthOutputs;
expect(oauth.redirectSignInUri, containsAll([signInUri1, signInUri2]));
expect(
oauth.redirectSignInUriQueryParameters,
oauth.redirectSignInUri,
containsAll([signInRedirectUri1, signInRedirectUri2]),
);
expect(oauth.signInUri, signInUri);
expect(
oauth.signInUriQueryParameters,
{signInQueryParamKey: signInQueryParamValue},
);
expect(
oauth.redirectSignOutUri,
containsAll([signOutUri1, signOutUri2]),
containsAll([signOutRedirectUri1, signOutRedirectUri2]),
);
expect(oauth.signOutUri, signOutUri);
expect(
oauth.redirectSignOutUriQueryParameters,
oauth.signOutUriQueryParameters,
{signOutQueryParamKey: signOutQueryParamValue},
);
expect(oauth.tokenUri, tokenUri);
Expand Down Expand Up @@ -142,12 +147,14 @@ const multiApiConfig = '''{
''';

const oAuthDomain = 'fake-web-domain-dev.auth.us-east-1.amazoncognito.com';
const signInUri1 = 'fake-sign-in-uri-1';
const signInUri2 = 'fake-sign-in-uri-2';
const signInRedirectUri1 = 'fake-sign-in-redirect-uri-1';
const signInRedirectUri2 = 'fake-sign-in-redirect-uri-2';
const signInUri = 'fake-sign-in-uri';
const signInQueryParamKey = 'fake-sign-in-query-param-key';
const signInQueryParamValue = 'fake-sign-in-query-param-value';
const signOutUri1 = 'fake-sign-ou-uri-1';
const signOutUri2 = 'fake-sign-out-uri-2';
const signOutRedirectUri1 = 'fake-sign-out-redirect-uri-1';
const signOutRedirectUri2 = 'fake-sign-out-redirect-uri-2';
const signOutUri = 'fake-sign-out-uri';
const signOutQueryParamKey = 'fake-sign-out-query-param-key';
const signOutQueryParamValue = 'fake-sign-out-query-param-value';
const tokenUri = 'fake-token-uri';
Expand Down Expand Up @@ -175,11 +182,13 @@ const oauthConfig = '''{
"OAuth": {
"WebDomain": "$oAuthDomain",
"AppClientId": "fake-client-id",
"SignInRedirectURI": "$signInUri1,$signInUri2",
"SignInRedirectURI": "$signInRedirectUri1,$signInRedirectUri2",
"SignInURI": "$signInUri",
"SignInURIQueryParameters": {
"$signInQueryParamKey": "$signInQueryParamValue"
},
"SignOutRedirectURI": "$signOutUri1,$signOutUri2",
"SignOutRedirectURI": "$signOutRedirectUri1,$signOutRedirectUri2",
"SignOutURI": "$signOutUri",
"SignOutURIQueryParameters": {
"$signOutQueryParamKey": "$signOutQueryParamValue"
},
Expand Down
Loading