update code

Author: thisisabhash

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/CredentialStore/MigrateLegacyCredentialStore.swift

@@ -312,7 +312,6 @@ struct MigrateLegacyCredentialStore: Action {
                     authProvider: nil,
                     idpIdentifier: nil
                 )
-#if os(iOS) || os(macOS) || os(visionOS)
                 return .hostedUI(.init(
                     scopes: scopes ?? [],
                     providerInfo: provider,
@@ -324,18 +323,6 @@ struct MigrateLegacyCredentialStore: Action {
                     prompt: nil,
                     resource: nil
                 ))
-#else
-                return .hostedUI(.init(
-                    scopes: scopes ?? [],
-                    providerInfo: provider,
-                    presentationAnchor: nil,
-                    preferPrivateSession: false,
-                    nonce: nil,
-                    language: nil,
-                    loginHint: nil,
-                    resource: nil
-                ))
-#endif
             default:
                 return .apiBased(.userSRP)
             }

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Operations/Helpers/HostedUISignInHelper.swift

@@ -135,7 +135,7 @@ struct HostedUISignInHelper: DefaultLogger {
             nonce: pluginOptions?.nonce,
             language: pluginOptions?.language,
             loginHint: pluginOptions?.loginHint,
-            prompt: pluginOptions?.prompt,
+            promptValues: pluginOptions?.prompt,
             resource: pluginOptions?.resource
         )
         let signInData = SignInEventData(

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Data/HostedUIOptions.swift

@@ -24,9 +24,8 @@ struct HostedUIOptions {
 
     let loginHint: String?
 
-#if os(iOS) || os(macOS) || os(visionOS)
-    let prompt: [AWSAuthWebUISignInOptions.Prompt]?
-#endif
+    let prompt: String?
+
     let resource: String?
 }
 
@@ -60,9 +59,7 @@ extension HostedUIOptions: Codable {
         self.nonce = try values.decode(String.self, forKey: .nonce)
         self.language = try values.decode(String.self, forKey: .language)
         self.loginHint = try values.decode(String.self, forKey: .loginHint)
-#if os(iOS) || os(macOS) || os(visionOS)
-        self.prompt = try values.decode(Array.self, forKey: .prompt)
-#endif
+        self.prompt = try values.decode(String.self, forKey: .prompt)
         self.resource = try values.decode(String.self, forKey: .resource)
     }
 
@@ -74,11 +71,37 @@ extension HostedUIOptions: Codable {
         try container.encode(nonce, forKey: .nonce)
         try container.encode(language, forKey: .language)
         try container.encode(loginHint, forKey: .loginHint)
-#if os(iOS) || os(macOS) || os(visionOS)
         try container.encodeIfPresent(prompt, forKey: .prompt)
-#endif
         try container.encode(resource, forKey: .resource)
     }
 }
 
 extension HostedUIOptions: Equatable { }
+
+#if os(iOS) || os(macOS) || os(visionOS)
+extension HostedUIOptions {
+    init(
+        scopes: [String],
+        providerInfo: HostedUIProviderInfo,
+        presentationAnchor: AuthUIPresentationAnchor?,
+        preferPrivateSession: Bool,
+        nonce: String?,
+        language: String?,
+        loginHint: String?,
+        promptValues: [AWSAuthWebUISignInOptions.Prompt]?,
+        resource: String?
+    ) {
+        self.init(
+            scopes: scopes,
+            providerInfo: providerInfo,
+            presentationAnchor: presentationAnchor,
+            preferPrivateSession: preferPrivateSession,
+            nonce: nonce,
+            language: language,
+            loginHint: loginHint,
+            prompt: promptValues?.map { "\($0.rawValue)" }.joined(separator: " "),
+            resource: resource
+        )
+    }
+}
+#endif

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/HostedUI/HostedUIRequestHelper.swift

@@ -67,12 +67,9 @@ enum HostedUIRequestHelper {
         if let loginHint = options.loginHint {
             components.queryItems?.append(.init(name: "login_hint", value: loginHint))
         }
-#if os(iOS) || os(macOS) || os(visionOS)
         if let prompt = options.prompt {
-            let promptValue = prompt.map { "\($0.rawValue)" }.joined(separator: " ")
-            components.queryItems?.append(.init(name: "prompt", value: promptValue))
+            components.queryItems?.append(.init(name: "prompt", value: prompt))
         }
-#endif
         if let resource = options.resource {
             components.queryItems?.append(.init(name: "resource", value: resource))
         }

AmplifyPlugins/Auth/Tests/AWSCognitoAuthPluginUnitTests/Mocks/MockData/SignedInData+Mock.swift

@@ -30,7 +30,6 @@ extension SignedInData {
 
     static var hostedUISignInData: SignedInData {
         let tokens = AWSCognitoUserPoolTokens.testData
-#if os(iOS) || os(macOS) || os(visionOS)
         return SignedInData(
             signedInDate: Date(),
             signInMethod: .hostedUI(.init(
@@ -46,21 +45,5 @@ extension SignedInData {
             )),
             cognitoUserPoolTokens: tokens
         )
-#else
-        return SignedInData(
-            signedInDate: Date(),
-            signInMethod: .hostedUI(.init(
-                scopes: [],
-                providerInfo: .init(authProvider: .google, idpIdentifier: ""),
-                presentationAnchor: nil,
-                preferPrivateSession: false,
-                nonce: nil,
-                language: nil,
-                loginHint: nil,
-                resource: nil
-            )),
-            cognitoUserPoolTokens: tokens
-        )
-#endif
     }
 }

AmplifyPlugins/Auth/Tests/AWSCognitoAuthPluginUnitTests/Support/HostedUIRequestHelperTests.swift

@@ -11,7 +11,6 @@ import Amplify
 import XCTest
 @testable import AWSCognitoAuthPlugin
 
-#if os(iOS) || os(macOS) || os(visionOS)
 class HostedUIRequestHelperTests: XCTestCase {
     private var configuration: HostedUIConfigurationData!
     private let result = HostedUIResult(
@@ -90,6 +89,7 @@ class HostedUIRequestHelperTests: XCTestCase {
         XCTAssertEqual("Basic \(encodedSecret)", header)
     }
 
+    #if os(iOS) || os(macOS) || os(visionOS)
     /// Given: A HostedUI configuration that defines a client secret
     /// When: HostedUIRequestHelper.createSignInURL is invoked with cognito oidc parameters
     /// Then: A URL is generated that contains all the cognito oidc parameters in url query parameters
@@ -108,7 +108,7 @@ class HostedUIRequestHelperTests: XCTestCase {
                 nonce: "nonce",
                 language: "en",
                 loginHint: "username",
-                prompt: [.login, .consent],
+                promptValues: [.login, .consent],
                 resource: "http://localhost"
             )
         )
@@ -124,5 +124,5 @@ class HostedUIRequestHelperTests: XCTestCase {
         XCTAssertEqual("login consent", urlComponents.queryItems?.first(where: { $0.name == "prompt"})?.value)
         XCTAssertEqual("http://localhost", urlComponents.queryItems?.first(where: { $0.name == "resource"})?.value)
     }
+    #endif
 }
-#endif