chore: kickoff release

Author: atierian

.github/workflows/integ_test.yml

@@ -55,46 +55,44 @@ jobs:
           project_path: ./AmplifyPlugins/Analytics/Tests/AnalyticsHostApp
           scheme: AWSPinpointAnalyticsPluginIntegrationTests
 
-  #  Disabling these tests because they do not currently work in CI. We will create a ticket to track
-  #  getting resolving this. In the meantime, they can be run locally.
-  #  
-  # push-notification-integration-test:
-  #   needs: prepare-for-test
-  #   runs-on: macos-12
-  #   environment: IntegrationTest
-  #   steps:
-  #     - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
-  #       with:
-  #         persist-credentials: false
-
-  #     - name: Make directory
-  #       run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
-
-  #     - name: Copy integration test resouces
-  #       uses: ./.github/composite_actions/download_test_configuration
-  #       with:
-  #         resource_subfolder: push-notification
-  #         aws_role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
-  #         aws_region: ${{ secrets.AWS_REGION }}
-  #         aws_s3_bucket: ${{ secrets.AWS_S3_BUCKET_INTEG_V2 }}
-
-  #     - name: Set up node
-  #       uses: actions/setup-node@v3
-  #       with:
-  #         node-version: 16.x
-
-  #     - name: Run Local Server
-  #       run: |
-  #         cd ./AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/LocalServer
-  #         npm install
-  #         npm start &
-  #       shell: bash
-
-  #     - name: Run Integration test
-  #       uses: ./.github/composite_actions/run_xcodebuild_test
-  #       with:
-  #         project_path: ./AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp
-  #         scheme: PushNotificationHostApp
+
+  push-notification-integration-test:
+    needs: prepare-for-test
+    runs-on: macos-12
+    environment: IntegrationTest
+    steps:
+      - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        with:
+          persist-credentials: false
+
+      - name: Make directory
+        run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
+
+      - name: Copy integration test resouces
+        uses: ./.github/composite_actions/download_test_configuration
+        with:
+          resource_subfolder: push-notification
+          aws_role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+          aws_region: ${{ secrets.AWS_REGION }}
+          aws_s3_bucket: ${{ secrets.AWS_S3_BUCKET_INTEG_V2 }}
+
+      - name: Set up node
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
+        with:
+          node-version: 16.x
+
+      - name: Run Local Server
+        run: |
+          cd ./AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/LocalServer
+          npm install
+          npm start &
+        shell: bash
+
+      - name: Run Integration test
+        uses: ./.github/composite_actions/run_xcodebuild_test
+        with:
+          project_path: ./AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp
+          scheme: PushNotificationHostApp
 
   auth-integration-test:
     needs: prepare-for-test
@@ -173,4 +171,4 @@ jobs:
         uses: ./.github/composite_actions/run_xcodebuild_test
         with:
           project_path: ./AmplifyPlugins/Storage/Tests/StorageHostApp/
-          scheme: AWSS3StoragePluginIntegrationTests
+          scheme: AWSS3StoragePluginIntegrationTests

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthDeleteUserTask.swift

@@ -31,11 +31,12 @@ class AWSAuthDeleteUserTask: AuthDeleteUserTask, DefaultLogger {
         let accessToken = try await taskHelper.getAccessToken()
 
         do {
-            try  await deleteUser(with: accessToken)
+            try await deleteUser(with: accessToken)
             log.verbose("Received Success")
         } catch {
             log.verbose("Delete user failed, reconfiguring auth state. \(error)")
             await waitForReConfigure()
+            await signOutIfUserWasNotFound(with: error)
             throw error
         }
     }
@@ -66,6 +67,18 @@ class AWSAuthDeleteUserTask: AuthDeleteUserTask, DefaultLogger {
         }
     }
 
