diff --git a/app/javascript/dashboard/App.vue b/app/javascript/dashboard/App.vue index 99aebfd1a..1a5eb2469 100644 --- a/app/javascript/dashboard/App.vue +++ b/app/javascript/dashboard/App.vue @@ -6,6 +6,7 @@ import UpdateBanner from './components/app/UpdateBanner.vue'; import StatusBanner from './components/app/StatusBanner.vue'; import PaymentPendingBanner from './components/app/PaymentPendingBanner.vue'; import PendingEmailVerificationBanner from './components/app/PendingEmailVerificationBanner.vue'; +import LowBackupCodesBanner from './components/app/LowBackupCodesBanner.vue'; import vueActionCable from './helper/actionCable'; import { useRouter } from 'vue-router'; import { useStore } from 'dashboard/composables/store'; @@ -32,6 +33,7 @@ export default { PaymentPendingBanner, WootSnackbarBox, PendingEmailVerificationBanner, + LowBackupCodesBanner, }, setup() { const router = useRouter(); @@ -143,6 +145,7 @@ export default { diff --git a/app/javascript/dashboard/components/app/LowBackupCodesBanner.vue b/app/javascript/dashboard/components/app/LowBackupCodesBanner.vue new file mode 100644 index 000000000..6cd38f967 --- /dev/null +++ b/app/javascript/dashboard/components/app/LowBackupCodesBanner.vue @@ -0,0 +1,121 @@ + + + + diff --git a/app/javascript/dashboard/components/ui/Banner.vue b/app/javascript/dashboard/components/ui/Banner.vue index 5e5e5a871..35009a511 100644 --- a/app/javascript/dashboard/components/ui/Banner.vue +++ b/app/javascript/dashboard/components/ui/Banner.vue @@ -108,6 +108,7 @@ export default { { mfaEnabled.value = true; backupCodesGenerated.value = true; showSetup.value = false; + emitter.emit(BUS_EVENTS.MFA_STATE_CHANGED); useAlert(t('MFA_SETTINGS.SETUP.SUCCESS')); }; @@ -110,6 +113,7 @@ const disableMfa = async ({ password, otpCode, backupCode }) => { mfaEnabled.value = false; backupCodesGenerated.value = false; managementActionsRef.value?.resetDisableForm(); + emitter.emit(BUS_EVENTS.MFA_STATE_CHANGED); useAlert(t('MFA_SETTINGS.DISABLE.SUCCESS')); } catch (error) { useAlert(t('MFA_SETTINGS.DISABLE.ERROR')); @@ -123,6 +127,7 @@ const regenerateBackupCodes = async ({ otpCode }) => { backupCodes.value = response.data.backup_codes; managementActionsRef.value?.resetRegenerateForm(); managementActionsRef.value?.showBackupCodesDialog(); + emitter.emit(BUS_EVENTS.MFA_STATE_CHANGED); useAlert(t('MFA_SETTINGS.REGENERATE.SUCCESS')); } catch (error) { useAlert(t('MFA_SETTINGS.REGENERATE.ERROR')); diff --git a/app/javascript/shared/constants/busEvents.js b/app/javascript/shared/constants/busEvents.js index ef8f24155..618302d37 100644 --- a/app/javascript/shared/constants/busEvents.js +++ b/app/javascript/shared/constants/busEvents.js @@ -13,4 +13,5 @@ export const BUS_EVENTS = { NEW_CONVERSATION_MODAL: 'newConversationModal', INSERT_INTO_RICH_EDITOR: 'insertIntoRichEditor', INSERT_INTO_NORMAL_EDITOR: 'insertIntoNormalEditor', + MFA_STATE_CHANGED: 'MFA_STATE_CHANGED', }; diff --git a/app/services/mfa/management_service.rb b/app/services/mfa/management_service.rb index d4c01ec1f..187290710 100644 --- a/app/services/mfa/management_service.rb +++ b/app/services/mfa/management_service.rb @@ -78,6 +78,10 @@ class Mfa::ManagementService user.otp_backup_codes.present? end + def remaining_backup_codes_count + Array(user.otp_backup_codes).count { |code| code != 'XXXXXXXX' } + end + def mfa_enabled? user.otp_required_for_login? end diff --git a/app/views/api/v1/profile/mfa/show.json.jbuilder b/app/views/api/v1/profile/mfa/show.json.jbuilder index 4568f48f9..d9452aeec 100644 --- a/app/views/api/v1/profile/mfa/show.json.jbuilder +++ b/app/views/api/v1/profile/mfa/show.json.jbuilder @@ -1,3 +1,6 @@ json.feature_available Chatwoot.mfa_enabled? json.enabled @user.mfa_enabled? -json.backup_codes_generated @user.mfa_service.backup_codes_generated? if Chatwoot.mfa_enabled? +if Chatwoot.mfa_enabled? + json.backup_codes_generated @user.mfa_service.backup_codes_generated? + json.remaining_backup_codes @user.mfa_service.remaining_backup_codes_count +end