Merge branch 'main' into mattcreaser/usecase-delete-user

Author: mattcreaser

apollo/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [Release 1.2.0](https://github.com/aws-amplify/amplify-android/releases/tag/release_apollo_v1.2.0)
+
+### Features
+- **Apollo:** Add constructor to ApolloAmplifyConnector for directly specifying connection information ([#2980](https://github.com/aws-amplify/amplify-android/issues/2980))
+
+### Bug Fixes
+- **apollo:** Fix using Apollo to connect to AppSync in China ([#2947](https://github.com/aws-amplify/amplify-android/issues/2947))
+
+[See all changes between 1.1.0 and 1.2.0](https://github.com/aws-amplify/amplify-android/compare/release_apollo_v1.1.0...release_apollo_v1.2.0)
+
 ## [Release 1.1.0](https://github.com/aws-amplify/amplify-android/releases/tag/release_apollo_v1.1.0)
 
 ### Features

apollo/README.md

@@ -17,10 +17,10 @@ Add the dependency you prefer to your `build.gradle.kts` file.
 
 ```kotlin
 // To only use Apollo to speak to AppSync, without using Amplify
-implementation("com.amplifyframework:apollo-appsync:1.1.0")
+implementation("com.amplifyframework:apollo-appsync:1.2.0")
 
 // To connect Apollo to AppSync using your existing Amplify Gen2 Backend
-implementation("com.amplifyframework:apollo-appsync-amplify:1.1.0")
+implementation("com.amplifyframework:apollo-appsync-amplify:1.2.0")
 ```
 
 For applications using `apollo-appsync` directly, instantiate the Endpoint and the desired Authorizer instance, and then call the Apollo builder extension.

apollo/apollo-appsync-amplify/src/androidTest/backend/package-lock.json

@@ -13,7 +13,7 @@
     "@aws-amplify/backend": "^1.14.3",
     "@aws-amplify/backend-cli": "^1.5.0",
     "aws-cdk": "^2.1005.0",
-    "aws-cdk-lib": "^2.185.0",
+    "aws-cdk-lib": "^2.187.0",
     "constructs": "^10.4.2",
     "esbuild": "^0.25.1",
     "tsx": "^4.19.3",

apollo/apollo-appsync-amplify/src/androidTest/backend/package.json

@@ -1 +1 @@
-VERSION_NAME=1.1.0
+VERSION_NAME=1.2.0

apollo/version.properties

@@ -459,7 +459,7 @@ class AWSCognitoAuthPlugin : AuthPlugin<AWSCognitoAuthService>() {
     ) = enqueue(onSuccess, onError) { useCaseFactory.listWebAuthnCredentials().execute(options) }
 
     override fun autoSignIn(onSuccess: Consumer<AuthSignInResult>, onError: Consumer<AuthException>) =
-        enqueue(onSuccess, onError) { queueFacade.autoSignIn() }
+        enqueue(onSuccess, onError) { useCaseFactory.autoSignIn().execute() }
 
     override fun deleteWebAuthnCredential(credentialId: String, onSuccess: Action, onError: Consumer<AuthException>) =
         deleteWebAuthnCredential(credentialId, AuthDeleteWebAuthnCredentialOptions.defaults(), onSuccess, onError)

aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSCognitoAuthPlugin.kt

@@ -161,11 +161,4 @@ internal class KotlinAuthFacadeInternal(private val delegate: RealAWSCognitoAuth
             { continuation.resumeWithException(it) }
         )
     }
-
-    suspend fun autoSignIn(): AuthSignInResult = suspendCoroutine { continuation ->
-        delegate.autoSignIn(
-            { continuation.resume(it) },
-            { continuation.resumeWithException(it) }
-        )
-    }
 }

aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/KotlinAuthFacadeInternal.kt

@@ -87,7 +87,6 @@ import com.amplifyframework.statemachine.codegen.data.HostedUIErrorData
 import com.amplifyframework.statemachine.codegen.data.SignInData
 import com.amplifyframework.statemachine.codegen.data.SignInMethod
 import com.amplifyframework.statemachine.codegen.data.SignOutData
-import com.amplifyframework.statemachine.codegen.data.SignUpData
 import com.amplifyframework.statemachine.codegen.data.WebAuthnSignInContext
 import com.amplifyframework.statemachine.codegen.data.challengeNameType
 import com.amplifyframework.statemachine.codegen.errors.SessionError
@@ -108,7 +107,6 @@ import com.amplifyframework.statemachine.codegen.states.SetupTOTPState
 import com.amplifyframework.statemachine.codegen.states.SignInChallengeState
 import com.amplifyframework.statemachine.codegen.states.SignInState
 import com.amplifyframework.statemachine.codegen.states.SignOutState
-import com.amplifyframework.statemachine.codegen.states.SignUpState
 import com.amplifyframework.statemachine.codegen.states.WebAuthnSignInState
 import java.lang.ref.WeakReference
 import java.util.concurrent.CountDownLatch
@@ -172,107 +170,6 @@ internal class RealAWSCognitoAuthPlugin(
         authStateMachine.state.takeWhile { it !is AuthState.Configured && it !is AuthState.Error }.collect()
     }
 
-    fun autoSignIn(onSuccess: Consumer<AuthSignInResult>, onError: Consumer<AuthException>) {
-        authStateMachine.getCurrentState { authState ->
-            when (authState.authNState) {
-                is AuthenticationState.NotConfigured -> onError.accept(
-                    InvalidUserPoolConfigurationException()
-                )
-                is AuthenticationState.SignedIn -> {
-                    onError.accept(InvalidStateException())
-                }
-                is AuthenticationState.SignedOut -> GlobalScope.launch {
-                    when (val signUpState = authState.authSignUpState) {
-                        is SignUpState.SignedUp -> {
-                            _autoSignIn(signUpState.signUpData, onSuccess, onError)
-                        }
-                        else -> onError.accept(InvalidStateException())
-                    }
-                }
-                is AuthenticationState.SigningIn -> {
-                    val token = StateChangeListenerToken()
-                    authStateMachine.listen(
-                        token,
-                        { authState ->
-                            when (authState.authNState) {
-                                is AuthenticationState.SignedOut -> {
-                                    authStateMachine.cancel(token)
-                                    when (val signUpState = authState.authSignUpState) {
-                                        is SignUpState.SignedUp -> GlobalScope.launch {
-                                            _autoSignIn(signUpState.signUpData, onSuccess, onError)
-                                        }
-                                        else -> onError.accept(InvalidStateException())
-                                    }
-                                }
-                                else -> Unit
-                            }
-                        },
-                        {
-                            authStateMachine.send(AuthenticationEvent(AuthenticationEvent.EventType.CancelSignIn()))
-                        }
-                    )
-                }
-                else -> onError.accept(InvalidStateException())
-            }
-        }
-    }
-
-    private suspend fun _autoSignIn(
-        signUpData: SignUpData,
-        onSuccess: Consumer<AuthSignInResult>,
-        onError: Consumer<AuthException>
-    ) {
-        val token = StateChangeListenerToken()
-        authStateMachine.listen(
-            token,
-            { authState ->
-                val authNState = authState.authNState
-                val authZState = authState.authZState
-                when {
-                    authNState is AuthenticationState.SigningIn -> {
-                        val signInState = authNState.signInState
-                        when {
-                            signInState is SignInState.Error -> {
-                                authStateMachine.cancel(token)
-                                onError.accept(
-                                    CognitoAuthExceptionConverter.lookup(signInState.exception, "Sign in failed.")
-                                )
-                            }
-                        }
-                    }
-                    authNState is AuthenticationState.SignedIn &&
-                        authZState is AuthorizationState.SessionEstablished -> {
-                        authStateMachine.cancel(token)
-                        val authSignInResult = AuthSignInResult(
-                            true,
-                            AuthNextSignInStep(
-                                AuthSignInStep.DONE,
-                                mapOf(),
-                                null,
-                                null,
-                                null,
-                                null
-                            )
-                        )
-                        onSuccess.accept(authSignInResult)
-                        sendHubEvent(AuthChannelEventName.SIGNED_IN.toString())
-                    }
-                    else -> Unit
-                }
-            },
-            {
-                val signInData = SignInData.AutoSignInData(
-                    signUpData.username,
-                    signUpData.session,
-                    signUpData.clientMetadata ?: mapOf(),
-                    signUpData.userId
-                )
-                val event = AuthenticationEvent(AuthenticationEvent.EventType.SignInRequested(signInData))
-                authStateMachine.send(event)
-            }
-        )
-    }
-
     fun signIn(
         username: String?,
         password: String?,

aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/RealAWSCognitoAuthPlugin.kt

@@ -20,11 +20,13 @@ import com.amplifyframework.auth.cognito.AuthStateMachine
 import com.amplifyframework.auth.cognito.RealAWSCognitoAuthPlugin
 import com.amplifyframework.auth.cognito.helpers.WebAuthnHelper
 import com.amplifyframework.auth.cognito.requireIdentityProviderClient
+import com.amplifyframework.auth.plugins.core.AuthHubEventEmitter
 
 internal class AuthUseCaseFactory(
     private val plugin: RealAWSCognitoAuthPlugin,
     private val authEnvironment: AuthEnvironment,
-    private val stateMachine: AuthStateMachine
+    private val stateMachine: AuthStateMachine,
+    private val hubEmitter: AuthHubEventEmitter = AuthHubEventEmitter()
 ) {
 
     fun fetchAuthSession() = FetchAuthSessionUseCase(plugin)
@@ -140,6 +142,11 @@ internal class AuthUseCaseFactory(
         stateMachine = stateMachine
     )
 
+    fun autoSignIn() = AutoSignInUseCase(
+        stateMachine = stateMachine,
+        hubEmitter = hubEmitter
+    )
+
     fun fetchMfaPreference() = FetchMfaPreferenceUseCase(
         client = authEnvironment.requireIdentityProviderClient(),
         fetchAuthSession = fetchAuthSession(),