Skip to content

Native auth: add new SDK error when auth method is blocked, Fixes AB#3313635 #2384

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 2 commits into from
Sep 26, 2025
Merged

Native auth: add new SDK error when auth method is blocked, Fixes AB#3313635 #2384

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f89d125
handle new controller response auth method blocked and add new results
nilo-ms Sep 25, 2025
6591512
point to common dev
nilo-ms Sep 26, 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
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 6 files
+26 −4 common/src/main/java/com/microsoft/identity/common/nativeauth/internal/controllers/NativeAuthMsalController.kt
+34 −1 common/src/test/java/com/microsoft/identity/common/nativeauth/internal/controllers/NativeAuthControllerTest.kt
+11 −0 common4j/src/main/com/microsoft/identity/common/java/nativeauth/controllers/results/MFACommandResult.kt
+20 −7 ...main/com/microsoft/identity/common/java/nativeauth/providers/responses/signin/SignInChallengeApiResponse.kt
+17 −0 ...c/main/com/microsoft/identity/common/java/nativeauth/providers/responses/signin/SignInChallengeApiResult.kt
+2 −1 common4j/src/testFixtures/java/com/microsoft/identity/common/nativeauth/MockApiResponseType.kt
6 changes: 6 additions & 0 deletions msal/src/main/java/com/microsoft/identity/nativeauth/statemachine/errors/Error.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ internal class ErrorTypes {
*/
const val VERIFICATION_CONTACT_BLOCKED = "verification_contact_blocked"

/*
* The AUTH_METHOD_BLOCKED value indicates that the server blocked the strong authentication method.
* Try contacting customer support to seek assistance.
*/
const val AUTH_METHOD_BLOCKED = "auth_method_blocked"

/*
* The INVALID_STATE value indicates a misconfigured or expired state, or an internal error
* in state transitions. If this occurs, the flow should be restarted.
Expand Down
3 changes: 3 additions & 0 deletions msal/src/main/java/com/microsoft/identity/nativeauth/statemachine/errors/MFAErrors.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ class MFARequestChallengeError(
val subError: String? = null,
override var exception: Exception? = null
): MFARequiredResult, BrowserRequiredError, Error(errorType = errorType, error = error, errorMessage= errorMessage, correlationId = correlationId, errorCodes = errorCodes, exception = exception)
{
fun isAuthMethodBlocked(): Boolean = this.errorType == ErrorTypes.AUTH_METHOD_BLOCKED
}

/**
* MFA submit challenge error. The user should use the utility methods of this class
Expand Down
20 changes: 18 additions & 2 deletions msal/src/main/java/com/microsoft/identity/nativeauth/statemachine/states/MFAStates.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class AwaitingMFAState(
}

/**
* Requests a challenge to be sent to the user's default authentication method; Kotlin coroutines variant.
* Requests a challenge to be sent to the authentication method; Kotlin coroutines variant.
*
* <strong><u>Warning: this API is experimental. It may be changed in the future without notice. Do not use in production applications.</u></strong>
* @return The result of the request challenge action.
Expand Down Expand Up @@ -165,6 +165,14 @@ class AwaitingMFAState(
correlationId = result.correlationId
)
}
is MFACommandResult.BlockedAuthMethod -> {
MFARequestChallengeError(
errorType = ErrorTypes.AUTH_METHOD_BLOCKED,
error = result.error,
errorMessage = result.errorDescription,
correlationId = result.correlationId
)
}
}
} catch (e: Exception) {
MFARequestChallengeError(
Expand Down Expand Up @@ -245,7 +253,7 @@ class MFARequiredState(
}

/**
* Requests a challenge to be sent to the user's default authentication method; Kotlin coroutines variant.
* Requests a challenge to be sent to authentication method; Kotlin coroutines variant.
*
* <strong><u>Warning: this API is experimental. It may be changed in the future without notice. Do not use in production applications.</u></strong>
* @param authMethod [com.microsoft.identity.nativeauth.AuthMethod] the authentication method used for the challenge operation.
Expand Down Expand Up @@ -318,6 +326,14 @@ class MFARequiredState(
correlationId = result.correlationId
)
}
is MFACommandResult.BlockedAuthMethod -> {
MFARequestChallengeError(
errorType = ErrorTypes.AUTH_METHOD_BLOCKED,
error = result.error,
errorMessage = result.errorDescription,
correlationId = result.correlationId
)
}
}
} catch (e: Exception) {
MFARequestChallengeError(
Expand Down