From c980c166355ff7f4d227810e34e1686218e55926 Mon Sep 17 00:00:00 2001 From: Tyler-Larkin Date: Tue, 11 Feb 2025 01:25:00 +0100 Subject: [PATCH] fix(auth,core): Added auth userpool endpoint into AmplifyOutputs mapping --- .../lib/src/config/amplify_outputs/auth/auth_outputs.dart | 5 +++++ .../lib/src/config/amplify_outputs/auth/auth_outputs.g.dart | 6 ++++++ packages/amplify_core/lib/src/config/auth/auth_config.dart | 1 + .../amplify_outputs_mapping/data/amplify_outputs.g.dart | 1 + .../data/amplifyconfiguration.g.dart | 3 ++- .../lib/src/state/machines/configuration_state_machine.dart | 1 + 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/amplify_core/lib/src/config/amplify_outputs/auth/auth_outputs.dart b/packages/amplify_core/lib/src/config/amplify_outputs/auth/auth_outputs.dart index 960f464a8c4..c06391dbe7c 100644 --- a/packages/amplify_core/lib/src/config/amplify_outputs/auth/auth_outputs.dart +++ b/packages/amplify_core/lib/src/config/amplify_outputs/auth/auth_outputs.dart @@ -20,6 +20,7 @@ class AuthOutputs required this.awsRegion, this.userPoolId, this.userPoolClientId, + this.userPoolEndpoint, this.appClientSecret, this.identityPoolId, this.passwordPolicy, @@ -44,6 +45,9 @@ class AuthOutputs /// The Cognito User Pool Client ID. final String? userPoolClientId; + /// The Cognito User Pool Endpoint. + final String? userPoolEndpoint; //Gen 1 only + /// A fixed string that must be used in all API requests to the app client /// if the the app client has one configured. /// @@ -84,6 +88,7 @@ class AuthOutputs awsRegion, userPoolId, userPoolClientId, + userPoolEndpoint, identityPoolId, oauth, standardRequiredAttributes, diff --git a/packages/amplify_core/lib/src/config/amplify_outputs/auth/auth_outputs.g.dart b/packages/amplify_core/lib/src/config/amplify_outputs/auth/auth_outputs.g.dart index 91a5452d5d8..c969bed99d9 100644 --- a/packages/amplify_core/lib/src/config/amplify_outputs/auth/auth_outputs.g.dart +++ b/packages/amplify_core/lib/src/config/amplify_outputs/auth/auth_outputs.g.dart @@ -19,6 +19,10 @@ AuthOutputs _$AuthOutputsFromJson(Map json) => $checkedCreate( 'user_pool_client_id', (v) => v as String?, ), + userPoolEndpoint: $checkedConvert( + 'user_pool_endpoint', + (v) => v as String?, + ), appClientSecret: $checkedConvert( 'app_client_secret', (v) => v as String?, @@ -86,6 +90,7 @@ AuthOutputs _$AuthOutputsFromJson(Map json) => $checkedCreate( 'awsRegion': 'aws_region', 'userPoolId': 'user_pool_id', 'userPoolClientId': 'user_pool_client_id', + 'userPoolEndpoint': 'user_pool_endpoint', 'appClientSecret': 'app_client_secret', 'identityPoolId': 'identity_pool_id', 'passwordPolicy': 'password_policy', @@ -103,6 +108,7 @@ Map _$AuthOutputsToJson(AuthOutputs instance) => 'aws_region': instance.awsRegion, 'user_pool_id': ?instance.userPoolId, 'user_pool_client_id': ?instance.userPoolClientId, + 'user_pool_endpoint': ?instance.userPoolEndpoint, 'app_client_secret': ?instance.appClientSecret, 'identity_pool_id': ?instance.identityPoolId, 'password_policy': ?instance.passwordPolicy?.toJson(), diff --git a/packages/amplify_core/lib/src/config/auth/auth_config.dart b/packages/amplify_core/lib/src/config/auth/auth_config.dart index 34dfe2e00fd..e67600667c0 100644 --- a/packages/amplify_core/lib/src/config/auth/auth_config.dart +++ b/packages/amplify_core/lib/src/config/auth/auth_config.dart @@ -137,6 +137,7 @@ class AuthConfig extends AmplifyPluginConfigMap { awsRegion: region, userPoolId: userPool?.poolId, userPoolClientId: userPool?.appClientId, + userPoolEndpoint: userPool?.endpoint, appClientSecret: userPool?.appClientSecret, identityPoolId: identityPool?.poolId, passwordPolicy: passwordPolicy, diff --git a/packages/amplify_core/test/config/amplify_outputs_mapping/data/amplify_outputs.g.dart b/packages/amplify_core/test/config/amplify_outputs_mapping/data/amplify_outputs.g.dart index 44a8dc24aa0..0c2d3c8839c 100644 --- a/packages/amplify_core/test/config/amplify_outputs_mapping/data/amplify_outputs.g.dart +++ b/packages/amplify_core/test/config/amplify_outputs_mapping/data/amplify_outputs.g.dart @@ -4,6 +4,7 @@ const amplifyConfig = '''{ "aws_region": "us-east-1", "user_pool_id": "fake-user-pool", "user_pool_client_id": "fake-client-id", + "user_pool_endpoint": "fake-endpoint", "identity_pool_id": "fake-identity-pool-id", "password_policy": { "min_length": 8, diff --git a/packages/amplify_core/test/config/amplify_outputs_mapping/data/amplifyconfiguration.g.dart b/packages/amplify_core/test/config/amplify_outputs_mapping/data/amplifyconfiguration.g.dart index bd40002a050..06bcd89d192 100644 --- a/packages/amplify_core/test/config/amplify_outputs_mapping/data/amplifyconfiguration.g.dart +++ b/packages/amplify_core/test/config/amplify_outputs_mapping/data/amplifyconfiguration.g.dart @@ -10,7 +10,8 @@ const amplifyConfig = '''{ "Default": { "PoolId": "fake-user-pool", "AppClientId": "fake-client-id", - "Region": "us-east-1" + "Region": "us-east-1", + "Endpoint": "fake-endpoint" } }, "CredentialsProvider": { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/configuration_state_machine.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/configuration_state_machine.dart index 36230eece85..9efe90617d8 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/configuration_state_machine.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/configuration_state_machine.dart @@ -78,6 +78,7 @@ final class ConfigurationStateMachine region: authOutputs.awsRegion, credentialsProvider: _credentialsProvider, dependencyManager: this, + endpoint: authOutputs.userPoolEndpoint, ), );