chore: kickoff release

aws-amplify · Dec 5, 2023 · 5e2ca10 · 5e2ca10
2 parents 54c763c + 274ca6a
commit 5e2ca10
Show file tree

Hide file tree

Showing 77 changed files with 601 additions and 363 deletions.
diff --git a/.github/workflows/closed_issue_message.yml b/.github/workflows/closed_issue_message.yml
@@ -0,0 +1,17 @@
+
+name: Closed Issue Message
+on:
+    issues:
+       types: [closed]
+jobs:
+    auto_comment:
+        runs-on: ubuntu-latest
+        steps:
+        - uses: aws-actions/closed-issue-message@v1
+          with:
+            repo-token: "${{ secrets.GITHUB_TOKEN }}"
+            message: |
+                     ### ⚠️COMMENT VISIBILITY WARNING⚠️
+                     Comments on closed issues are hard for our team to see.
+                     If you need more assistance, please either tag a team member or open a new issue that references this one.
+                     If you wish to keep having a conversation with other community members under this issue feel free to do so.
diff --git a/...h/Sources/AWSCognitoAuthPlugin/Actions/FetchAuthorizationSession/InformSessionError.swift b/...h/Sources/AWSCognitoAuthPlugin/Actions/FetchAuthorizationSession/InformSessionError.swift
@@ -23,7 +23,8 @@ struct InformSessionError: Action {
         switch error {
         case .service(let serviceError):
             if isNotAuthorizedError(serviceError) {
-                event = .init(eventType: .throwError(.sessionExpired))
+                event = .init(eventType: .throwError(
+                    .sessionExpired(error: serviceError)))
             } else {
                 event = .init(eventType: .receivedSessionError(error))
             }

diff --git a/...lugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/HostedUI/ShowHostedUISignIn.swift b/...lugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/HostedUI/ShowHostedUISignIn.swift
@@ -15,8 +15,6 @@ class ShowHostedUISignIn: NSObject, Action {
 
     let signingInData: HostedUISigningInState
 
-    var sessionAdapter: HostedUISessionBehavior?
-
     init(signInData: HostedUISigningInState) {
         self.signingInData = signInData
     }
@@ -48,17 +46,13 @@ class ShowHostedUISignIn: NSObject, Action {
         self.logVerbose("\(#fileID) Showing url \(url.absoluteString)", environment: environment)
 
         do {
-            let queryItems = try await withCheckedThrowingContinuation {
-                (continuation: CheckedContinuation<[URLQueryItem], Error>) in
-                sessionAdapter = hostedUIEnvironment.hostedUISessionFactory()
-                sessionAdapter?.showHostedUI(
-                    url: url,
-                    callbackScheme: callbackURLScheme,
-                    inPrivate: signingInData.options.preferPrivateSession,
-                    presentationAnchor: signingInData.presentationAnchor) { result in
-                        continuation.resume(with: result)
-                    }
-            }
+            let sessionAdapter = hostedUIEnvironment.hostedUISessionFactory()
+            let queryItems = try await sessionAdapter.showHostedUI(
+                url: url,
+                callbackScheme: callbackURLScheme,
+                inPrivate: signingInData.options.preferPrivateSession,
+                presentationAnchor: signingInData.presentationAnchor)
+
             guard let code = queryItems.first(where: { $0.name == "code" })?.value,
                   let state = queryItems.first(where: { $0.name == "state" })?.value,
                   self.signingInData.state == state else {

diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignOut/ShowHostedUISignOut.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignOut/ShowHostedUISignOut.swift
@@ -16,8 +16,6 @@ class ShowHostedUISignOut: NSObject, Action {
     let signOutEvent: SignOutEventData
     let signInData: SignedInData
 
-    var sessionAdapter: HostedUISessionBehavior?
-
     init(signOutEvent: SignOutEventData, signInData: SignedInData) {
         self.signInData = signInData
         self.signOutEvent = signOutEvent
@@ -44,17 +42,12 @@ class ShowHostedUISignOut: NSObject, Action {
 
         do {
             let logoutURL = try HostedUIRequestHelper.createSignOutURL(configuration: hostedUIConfig)
-            _ = try await withCheckedThrowingContinuation {
-                (continuation: CheckedContinuation<[URLQueryItem], Error>) in
-                sessionAdapter = hostedUIEnvironment.hostedUISessionFactory()
-                sessionAdapter?.showHostedUI(url: logoutURL,
-                                             callbackScheme: callbackURLScheme,
-                                             inPrivate: false,
-                                             presentationAnchor: signOutEvent.presentationAnchor) {
-                    result in
-                    continuation.resume(with: result)
-                }
-            }
+            let sessionAdapter = hostedUIEnvironment.hostedUISessionFactory()
+            _ = try await sessionAdapter.showHostedUI(
+                url: logoutURL,
+                callbackScheme: callbackURLScheme,
+                inPrivate: false,
+                presentationAnchor: signOutEvent.presentationAnchor)
 
             await sendEvent(with: nil, dispatcher: dispatcher, environment: environment)
 

diff --git a/...uth/Sources/AWSCognitoAuthPlugin/Operations/Helpers/FetchAuthSessionOperationHelper.swift b/...uth/Sources/AWSCognitoAuthPlugin/Operations/Helpers/FetchAuthSessionOperationHelper.swift
@@ -41,9 +41,10 @@ class FetchAuthSessionOperationHelper: DefaultLogger {
                 forceRefresh: forceRefresh)
 
         case .error(let error):
-            if case .sessionExpired = error {
+            if case .sessionExpired(let error) = error {
                 log.verbose("Session is expired")
-                let session = AuthCognitoSignedInSessionHelper.makeExpiredSignedInSession()
+                let session = AuthCognitoSignedInSessionHelper.makeExpiredSignedInSession(
+                    underlyingError: error)
                 return session
             } else if case .sessionError(_, let credentials) = error {
                 return try await refreshIfRequired(
@@ -125,8 +126,9 @@ class FetchAuthSessionOperationHelper: DefaultLogger {
             return try sessionResultWithFetchError(fetchError,
                                                    authenticationState: authenticationState,
                                                    existingCredentials: credentials)
-        case .sessionExpired:
-            let session = AuthCognitoSignedInSessionHelper.makeExpiredSignedInSession()
+        case .sessionExpired(let error):
+            let session = AuthCognitoSignedInSessionHelper.makeExpiredSignedInSession(
+                underlyingError: error)
             return session
         default:
             let message = "Unknown error occurred"

diff --git a/...ns/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Errors/AuthorizationError.swift b/...ns/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Errors/AuthorizationError.swift
@@ -15,14 +15,17 @@ enum AuthorizationError: Error {
     case service(error: Swift.Error)
     case invalidState(message: String)
     case sessionError(FetchSessionError, AmplifyCredentials)
-    case sessionExpired
+    case sessionExpired(error: Error)
 }
 
 extension AuthorizationError: AuthErrorConvertible {
     var authError: AuthError {
         switch self {
-        case .sessionExpired:
-            return .sessionExpired("", "", nil)
+        case .sessionExpired(let error):
+            return .sessionExpired(
+                "Session expired", 
+                "Invoke Auth.signIn to re-authenticate the user",
+                error)
         case .configuration(let message):
             return .configuration(message, "")
         case .service(let error):

diff --git a/.../Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/AuthState+Debug.swift b/.../Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/AuthState+Debug.swift
@@ -11,7 +11,7 @@ extension AuthState: CustomDebugStringConvertible {
 
     var debugDictionary: [String: Any] {
 
-        var additionalMetadataDictionary: [String: Any] = [:]
+        let additionalMetadataDictionary: [String: Any]
 
         switch self {
         case .notConfigured:
@@ -36,6 +36,5 @@ extension AuthState: CustomDebugStringConvertible {
 
     var debugDescription: String {
         return (debugDictionary as AnyObject).description
-
     }
 }
diff --git a/...WSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/AuthenticationState+Debug.swift b/...WSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/AuthenticationState+Debug.swift
@@ -8,7 +8,7 @@
 extension AuthenticationState: CustomDebugDictionaryConvertible {
 
     var debugDictionary: [String: Any] {
-        var additionalMetadataDictionary: [String: Any] = [:]
+        let additionalMetadataDictionary: [String: Any]
         switch self {
         case .notConfigured:
             additionalMetadataDictionary = [:]

diff --git a/...AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/AuthorizationState+Debug.swift b/...AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/AuthorizationState+Debug.swift
@@ -9,7 +9,7 @@ import Foundation
 
 extension AuthorizationState: CustomDebugDictionaryConvertible {
     var debugDictionary: [String: Any] {
-        var additionalMetadataDictionary: [String: Any] = [:]
+        let additionalMetadataDictionary: [String: Any]
 
         switch self {
         case .notConfigured,

diff --git a/...SCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/CredentialStoreState+Debug.swift b/...SCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/CredentialStoreState+Debug.swift
@@ -7,31 +7,37 @@
 
 import Foundation
 
-extension CredentialStoreState {
+extension CredentialStoreState: CustomDebugStringConvertible {
     var debugDictionary: [String: Any] {
-        let stateTypeDictionary: [String: Any] = ["CredentialStoreState": type]
-        var additionalMetadataDictionary: [String: Any] = [:]
+        let additionalMetadataDictionary: [String: Any]
 
         switch self {
-        case .notConfigured:
-            additionalMetadataDictionary = [:]
-        case .migratingLegacyStore:
-            additionalMetadataDictionary = [:]
-        case .loadingStoredCredentials:
-            additionalMetadataDictionary = [:]
-        case .clearingCredentials:
+        case .notConfigured,
+                .migratingLegacyStore,
+                .loadingStoredCredentials,
+                .storingCredentials,
+                .clearingCredentials,
+                .idle:
             additionalMetadataDictionary = [:]
         case .clearedCredential(let dataType):
-            additionalMetadataDictionary = ["StoreDataType": dataType]
-        case .storingCredentials:
-            additionalMetadataDictionary = [:]
-        case .success:
-            additionalMetadataDictionary = [:]
-        case .error:
-            additionalMetadataDictionary = [:]
-        case .idle:
-            additionalMetadataDictionary = [:]
+            additionalMetadataDictionary = [
+                "clearedDataType": dataType
+            ]
+        case .success(let data):
+            additionalMetadataDictionary = [
+                "savedData": data
+            ]
+        case .error(let error):
+            additionalMetadataDictionary = [
+                "errorType": error
+            ]
         }
-        return stateTypeDictionary.merging(additionalMetadataDictionary, uniquingKeysWith: { $1 })
+        return [type: additionalMetadataDictionary]
     }
+
+
+    var debugDescription: String {
+        return (debugDictionary as AnyObject).description
+    }
+
 }
diff --git a/.../AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/CustomSignInState+Debug.swift b/.../AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/CustomSignInState+Debug.swift
@@ -7,11 +7,11 @@
 
 import Foundation
 
-extension CustomSignInState {
+extension CustomSignInState: CustomDebugDictionaryConvertible {
 
     var debugDictionary: [String: Any] {
 
-        var additionalMetadataDictionary: [String: Any] = [:]
+        let additionalMetadataDictionary: [String: Any]
         switch self {
         case .notStarted:
             additionalMetadataDictionary = [:]

diff --git a/...es/AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/DeleteUserState+Debug.swift b/...es/AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/DeleteUserState+Debug.swift
@@ -8,7 +8,7 @@
 extension DeleteUserState: CustomDebugDictionaryConvertible {
 
     var debugDictionary: [String: Any] {
-        var additionalMetadataDictionary: [String: Any] = [:]
+        let additionalMetadataDictionary: [String: Any]
         switch self {
         case .notStarted:
             additionalMetadataDictionary = [:]

diff --git a/...ces/AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/DeviceSRPState+Debug.swift b/...ces/AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/DeviceSRPState+Debug.swift
@@ -7,11 +7,11 @@
 
 import Foundation
 
-extension DeviceSRPState {
+extension DeviceSRPState: CustomDebugDictionaryConvertible {
 
     var debugDictionary: [String: Any] {
 
-        var additionalMetadataDictionary: [String: Any] = [:]
+        let additionalMetadataDictionary: [String: Any]
         switch self {
         case .notStarted:
             additionalMetadataDictionary = [:]

diff --git a/...CognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/FetchAuthSessionState+Debug.swift b/...CognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/FetchAuthSessionState+Debug.swift
@@ -7,10 +7,10 @@
 
 import Foundation
 
-extension FetchAuthSessionState {
+extension FetchAuthSessionState: CustomDebugDictionaryConvertible {
 
     var debugDictionary: [String: Any] {
-        var additionalMetadataDictionary: [String: Any] = [:]
+        let additionalMetadataDictionary: [String: Any]
         switch self {
         case .notStarted:
             additionalMetadataDictionary = [:]

diff --git a/...WSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/HostedUISignInState+Debug.swift b/...WSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/HostedUISignInState+Debug.swift
@@ -8,7 +8,7 @@
 extension HostedUISignInState: CustomDebugDictionaryConvertible {
 
     var debugDictionary: [String: Any] {
-        var additionalMetadataDictionary: [String: Any] = [:]
+        let additionalMetadataDictionary: [String: Any]
         switch self {
         case .notStarted:
             additionalMetadataDictionary = [:]

diff --git a/...AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/MigrateSignInState+Debug.swift b/...AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/MigrateSignInState+Debug.swift
@@ -7,11 +7,11 @@
 
 import Foundation
 
-extension MigrateSignInState {
+extension MigrateSignInState: CustomDebugDictionaryConvertible {
 
     var debugDictionary: [String: Any] {
 
-        var additionalMetadataDictionary: [String: Any] = [:]
+        let additionalMetadataDictionary: [String: Any]
 
         switch self {
 

diff --git a/...WSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/RefreshSessionState+Debug.swift b/...WSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/RefreshSessionState+Debug.swift
@@ -7,10 +7,10 @@
 
 import Foundation
 
-extension RefreshSessionState {
+extension RefreshSessionState: CustomDebugDictionaryConvertible {
 
     var debugDictionary: [String: Any] {
-        var additionalMetadataDictionary: [String: Any] = [:]
+        let additionalMetadataDictionary: [String: Any]
         switch self {
         case .fetchingAuthSessionWithUserPool(let state, _):
             additionalMetadataDictionary = ["fetchingSession": state.debugDictionary]

diff --git a/...ces/AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/SRPSignInState+Debug.swift b/...ces/AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/SRPSignInState+Debug.swift
@@ -7,11 +7,11 @@
 
 import Foundation
 
-extension SRPSignInState {
+extension SRPSignInState: CustomDebugDictionaryConvertible {
 
     var debugDictionary: [String: Any] {
 
-        var additionalMetadataDictionary: [String: Any] = [:]
+        let additionalMetadataDictionary: [String: Any]
         switch self {
         case .notStarted:
             additionalMetadataDictionary = [:]

diff --git a/...SCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/SignInChallengeState+Debug.swift b/...SCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/SignInChallengeState+Debug.swift
@@ -7,18 +7,21 @@
 
 import Foundation
 
-extension SignInChallengeState {
+extension SignInChallengeState: CustomDebugDictionaryConvertible {
 
     var debugDictionary: [String: Any] {
-        var additionalMetadataDictionary: [String: Any] = [:]
+        let additionalMetadataDictionary: [String: Any]
         switch self {
 
         case .waitingForAnswer(let respondAuthChallenge, _),
                 .verifying(let respondAuthChallenge, _, _):
             additionalMetadataDictionary = respondAuthChallenge.debugDictionary
         case .error(let respondAuthChallenge, _, let error):
-            additionalMetadataDictionary = respondAuthChallenge.debugDictionary
-            additionalMetadataDictionary["error"] = error
+            additionalMetadataDictionary = respondAuthChallenge.debugDictionary.merging(
+                [
+                    "error": error
+                ],
+                uniquingKeysWith: {$1})
         default: additionalMetadataDictionary = [:]
         }
         return [type: additionalMetadataDictionary]

diff --git a/...ources/AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/SignInState+Debug.swift b/...ources/AWSCognitoAuthPlugin/StateMachine/CodeGen/States/DebugInfo/SignInState+Debug.swift
@@ -7,11 +7,11 @@
 
 import Foundation
 
-extension SignInState {
+extension SignInState: CustomDebugDictionaryConvertible {
 
     var debugDictionary: [String: Any] {
 
-        var additionalMetadataDictionary: [String: Any] = [:]
+        let additionalMetadataDictionary: [String: Any]
 
         switch self {
 
@@ -22,9 +22,13 @@ extension SignInState {
         case .signingInWithHostedUI(let substate):
             additionalMetadataDictionary = substate.debugDictionary
         case .resolvingChallenge(let challengeState, let challengeType, let signInMethod):
-            additionalMetadataDictionary = challengeState.debugDictionary
-            additionalMetadataDictionary["challengeType"] = challengeType
-            additionalMetadataDictionary["signInMethod"] = signInMethod
+
+            additionalMetadataDictionary = challengeState.debugDictionary.merging(
+                [
+                    "challengeType": challengeType,
+                    "signInMethod": signInMethod
+                ],
+                uniquingKeysWith: {$1})
 
         case .notStarted:
             additionalMetadataDictionary = [:]