Skip to content
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

fix(auth): Fix for checking current preferred type before setting the MFAType as enabled to ensure the current preference is not cleared out #2580

Merged
merged 18 commits into from
Oct 11, 2023
Merged

fix(auth): Fix for checking current preferred type before setting the MFAType as enabled to ensure the current preference is not cleared out #2580

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
dfef8e2
Fix for checking current preferred type before setting the MFAType as…
gpanshu Aug 31, 2023
f554d5d
lint fix
gpanshu Aug 31, 2023
1a53f1e
typo fix
gpanshu Aug 31, 2023
dd9c605
Readded throws
gpanshu Aug 31, 2023
b14f5f4
Merge branch 'main' into fix-totp-preferredmfatype
gpanshu Sep 1, 2023
e68cc1d
Addressing PR comments
gpanshu Sep 1, 2023
f29b348
Addressing PR feedback
gpanshu Sep 5, 2023
0b3b3ad
addressing PR comments
gpanshu Sep 6, 2023
f6c3a9e
lint fix
gpanshu Sep 6, 2023
c779aac
fix lint
gpanshu Sep 6, 2023
5b19c1d
lint fix
gpanshu Sep 6, 2023
18e5986
Merge branch 'main' into fix-totp-preferredmfatype
tylerjroach Sep 13, 2023
9e3a5e9
removed the extra debug statement
gpanshu Oct 4, 2023
fd6c25e
Addressed PR comments
gpanshu Oct 4, 2023
c2bf821
Merge branch 'main' into fix-totp-preferredmfatype
gpanshu Oct 4, 2023
4936006
Merge branch 'main' into fix-totp-preferredmfatype
gpanshu Oct 6, 2023
b9b954c
Merge branch 'main' into fix-totp-preferredmfatype
mattcreaser Oct 11, 2023
2bbb89d
Merge branch 'main' into fix-totp-preferredmfatype
gpanshu Oct 11, 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
79 changes: 45 additions & 34 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 @@ -2190,7 +2190,7 @@ internal class RealAWSCognitoAuthPlugin(
var enabledSet: MutableSet<MFAType>? = null
var preferred: MFAType? = null
if (!response.userMfaSettingList.isNullOrEmpty()) {
enabledSet = mutableSetOf<MFAType>()
enabledSet = mutableSetOf()
response.userMfaSettingList?.forEach { mfaType ->
enabledSet.add(getMFAType(mfaType))
}
Expand Down Expand Up @@ -2223,45 +2223,56 @@ internal class RealAWSCognitoAuthPlugin(
onSuccess: Action,
onError: Consumer<AuthException>
) {
authStateMachine.getCurrentState { authState ->
when (authState.authNState) {
is AuthenticationState.SignedIn -> {
GlobalScope.launch {
try {
val accessToken = getSession().userPoolTokensResult.value?.accessToken
accessToken?.let { token ->
authEnvironment.cognitoAuthService.cognitoIdentityProviderClient?.setUserMfaPreference {
this.accessToken = token
this.smsMfaSettings = sms?.let {
SmsMfaSettingsType.invoke {
enabled = it.mfaEnabled
it.mfaPreferred ?.let { preferred -> preferredMfa = preferred }
}
}
this.softwareTokenMfaSettings = totp?.let {
SoftwareTokenMfaSettingsType.invoke {
enabled = it.mfaEnabled
it.mfaPreferred ?.let { preferred -> preferredMfa = preferred }
fetchMFAPreference({ userPreference ->
authStateMachine.getCurrentState { authState ->
when (authState.authNState) {
is AuthenticationState.SignedIn -> {
GlobalScope.launch {
try {
val accessToken = getSession().userPoolTokensResult.value?.accessToken
accessToken?.let { token ->
authEnvironment
.cognitoAuthService
.cognitoIdentityProviderClient
?.setUserMfaPreference {
this.accessToken = token
this.smsMfaSettings = sms?.let { it ->
val preferredMFASetting = it.mfaPreferred
?: (userPreference.preferred == MFAType.SMS && it.mfaEnabled)
gpanshu marked this conversation as resolved.
Show resolved Hide resolved
SmsMfaSettingsType.invoke {
enabled = it.mfaEnabled
preferredMfa = preferredMFASetting
}
}
this.softwareTokenMfaSettings = totp?.let { it ->
val preferredMFASetting = it.mfaPreferred
?: (userPreference.preferred == MFAType.TOTP && it.mfaEnabled)
SoftwareTokenMfaSettingsType.invoke {
enabled = it.mfaEnabled
preferredMfa = preferredMFASetting
}
}
}?.also {
onSuccess.call()
}
}
}?.also {
onSuccess.call()
}
} ?: onError.accept(SignedOutException())
} catch (error: Exception) {
onError.accept(
CognitoAuthExceptionConverter.lookup(
error,
"Amazon Cognito cannot update the MFA preferences"
} ?: onError.accept(SignedOutException())
} catch (error: Exception) {
onError.accept(
CognitoAuthExceptionConverter.lookup(
error,
"Amazon Cognito cannot update the MFA preferences"
)
)
)
}
}
}
}

else -> onError.accept(InvalidStateException())
else -> onError.accept(InvalidStateException())
}
}
}
}, {
onError.accept(it)
gpanshu marked this conversation as resolved.
Show resolved Hide resolved
})
}

private fun verifyTotp(
Expand Down
5 changes: 4 additions & 1 deletion aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/UserMFAPreference.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ data class UserMFAPreference(
/**
* Input for updating the MFA preference for a MFA Type
*/
enum class MFAPreference(internal val mfaEnabled: Boolean, internal val mfaPreferred: Boolean? = null) {
enum class MFAPreference(
internal val mfaEnabled: Boolean,
internal val mfaPreferred: Boolean? = null
) {
/**
* MFA not enabled
*/
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/com/amplifyframework/auth/cognito/exceptions/service/InvalidParameterException.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ import com.amplifyframework.auth.exceptions.ServiceException
* Could not perform the action because there are incorrect parameters.
* @param cause The underlying cause of this exception
*/
open class InvalidParameterException(cause: Throwable?) :
open class InvalidParameterException(cause: Throwable? = null) :
ServiceException("One or more parameters are incorrect.", "Enter correct parameters.", cause)
Loading
Loading