diff --git a/app/controllers/api/v1/profile/mfa_controller.rb b/app/controllers/api/v1/profile/mfa_controller.rb
index dd874f222..2ca018987 100644
--- a/app/controllers/api/v1/profile/mfa_controller.rb
+++ b/app/controllers/api/v1/profile/mfa_controller.rb
@@ -48,7 +48,8 @@ class Api::V1::Profile::MfaController < Api::BaseController
def validate_otp
authenticated = Mfa::AuthenticationService.new(
user: current_user,
- otp_code: mfa_params[:otp_code]
+ otp_code: mfa_params[:otp_code],
+ backup_code: mfa_params[:backup_code]
).authenticate
return if authenticated
@@ -63,6 +64,6 @@ class Api::V1::Profile::MfaController < Api::BaseController
end
def mfa_params
- params.permit(:otp_code, :password)
+ params.permit(:otp_code, :backup_code, :password)
end
end
diff --git a/app/javascript/dashboard/api/mfa.js b/app/javascript/dashboard/api/mfa.js
index c18bea3e9..38cb93810 100644
--- a/app/javascript/dashboard/api/mfa.js
+++ b/app/javascript/dashboard/api/mfa.js
@@ -14,9 +14,9 @@ class MfaAPI extends ApiClient {
return axios.post(`${this.url}/verify`, { otp_code: otpCode });
}
- disable(password, otpCode) {
+ disable(password, { otpCode, backupCode } = {}) {
return axios.delete(this.url, {
- data: { password, otp_code: otpCode },
+ data: { password, otp_code: otpCode, backup_code: backupCode },
});
}
diff --git a/app/javascript/dashboard/i18n/locale/en/mfa.json b/app/javascript/dashboard/i18n/locale/en/mfa.json
index b03917bcd..8e356aad4 100644
--- a/app/javascript/dashboard/i18n/locale/en/mfa.json
+++ b/app/javascript/dashboard/i18n/locale/en/mfa.json
@@ -51,10 +51,14 @@
},
"DISABLE": {
"TITLE": "Disable Two-Factor Authentication",
- "DESCRIPTION": "You'll need to enter your password and a verification code to disable two-factor authentication.",
+ "DESCRIPTION": "You'll need to enter your password and either a verification code from your authenticator app or a backup code to disable two-factor authentication.",
"PASSWORD": "Password",
"OTP_CODE": "Verification Code",
"OTP_CODE_PLACEHOLDER": "000000",
+ "BACKUP_CODE": "Backup Code",
+ "BACKUP_CODE_PLACEHOLDER": "Enter one of your backup codes",
+ "USE_BACKUP_CODE": "Lost access to your authenticator? Use a backup code instead",
+ "USE_OTP_CODE": "Use a verification code from your authenticator app",
"CONFIRM": "Disable 2FA",
"CANCEL": "Cancel",
"SUCCESS": "Two-factor authentication has been disabled",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/MfaManagementActions.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/MfaManagementActions.vue
index caf9e2a6a..a93286b67 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/MfaManagementActions.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/MfaManagementActions.vue
@@ -31,6 +31,8 @@ const backupCodesDialogRef = ref(null);
// Form values
const disablePassword = ref('');
const disableOtpCode = ref('');
+const disableBackupCode = ref('');
+const useBackupCodeToDisable = ref(false);
const regenerateOtpCode = ref('');
// Utility functions
@@ -54,10 +56,17 @@ const downloadBackupCodes = () => {
const handleDisableMfa = async () => {
emit('disableMfa', {
password: disablePassword.value,
- otpCode: disableOtpCode.value,
+ otpCode: useBackupCodeToDisable.value ? '' : disableOtpCode.value,
+ backupCode: useBackupCodeToDisable.value ? disableBackupCode.value : '',
});
};
+const toggleDisableMethod = () => {
+ useBackupCodeToDisable.value = !useBackupCodeToDisable.value;
+ disableOtpCode.value = '';
+ disableBackupCode.value = '';
+};
+
const handleRegenerateBackupCodes = async () => {
emit('regenerateBackupCodes', {
otpCode: regenerateOtpCode.value,
@@ -68,6 +77,8 @@ const handleRegenerateBackupCodes = async () => {
const resetDisableForm = () => {
disablePassword.value = '';
disableOtpCode.value = '';
+ disableBackupCode.value = '';
+ useBackupCodeToDisable.value = false;
disableDialogRef.value?.close();
};
@@ -157,12 +168,32 @@ defineExpose({
:label="$t('MFA_SETTINGS.DISABLE.PASSWORD')"
/>
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/MfaSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/MfaSettings.vue
index 80dce179b..bd21dfafb 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/MfaSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/MfaSettings.vue
@@ -104,9 +104,9 @@ const cancelSetup = () => {
};
// Disable MFA
-const disableMfa = async ({ password, otpCode }) => {
+const disableMfa = async ({ password, otpCode, backupCode }) => {
try {
- await mfaAPI.disable(password, otpCode);
+ await mfaAPI.disable(password, { otpCode, backupCode });
mfaEnabled.value = false;
backupCodesGenerated.value = false;
managementActionsRef.value?.resetDisableForm();