+    private func signOutIfUserWasNotFound(with error: Error) async {
+        guard case AuthError.service(_, _, let underlyingError) = error,
+              case .userNotFound = (underlyingError as? AWSCognitoAuthError) else {
+            return
+        }
+        log.verbose("User not found, signing out")
+        let signOutData = SignOutEventData(globalSignOut: true)
+        let event = AuthenticationEvent(eventType: .signOutRequested(signOutData))
+        await authStateMachine.send(event)
+        _ = await taskHelper.didSignOut()
+    }
+
     private func waitForReConfigure() async {
 
         let event = AuthEvent(eventType: .reconfigure(configuration))

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignOutTask.swift

@@ -35,7 +35,7 @@ class AWSAuthSignOutTask: AuthSignOutTask, DefaultLogger {
         if isValidAuthNStateToStart(authNState) {
             log.verbose("Sending signOut event")
             await sendSignOutEvent()
-            return await doSignOut()
+            return await taskHelper.didSignOut()
         } else if case .federatedToIdentityPool = authNState {
             let invalidStateError = AuthError.invalidState(
                 "The user is currently federated to identity pool. You must call clearFederationToIdentityPool to clear credentials.",
@@ -47,40 +47,6 @@ class AWSAuthSignOutTask: AuthSignOutTask, DefaultLogger {
 
     }
 
-    private func doSignOut() async -> AuthSignOutResult {
-
-        let stateSequences = await authStateMachine.listen()
-        log.verbose("Waiting for signOut completion")
-        for await state in stateSequences {
-            guard case .configured(let authNState, _) = state else {
-                return invalidStateResult()
-            }
-
-            switch authNState {
-            case .signedOut(let data):
-                if data.revokeTokenError != nil ||
-                    data.globalSignOutError != nil ||
-                    data.hostedUIError != nil {
-                    return AWSCognitoSignOutResult.partial(
-                        revokeTokenError: data.revokeTokenError,
-                        globalSignOutError: data.globalSignOutError,
-                        hostedUIError: data.hostedUIError)
-                }
-                return AWSCognitoSignOutResult.complete
-            case .signingIn:
-                log.verbose("Cancel if a signIn is in progress")
-                await authStateMachine.send(AuthenticationEvent.init(eventType: .cancelSignIn))
-            case .signingOut(let state):
-                if case .error(let error) = state {
-                    return AWSCognitoSignOutResult.failed(error.authError)
-                }
-            default:
-                continue
-            }
-        }
-        fatalError()
-    }
-
     func isValidAuthNStateToStart(_ authNState: AuthenticationState) -> Bool {
         switch authNState {
         case .signedIn, .signedOut:

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/Helpers/AWSAuthTaskHelper.swift

@@ -31,6 +31,40 @@ class AWSAuthTaskHelper: DefaultLogger {
         }
     }
 
+    func didSignOut() async -> AuthSignOutResult {
+        let stateSequences = await authStateMachine.listen()
+        log.verbose("Waiting for signOut completion")
+        for await state in stateSequences {
+            guard case .configured(let authNState, _) = state else {
+                let error = AuthError.invalidState("Auth State not in a valid state", AuthPluginErrorConstants.invalidStateError, nil)
+                return AWSCognitoSignOutResult.failed(error)
+            }
+
+            switch authNState {
+            case .signedOut(let data):
+                if data.revokeTokenError != nil ||
+                    data.globalSignOutError != nil ||
+                    data.hostedUIError != nil {
+                    return AWSCognitoSignOutResult.partial(
+                        revokeTokenError: data.revokeTokenError,
+                        globalSignOutError: data.globalSignOutError,
+                        hostedUIError: data.hostedUIError)
+                }
+                return AWSCognitoSignOutResult.complete
+            case .signingIn:
+                log.verbose("Cancel if a signIn is in progress")
+                await authStateMachine.send(AuthenticationEvent.init(eventType: .cancelSignIn))
+            case .signingOut(let state):
+                if case .error(let error) = state {
+                    return AWSCognitoSignOutResult.failed(error.authError)
+                }
+            default:
+                continue
+            }
+        }
+        fatalError()
+    }
+
     func getAccessToken() async throws -> String {
 
         let session = try await fetchAuthSessionHelper.fetch(authStateMachine)

AmplifyPlugins/Auth/Tests/AWSCognitoAuthPluginUnitTests/TaskTests/AuthenticationProviderDeleteUserTests.swift

@@ -36,6 +36,35 @@ class AuthenticationProviderDeleteUserTests: BasePluginTest {
         }
     }
 
+    /// Test a deleteUser when sign out failed
+    ///
+    /// - Given: Given an auth plugin with mocked service. Mocked service should mock a
+    ///   sign out failure
+    ///
+    /// - When:
+    ///    - I invoke deleteUser
+    /// - Then:
+    ///    - I should still be able to get a success for delete user
+    ///
+    func testSignOutFailureWhenDeleteUserIsSuccess() async {
+        mockIdentityProvider = MockIdentityProvider(
+            mockRevokeTokenResponse: { _ in
+                throw RevokeTokenOutputError.unsupportedTokenTypeException(.init())
+            }, mockGlobalSignOutResponse: { _ in
+                throw GlobalSignOutOutputError.internalErrorException(.init())
+            },
+            mockDeleteUserOutputResponse: { _ in
+                try DeleteUserOutputResponse(httpResponse: .init(body: .empty, statusCode: .ok))
+            }
+        )
+        do {
+            try await plugin.deleteUser()
+            print("Delete user success")
+        } catch {
+            XCTFail("Received failure with error \(error)")
+        }
+    }
+
 
     /// Test a deleteUser with network error from service
     ///
@@ -374,6 +403,7 @@ class AuthenticationProviderDeleteUserTests: BasePluginTest {
     ///    - I invoke deleteUser
     /// - Then:
     ///    - I should get a .service error with .userNotFound error
+    ///      AuthN should be in signedOut state
     ///
     func testDeleteUserWithUserNotFoundException() async {
         mockIdentityProvider = MockIdentityProvider(
@@ -397,6 +427,19 @@ class AuthenticationProviderDeleteUserTests: BasePluginTest {
                 return
             }
         }
+
+        switch await plugin.authStateMachine.currentState {
+        case .configured(let authNState, let authZState):
+            switch (authNState, authZState) {
+            case (.signedOut, .configured):
+                print("AuthN and AuthZ are in a valid state")
+            default:
+                XCTFail("AuthN should be in signed out state")
+            }
+        default:
+            XCTFail("Auth should be in configured state")
+
+        }
     }
 
 // TODO: ENABLE TESTS after adding hosted UI feature

AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Storage/SQLite/QueryPredicate+SQLite.swift

@@ -11,26 +11,28 @@ import SQLite
 
 extension QueryOperator {
 
-    var sqlOperation: String {
+    func sqlOperation(column: String) -> String {
         switch self {
         case .notEqual(let value):
-            return value == nil ? "is not null" : "<> ?"
+            return value == nil ? "\(column) is not null" : "\(column) <> ?"
         case .equals(let value):
-            return value == nil ? "is null" : "= ?"
+            return value == nil ? "\(column) is null" : "\(column) = ?"
         case .lessOrEqual:
-            return "<= ?"
+            return "\(column) <= ?"
         case .lessThan:
-            return "< ?"
+            return "\(column) < ?"
         case .greaterOrEqual:
-            return ">= ?"
+            return "\(column) >= ?"
         case .greaterThan:
-            return "> ?"
+            return "\(column) > ?"
         case .between:
-            return "between ? and ?"
-        case .beginsWith, .contains:
-            return "like ?"
+            return "\(column) between ? and ?"
+        case .beginsWith:
+            return "instr(\(column), ?) = 1"
+        case .contains:
+            return "instr(\(column), ?) > 0"
         case .notContains:
-            return "not like ?"
+            return "instr(\(column), ?) = 0"
         }
     }
 
@@ -45,12 +47,10 @@ extension QueryOperator {
              .greaterOrEqual(let value),
              .greaterThan(let value):
             return [value.asBinding()]
-        case .contains(let value):
-            return ["%\(value)%"]
-        case .beginsWith(let value):
-            return ["\(value)%"]
-        case .notContains(let value):
-            return ["%\(value)%"]
+        case .contains(let value),
+            .beginsWith(let value),
+            .notContains(let value):
+            return [value.asBinding()]
         }
     }
 }

AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Storage/SQLite/SQLStatement+Condition.swift

@@ -31,9 +31,9 @@ private func translateQueryPredicate(from modelSchema: ModelSchema,
         if let operation = pred as? QueryPredicateOperation {
             let column = resolveColumn(operation)
             if predicateIndex == 0 {
-                sql.append("\(indent)\(column) \(operation.operator.sqlOperation)")
+                sql.append("\(indent)\(operation.operator.sqlOperation(column: column))")
             } else {
-                sql.append("\(indent)\(groupType.rawValue) \(column) \(operation.operator.sqlOperation)")
+                sql.append("\(indent)\(groupType.rawValue) \(operation.operator.sqlOperation(column: column))")
             }
 
             bindings.append(contentsOf: operation.operator.bindings)