chore: kickoff release

aws-amplify · Oct 18, 2024 · 202a0fd · 202a0fd
2 parents 95d8f16 + 65da44e
commit 202a0fd
Show file tree

Hide file tree

Showing 7 changed files with 120 additions and 7 deletions.
diff --git a/...lugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/HostedUI/ShowHostedUISignIn.swift b/...lugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/HostedUI/ShowHostedUISignIn.swift
@@ -36,7 +36,7 @@ class ShowHostedUISignIn: NSObject, Action {
 
         guard let callbackURL = URL(string: hostedUIConfig.oauth.signInRedirectURI),
               let callbackURLScheme = callbackURL.scheme else {
-            let event = SignInEvent(eventType: .throwAuthError(.hostedUI(.signInURI)))
+            let event = HostedUIEvent(eventType: .throwError(.hostedUI(.signInURI)))
             logVerbose("\(#fileID) Sending event \(event)", environment: environment)
             await dispatcher.send(event)
             return

diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Operations/AuthConfigureOperation.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Operations/AuthConfigureOperation.swift
@@ -37,6 +37,9 @@ class AuthConfigureOperation: ConfigureOperation {
     override public func main() {
         if isCancelled {
             finish()
+            dispatch(result: .failure(AuthError.configuration(
+                "Configuration operation was cancelled",
+                "", nil)))
             return
         }
 
@@ -51,6 +54,7 @@ class AuthConfigureOperation: ConfigureOperation {
             for await state in stateSequences {
                 if case .configured = state {
                     finish()
+                    dispatch(result: .success(()))
                     break
                 }
             }

diff --git a/...ces/AWSCognitoAuthPlugin/StateMachine/Resolvers/SignIn/HostedUISignInState+Resolver.swift b/...ces/AWSCognitoAuthPlugin/StateMachine/Resolvers/SignIn/HostedUISignInState+Resolver.swift
@@ -30,7 +30,6 @@ extension HostedUISignInState {
 
             case .showingUI:
                 if case .throwError(let error) = event.isHostedUIEvent {
-                    // Remove this?
                     let action = CancelSignIn()
                     return .init(newState: .error(error), actions: [action])
                 }

diff --git a/...ts/AWSCognitoAuthPluginUnitTests/ConfigurationTests/AWSCognitoAuthPluginConfigTests.swift b/...ts/AWSCognitoAuthPluginUnitTests/ConfigurationTests/AWSCognitoAuthPluginConfigTests.swift
@@ -236,4 +236,45 @@ class AWSCognitoAuthPluginConfigTests: XCTestCase {
         }
     }
 
+    /// Test that the Auth plugin emits `InternalConfigureAuth` that is used by the Logging Category
+    ///
+    /// - Given: Given a valid config
+    /// - When:
+    ///    - I configure auth with the given configuration
+    /// - Then:
+    ///    - I should receive `InternalConfigureAuth` Hub event
+    ///
+    func testEmittingInternalConfigureAuthHubEvent() throws {
+        let expectation = expectation(description: "conifguration should complete")
+        let subscription = Amplify.Hub.publisher(for: .auth).sink { payload in
+
+            if payload.eventName == "InternalConfigureAuth" {
+                expectation.fulfill()
+            }
+        }
+        let plugin = AWSCognitoAuthPlugin()
+        try Amplify.add(plugin: plugin)
+
+        let categoryConfig = AuthCategoryConfiguration(plugins: [
+            "awsCognitoAuthPlugin": [
+                "CredentialsProvider": [
+                    "CognitoIdentity": [
+                        "Default": [
+                            "PoolId": "cc",
+                             "Region": "us-east-1"
+                        ]
+                    ]
+                ]
+            ]
+        ])
+        let amplifyConfig = AmplifyConfiguration(auth: categoryConfig)
+        do {
+            try Amplify.configure(amplifyConfig)
+        } catch {
+            XCTFail("Should not throw error. \(error)")
+        }
+        wait(for: [expectation], timeout: 5.0)
+        subscription.cancel()
+    }
+
 }
diff --git a/...ts/AWSCognitoAuthPluginUnitTests/TaskTests/HostedUITests/AWSAuthHostedUISignInTests.swift b/...ts/AWSCognitoAuthPluginUnitTests/TaskTests/HostedUITests/AWSAuthHostedUISignInTests.swift
@@ -42,6 +42,43 @@ class AWSAuthHostedUISignInTests: XCTestCase {
         return URLSession(configuration: configuration)
     }
 
+    private func customPlugin(with cusotmConfiguration: HostedUIConfigurationData?) -> AWSCognitoAuthPlugin {
+        let plugin = AWSCognitoAuthPlugin()
+        mockJson = try! JSONSerialization.data(withJSONObject: mockTokenResult)
+        MockURLProtocol.requestHandler = { _ in
+            return (HTTPURLResponse(), self.mockJson)
+        }
+
+        func sessionFactory() -> HostedUISessionBehavior {
+            MockHostedUISession(result: mockHostedUIResult)
+        }
+
+        func mockRandomString() -> RandomStringBehavior {
+            return MockRandomStringGenerator(mockString: mockState, mockUUID: mockState)
+        }
+
+        let environment = BasicHostedUIEnvironment(configuration: cusotmConfiguration ?? configuration,
+                                                   hostedUISessionFactory: sessionFactory,
+                                                   urlSessionFactory: urlSessionMock,
+                                                   randomStringFactory: mockRandomString)
+        let authEnvironment = Defaults.makeDefaultAuthEnvironment(
+            userPoolFactory: { self.mockIdentityProvider },
+            hostedUIEnvironment: environment)
+        let stateMachine = Defaults.authStateMachineWith(
+            environment: authEnvironment,
+            initialState: initialState
+        )
+
+        plugin.configure(
+            authConfiguration: Defaults.makeDefaultAuthConfigData(withHostedUI: configuration),
+            authEnvironment: authEnvironment,
+            authStateMachine: stateMachine,
+            credentialStoreStateMachine: Defaults.makeDefaultCredentialStateMachine(),
+            hubEventHandler: MockAuthHubEventBehavior(),
+            analyticsHandler: MockAnalyticsHandler())
+        return plugin
+    }
+
     override func setUp() {
         plugin = AWSCognitoAuthPlugin()
         mockJson = try! JSONSerialization.data(withJSONObject: mockTokenResult)
@@ -310,6 +347,41 @@ class AWSAuthHostedUISignInTests: XCTestCase {
         await fulfillment(of: [expectation], timeout: networkTimeout)
     }
 
+    @MainActor
+    func testInvalidRedirectConfigurationFailure() async {
+        let invalidRedirectConfig = HostedUIConfigurationData(clientId: "clientId", oauth: .init(
+            domain: "cognitodomain",
+            scopes: ["name"],
+            signInRedirectURI: "@#$%junk1343",
+            signOutRedirectURI: "@3451://"))
+        let testPlugin = customPlugin(with: invalidRedirectConfig)
+
+        mockHostedUIResult = .success([
+            .init(name: "state", value: mockState),
+            .init(name: "code", value: mockProof)
+        ])
+        mockTokenResult = [
+            "refresh_token": AWSCognitoUserPoolTokens.testData.refreshToken,
+            "expires_in": 10] as [String: Any]
+        mockJson = try! JSONSerialization.data(withJSONObject: mockTokenResult)
+        MockURLProtocol.requestHandler = { _ in
+            return (HTTPURLResponse(), self.mockJson)
+        }
+
+        let expectation  = expectation(description: "SignIn operation should complete")
+        do {
+            _ = try await testPlugin.signInWithWebUI(presentationAnchor: ASPresentationAnchor(), options: nil)
+            XCTFail("Should not succeed")
+        } catch {
+            guard case AuthError.configuration = error else {
+                XCTFail("Should not fail with error = \(error)")
+                return
+            }
+            expectation.fulfill()
+        }
+        await fulfillment(of: [expectation], timeout: networkTimeout)
+    }
+
 
 
     /// Test a signIn restart while another sign in is in progress

diff --git a/...ugins/Logging/Sources/AWSCloudWatchLoggingPlugin/AWSCloudWatchLoggingCategoryClient.swift b/...ugins/Logging/Sources/AWSCloudWatchLoggingPlugin/AWSCloudWatchLoggingCategoryClient.swift
@@ -87,9 +87,10 @@ final class AWSCloudWatchLoggingCategoryClient {
         enum CognitoEventName: String {
             case signInAPI = "Auth.signInAPI"
             case signOutAPI = "Auth.signOutAPI"
+            case configured = "InternalConfigureAuth"
         }
         switch payload.eventName {
-        case HubPayload.EventName.Auth.signedIn, CognitoEventName.signInAPI.rawValue:
+        case HubPayload.EventName.Auth.signedIn, CognitoEventName.signInAPI.rawValue, CognitoEventName.configured.rawValue:
             takeUserIdentifierFromCurrentUser()
         case HubPayload.EventName.Auth.signedOut, CognitoEventName.signOutAPI.rawValue:
             self.userIdentifier = nil

diff --git a/AmplifyPlugins/Logging/Sources/AWSCloudWatchLoggingPlugin/AWSCloudWatchLoggingPlugin.swift b/AmplifyPlugins/Logging/Sources/AWSCloudWatchLoggingPlugin/AWSCloudWatchLoggingPlugin.swift
@@ -154,10 +154,6 @@ public class AWSCloudWatchLoggingPlugin: LoggingCategoryPlugin {
             let localStore: LoggingConstraintsLocalStore = UserDefaults.standard
             localStore.reset()
         }
-
-        DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(500)) {
-            self.loggingClient.takeUserIdentifierFromCurrentUser()
-        }
     }
 }