Skip to content

fix(auth): fetch device metadata from credential store for remember and forgetDevice #2601

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 9 commits into from
Oct 11, 2023
Merged

fix(auth): fetch device metadata from credential store for remember and forgetDevice #2601

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c0d0ff6
fix(auth): in some cases Cognito sign in doesn't re-return the device…
Oct 3, 2023
1cc1f41
fix passing metadata
Oct 3, 2023
1815f8a
better fix (use auth env instead of authn state for metadata)
Oct 4, 2023
6206251
use globalscope instead of runblocking
Oct 4, 2023
cfc97eb
accidental commit
tjleing Oct 4, 2023
c7fd8e1
accidental commit
tjleing Oct 4, 2023
669eb24
add integ test for rememberdevice flow
Oct 9, 2023
35255ee
Merge branch 'main' into remember-device-metadata-fix
tjleing Oct 9, 2023
f536d63
Merge branch 'main' into remember-device-metadata-fix
gpanshu Oct 10, 2023
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
22 changes: 13 additions & 9 deletions aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/RealAWSCognitoAuthPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ import com.amplifyframework.statemachine.StateChangeListenerToken
import com.amplifyframework.statemachine.codegen.data.AmplifyCredential
import com.amplifyframework.statemachine.codegen.data.AuthChallenge
import com.amplifyframework.statemachine.codegen.data.AuthConfiguration
import com.amplifyframework.statemachine.codegen.data.DeviceMetadata
import com.amplifyframework.statemachine.codegen.data.FederatedToken
import com.amplifyframework.statemachine.codegen.data.HostedUIErrorData
import com.amplifyframework.statemachine.codegen.data.SignInData
Expand Down Expand Up @@ -1223,12 +1222,14 @@ internal class RealAWSCognitoAuthPlugin(
authStateMachine.getCurrentState { authState ->
when (val state = authState.authNState) {
is AuthenticationState.SignedIn -> {
updateDevice(
(state.deviceMetadata as? DeviceMetadata.Metadata)?.deviceKey,
DeviceRememberedStatusType.Remembered,
onSuccess,
onError
)
GlobalScope.launch {
updateDevice(
authEnvironment.getDeviceMetadata(state.signedInData.username)?.deviceKey,
DeviceRememberedStatusType.Remembered,
onSuccess,
onError
)
}
}
is AuthenticationState.SignedOut -> {
onError.accept(SignedOutException())
Expand Down Expand Up @@ -1276,8 +1277,11 @@ internal class RealAWSCognitoAuthPlugin(
when (val authState = authState.authNState) {
is AuthenticationState.SignedIn -> {
if (device.id.isEmpty()) {
val deviceKey = (authState.deviceMetadata as? DeviceMetadata.Metadata)?.deviceKey
updateDevice(deviceKey, DeviceRememberedStatusType.NotRemembered, onSuccess, onError)
GlobalScope.launch {
val deviceKey = authEnvironment.getDeviceMetadata(authState.signedInData.username)
?.deviceKey
updateDevice(deviceKey, DeviceRememberedStatusType.NotRemembered, onSuccess, onError)
}
} else {
updateDevice(device.id, DeviceRememberedStatusType.NotRemembered, onSuccess, onError)
}
Expand Down