Skip to content

chore(auth): Move SignIn and ConfirmSignIn to use cases #3140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 27, 2025
Merged

chore(auth): Move SignIn and ConfirmSignIn to use cases #3140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e8b7919
Move SignIn and ConfirmSignIn to use cases
mattcreaser Oct 9, 2025
531070e
Remove hasNewResponse flags from states
mattcreaser Oct 10, 2025
93df7d5
Update unit tests
mattcreaser Oct 10, 2025
3c8adfc
Fix subsequent sign outs not publishing a hub event
mattcreaser Oct 15, 2025
d6372d1
Merge branch 'main' into mattcreaser/usecase-signin
mattcreaser Oct 23, 2025
d3e8ba2
Throw SignedInException if already signed in
mattcreaser Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSCognitoAuthPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,28 +232,28 @@ class AWSCognitoAuthPlugin : AuthPlugin<AWSCognitoAuthService>() {
password: String?,
onSuccess: Consumer<AuthSignInResult>,
onError: Consumer<AuthException>
) = enqueue(onSuccess, onError) { queueFacade.signIn(username, password) }
) = enqueue(onSuccess, onError) { useCaseFactory.signIn().execute(username, password) }

override fun signIn(
username: String?,
password: String?,
options: AuthSignInOptions,
onSuccess: Consumer<AuthSignInResult>,
onError: Consumer<AuthException>
) = enqueue(onSuccess, onError) { queueFacade.signIn(username, password, options) }
) = enqueue(onSuccess, onError) { useCaseFactory.signIn().execute(username, password, options) }

override fun confirmSignIn(
challengeResponse: String,
onSuccess: Consumer<AuthSignInResult>,
onError: Consumer<AuthException>
) = enqueue(onSuccess, onError) { queueFacade.confirmSignIn(challengeResponse) }
) = enqueue(onSuccess, onError) { useCaseFactory.confirmSignIn().execute(challengeResponse) }

override fun confirmSignIn(
challengeResponse: String,
options: AuthConfirmSignInOptions,
onSuccess: Consumer<AuthSignInResult>,
onError: Consumer<AuthException>
) = enqueue(onSuccess, onError) { queueFacade.confirmSignIn(challengeResponse, options) }
) = enqueue(onSuccess, onError) { useCaseFactory.confirmSignIn().execute(challengeResponse, options) }

override fun signInWithSocialWebUI(
provider: AuthProvider,
Expand Down
11 changes: 5 additions & 6 deletions aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AuthStateMachine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,11 @@ internal class AuthStateMachine(
}

// This function throws if the state machine is *not* in the required state
internal suspend inline fun <reified T : AuthenticationState> AuthStateMachine.requireAuthenticationState() {
if (getCurrentState().authNState !is T) {
throw InvalidStateException(
"Auth State Machine is not in the required authentication state: ${T::class.simpleName}"
)
}
internal suspend inline fun <reified T : AuthenticationState> AuthStateMachine.requireAuthenticationState(): T {
val currentState = getCurrentState()
return currentState.authNState as? T ?: throw InvalidStateException(
"Auth State Machine is not in the required authentication state: ${T::class.simpleName}"
)
}

// Returns the SignedInState or throws SignedOutException or InvalidStateException
Expand Down
2 changes: 2 additions & 0 deletions ...-cognito/src/main/java/com/amplifyframework/auth/cognito/CognitoAuthExceptionConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,5 +102,7 @@ internal class CognitoAuthExceptionConverter {
)
else -> UnknownException(fallbackMessage, error)
}

fun Exception.toAuthException(fallbackMessage: String) = lookup(this, fallbackMessage)
}
}
40 changes: 0 additions & 40 deletions aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/KotlinAuthFacadeInternal.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ import com.amplifyframework.auth.AuthProvider
import com.amplifyframework.auth.AuthSession
import com.amplifyframework.auth.cognito.options.FederateToIdentityPoolOptions
import com.amplifyframework.auth.cognito.result.FederateToIdentityPoolResult
import com.amplifyframework.auth.options.AuthConfirmSignInOptions
import com.amplifyframework.auth.options.AuthFetchSessionOptions
import com.amplifyframework.auth.options.AuthSignInOptions
import com.amplifyframework.auth.options.AuthSignOutOptions
import com.amplifyframework.auth.options.AuthWebUISignInOptions
import com.amplifyframework.auth.result.AuthSignInResult
Expand All @@ -34,44 +32,6 @@ import kotlin.coroutines.suspendCoroutine

internal class KotlinAuthFacadeInternal(private val delegate: RealAWSCognitoAuthPlugin) {

suspend fun signIn(username: String?, password: String?): AuthSignInResult = suspendCoroutine { continuation ->
delegate.signIn(
username,
password,
{ continuation.resume(it) },
{ continuation.resumeWithException(it) }
)
}

suspend fun signIn(username: String?, password: String?, options: AuthSignInOptions): AuthSignInResult =
suspendCoroutine { continuation ->
delegate.signIn(
username,
password,
options,
{ continuation.resume(it) },
{ continuation.resumeWithException(it) }
)
}

suspend fun confirmSignIn(challengeResponse: String): AuthSignInResult = suspendCoroutine { continuation ->
delegate.confirmSignIn(
challengeResponse,
{ continuation.resume(it) },
{ continuation.resumeWithException(it) }
)
}

suspend fun confirmSignIn(challengeResponse: String, options: AuthConfirmSignInOptions): AuthSignInResult =
suspendCoroutine { continuation ->
delegate.confirmSignIn(
challengeResponse,
options,
{ continuation.resume(it) },
{ continuation.resumeWithException(it) }
)
}

suspend fun signInWithSocialWebUI(provider: AuthProvider, callingActivity: Activity): AuthSignInResult =
suspendCoroutine { continuation ->
delegate.signInWithSocialWebUI(
Expand Down
Loading