Update to schema change to add cognito and custom domains

aws-amplify · Apr 16, 2024 · dc566e6 · dc566e6
1 parent 4379988
commit dc566e6
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AuthConfiguration.kt b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AuthConfiguration.kt
@@ -122,7 +122,8 @@ data class AuthConfiguration internal constructor(
                 OauthConfiguration(
                     appClient = auth.userPoolClientId,
                     appSecret = null, // Not supported in Gen2
-                    domain = it.domain,
+                    // Use the custom domain if specified, otherwise use the generated cognito domain
+                    domain = it.customDomain ?: it.cognitoDomain,
                     scopes = it.scopes.toSet(),
                     // Note: Gen2 config gives an array for these values, while Gen1 is just a String. In Gen1
                     // if you specify multiple URIs the CLI will join them to a comma-delimited string in the json.

diff --git a/aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/AuthConfigurationTest.kt b/aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/AuthConfigurationTest.kt
@@ -44,7 +44,7 @@ class AuthConfigurationTest {
                     requireSymbols = true
                 }
                 oauth {
-                    domain = "https://test.com"
+                    cognitoDomain = "https://test.com"
                     identityProviders += AmplifyOutputsData.Auth.Oauth.IdentityProviders.GOOGLE
                     scopes += listOf("myScope", "myScope2")
                     redirectSignInUri += "https://test.com/signin"
@@ -119,6 +119,22 @@ class AuthConfigurationTest {
         configuration.identityPool.shouldBeNull()
     }
 
+    @Test
+    fun `uses custom oauth domain if specified`() {
+        val data = amplifyOutputsData {
+            auth {
+                oauth {
+                    cognitoDomain = "cognito"
+                    customDomain = "custom"
+                }
+            }
+        }
+
+        val configuration = AuthConfiguration.from(data)
+
+        configuration.oauth?.domain shouldBe "custom"
+    }
+
     @Test
     fun `throws exception if auth is not configured in amplify outputs`() {
         val data = amplifyOutputsData {

diff --git a/core/src/main/java/com/amplifyframework/core/configuration/AmplifyOutputsData.kt b/core/src/main/java/com/amplifyframework/core/configuration/AmplifyOutputsData.kt
@@ -86,7 +86,8 @@ interface AmplifyOutputsData {
         @InternalAmplifyApi
         interface Oauth {
             val identityProviders: List<IdentityProviders>
-            val domain: String
+            val cognitoDomain: String
+            val customDomain: String?
             val scopes: List<String>
             val redirectSignInUri: List<String>
             val redirectSignOutUri: List<String>
@@ -278,7 +279,8 @@ internal data class AmplifyOutputsDataImpl(
         @Serializable
         data class Oauth(
             override val identityProviders: List<IdentityProviders>,
-            override val domain: String,
+            override val cognitoDomain: String,
+            override val customDomain: String?,
             override val scopes: List<String>,
             override val redirectSignInUri: List<String>,
             override val redirectSignOutUri: List<String>,

diff --git a/...s/src/main/java/com/amplifyframework/testutils/configuration/AmplifyOutputsDataBuilder.kt b/...s/src/main/java/com/amplifyframework/testutils/configuration/AmplifyOutputsDataBuilder.kt
@@ -93,7 +93,8 @@ class PasswordPolicyBuilder : AmplifyOutputsData.Auth.PasswordPolicy {
 
 class OauthBuilder : AmplifyOutputsData.Auth.Oauth {
     override val identityProviders: MutableList<AmplifyOutputsData.Auth.Oauth.IdentityProviders> = mutableListOf()
-    override var domain: String = "domain"
+    override var cognitoDomain: String = "domain"
+    override var customDomain: String? = null
     override val scopes: MutableList<String> = mutableListOf()
     override val redirectSignInUri: MutableList<String> = mutableListOf()
     override val redirectSignOutUri: MutableList<String> = mutableListOf()