fix(Auth): Fixing the Gen2 json configuration used by the Authenticat…

…or (#3647) --------- Co-authored-by: Michael Law <[email protected]>
aws-amplify · Apr 26, 2024 · 2b2856a · 2b2856a
1 parent 162847a
commit 2b2856a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Helpers/ConfigurationHelper.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Helpers/ConfigurationHelper.swift
@@ -220,7 +220,7 @@ struct ConfigurationHelper {
                 AuthPluginErrorConstants.configurationMissingError
             )
         }
-        let userPoolConfig = try parseUserPoolData(config)
+        let userPoolConfig = parseUserPoolData(config)
         let identityPoolConfig = parseIdentityPoolData(config)
 
         return try createAuthConfiguration(userPoolConfig: userPoolConfig,
@@ -281,11 +281,10 @@ struct ConfigurationHelper {
                  "verificationMechanism": .array(verificationMechanisms)])
         }
 
-        return JSONValue.object(
-            ["auth": .object(
-                ["plugins": .object(
-                    ["awsCognitoAuthPlugin": .object(
-                        ["Auth": .object(
-                            ["Default": authConfigObject])])])])])
+        return JSONValue.object([
+            "Auth": .object([
+                "Default": authConfigObject
+            ])
+        ])
     }
 }
diff --git a/...fyPlugins/Auth/Tests/AWSCognitoAuthPluginUnitTests/Support/ConfigurationHelperTests.swift b/...fyPlugins/Auth/Tests/AWSCognitoAuthPluginUnitTests/Support/ConfigurationHelperTests.swift
@@ -246,7 +246,7 @@ final class ConfigurationHelperTests: XCTestCase {
                 ]))
         let json = ConfigurationHelper.createUserPoolJsonConfiguration(config)
 
-        guard let authConfig = json.auth?.plugins?.awsCognitoAuthPlugin?.Auth?.Default else {
+        guard let authConfig = json.Auth?.Default else {
             XCTFail("Could not retrieve auth configuration from json")
             return
         }