Skip to content

chore(auth): Fix failing integration tests #3032

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 3 commits into from
Apr 28, 2025
Merged

chore(auth): Fix failing integration tests #3032

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
579b7aa
Refactor FetchAuthSessionUseCase for state machine race condition
mattcreaser Apr 25, 2025
fce8c86
Move UserAgentConfigurationTest to unit test
mattcreaser Apr 25, 2025
6c38639
Remove DevMenuMainViewInstrumentationTest
mattcreaser Apr 25, 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
94 changes: 49 additions & 45 deletions ...gnito/src/main/java/com/amplifyframework/auth/cognito/usecases/FetchAuthSessionUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@ import com.amplifyframework.auth.exceptions.SignedOutException
import com.amplifyframework.auth.exceptions.UnknownException
import com.amplifyframework.auth.options.AuthFetchSessionOptions
import com.amplifyframework.auth.plugins.core.AuthHubEventEmitter
import com.amplifyframework.statemachine.StateMachineEvent
import com.amplifyframework.statemachine.codegen.data.AmplifyCredential
import com.amplifyframework.statemachine.codegen.errors.SessionError
import com.amplifyframework.statemachine.codegen.events.AuthorizationEvent
import com.amplifyframework.statemachine.codegen.states.AuthorizationState
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.mapNotNull
import kotlinx.coroutines.flow.onStart

internal class FetchAuthSessionUseCase(
private val stateMachine: AuthStateMachine,
Expand All @@ -44,80 +46,82 @@ internal class FetchAuthSessionUseCase(
suspend fun execute(options: AuthFetchSessionOptions = AuthFetchSessionOptions.defaults()): AWSCognitoAuthSession =
when (val authZState = stateMachine.getCurrentState().authZState) {
is AuthorizationState.Configured -> {
stateMachine.send(AuthorizationEvent(AuthorizationEvent.EventType.FetchUnAuthSession))
listenForSessionEstablished()
listenForSessionEstablished(
eventToSend = AuthorizationEvent(AuthorizationEvent.EventType.FetchUnAuthSession)
)
}
is AuthorizationState.SessionEstablished -> {
val credential = authZState.amplifyCredential
if (!credential.isValid() || options.forceRefresh) {
sendRefreshSessionEvent(credential)
listenForSessionEstablished()
listenForSessionEstablished(eventToSend = refreshSessionEvent(credential))
} else {
credential.getCognitoSession()
}
}
is AuthorizationState.Error -> {
val error = authZState.exception
if (error is SessionError) {
sendRefreshSessionEvent(error.amplifyCredential)
listenForSessionEstablished()
listenForSessionEstablished(eventToSend = refreshSessionEvent(error.amplifyCredential))
} else {
throw InvalidStateException()
}
}
else -> throw InvalidStateException()
}

private fun sendRefreshSessionEvent(credential: AmplifyCredential) {
private fun refreshSessionEvent(credential: AmplifyCredential): StateMachineEvent =
if (credential is AmplifyCredential.IdentityPoolFederated) {
stateMachine.send(
AuthorizationEvent(
AuthorizationEvent.EventType.StartFederationToIdentityPool(
credential.federatedToken,
credential.identityId,
credential
)
AuthorizationEvent(
AuthorizationEvent.EventType.StartFederationToIdentityPool(
credential.federatedToken,
credential.identityId,
credential
)
)
} else {
stateMachine.send(AuthorizationEvent(AuthorizationEvent.EventType.RefreshSession(credential)))
AuthorizationEvent(AuthorizationEvent.EventType.RefreshSession(credential))
}
}

private suspend fun listenForSessionEstablished(): AWSCognitoAuthSession {
val session = stateMachine.stateTransitions.mapNotNull { authState ->
when (val authZState = authState.authZState) {
is AuthorizationState.SessionEstablished -> authZState.amplifyCredential.getCognitoSession()
is AuthorizationState.Error -> {
when (val error = authZState.exception) {
is SessionError -> {
when (val innerException = error.exception) {
is SignedOutException -> error.amplifyCredential.getCognitoSession(innerException)
is ServiceException -> error.amplifyCredential.getCognitoSession(innerException)
is NotAuthorizedException -> error.amplifyCredential.getCognitoSession(innerException)
is SessionExpiredException -> {
emitter.sendHubEvent(AuthChannelEventName.SESSION_EXPIRED.toString())
error.amplifyCredential.getCognitoSession(innerException)
}
else -> {
val errorResult = UnknownException("Fetch auth session failed.", innerException)
error.amplifyCredential.getCognitoSession(errorResult)
private suspend fun listenForSessionEstablished(eventToSend: StateMachineEvent): AWSCognitoAuthSession {
val session = stateMachine.stateTransitions
.onStart {
stateMachine.send(eventToSend)
}
.mapNotNull { authState ->
when (val authZState = authState.authZState) {
is AuthorizationState.SessionEstablished -> authZState.amplifyCredential.getCognitoSession()
is AuthorizationState.Error -> {
when (val error = authZState.exception) {
is SessionError -> {
when (val innerException = error.exception) {
is SignedOutException -> error.amplifyCredential.getCognitoSession(innerException)
is ServiceException -> error.amplifyCredential.getCognitoSession(innerException)
is NotAuthorizedException -> error.amplifyCredential.getCognitoSession(
innerException
)
is SessionExpiredException -> {
emitter.sendHubEvent(AuthChannelEventName.SESSION_EXPIRED.toString())
error.amplifyCredential.getCognitoSession(innerException)
}
else -> {
val errorResult = UnknownException("Fetch auth session failed.", innerException)
error.amplifyCredential.getCognitoSession(errorResult)
}
}
}
}
is ConfigurationException -> {
val errorResult = InvalidAccountTypeException(error)
AmplifyCredential.Empty.getCognitoSession(errorResult)
}
else -> {
val errorResult = UnknownException("Fetch auth session failed.", error)
AmplifyCredential.Empty.getCognitoSession(errorResult)
is ConfigurationException -> {
val errorResult = InvalidAccountTypeException(error)
AmplifyCredential.Empty.getCognitoSession(errorResult)
}
else -> {
val errorResult = UnknownException("Fetch auth session failed.", error)
AmplifyCredential.Empty.getCognitoSession(errorResult)
}
}
}
else -> null // no-op
}
else -> null // no-op
}
}.first()
}.first()

return session
}
Expand Down