admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-18 10:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): Only prompt for MFA code when email is updated (#15065)

Browse Source
This commit is contained in:
Ricardo Espinoza
2025-05-05 07:59:18 -04:00
committed by GitHub
parent 1d4f63985b
commit aa4607e7b5
2 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
cypress/e2e/27-two-factor-authentication.cy.ts
View File

@@ -4,6 +4,7 @@ import { MainSidebar } from './../pages/sidebar/main-sidebar';
import { INSTANCE_OWNER, INSTANCE_ADMIN, BACKEND_BASE_URL } from '../constants'; import { INSTANCE_OWNER, INSTANCE_ADMIN, BACKEND_BASE_URL } from '../constants';
import { SigninPage } from '../pages'; import { SigninPage } from '../pages';
import { MfaLoginPage } from '../pages/mfa-login'; import { MfaLoginPage } from '../pages/mfa-login';
import { successToast } from '../pages/notifications';
import { PersonalSettingsPage } from '../pages/settings-personal'; import { PersonalSettingsPage } from '../pages/settings-personal';
const MFA_SECRET = 'KVKFKRCPNZQUYMLXOVYDSQKJKZDTSRLD'; const MFA_SECRET = 'KVKFKRCPNZQUYMLXOVYDSQKJKZDTSRLD';
@@ -81,6 +82,38 @@ describe('Two-factor authentication', { disableAutoLogin: true }, () => {
mainSidebar.actions.signout(); mainSidebar.actions.signout();
}); });
it('Should prompt for MFA code when email changes', () => {
const { email, password } = user;
signinPage.actions.loginWithEmailAndPassword(email, password);
personalSettingsPage.actions.enableMfa();
personalSettingsPage.actions.updateEmail('newemail@test.com');
const mfaCode = generateOTPToken(user.mfaSecret);
personalSettingsPage.getters.mfaCodeOrMfaRecoveryCodeInput().type(mfaCode);
personalSettingsPage.getters.mfaSaveButton().click();
successToast().should('exist');
mainSidebar.actions.signout();
});
it('Should prompt for MFA recovery code when email changes', () => {
const { email, password } = user;
signinPage.actions.loginWithEmailAndPassword(email, password);
personalSettingsPage.actions.enableMfa();
personalSettingsPage.actions.updateEmail('newemail@test.com');
personalSettingsPage.getters.mfaCodeOrMfaRecoveryCodeInput().type(RECOVERY_CODE);
personalSettingsPage.getters.mfaSaveButton().click();
successToast().should('exist');
mainSidebar.actions.signout();
});
it('Should not prompt for MFA code or recovery code when first name or last name changes', () => {
const { email, password } = user;
signinPage.actions.loginWithEmailAndPassword(email, password);
personalSettingsPage.actions.enableMfa();
personalSettingsPage.actions.updateFirstAndLastName('newFirstName', 'newLastName');
successToast().should('exist');
mainSidebar.actions.signout();
});
it('Should be able to disable MFA in account with recovery code', () => { it('Should be able to disable MFA in account with recovery code', () => {
const { email, password } = user; const { email, password } = user;
signinPage.actions.loginWithEmailAndPassword(email, password); signinPage.actions.loginWithEmailAndPassword(email, password);

9
packages/frontend/editor-ui/src/views/SettingsPersonalView.vue
View File

@@ -151,11 +151,9 @@ async function saveUserSettings(params: UserBasicDetailsWithMfa) {
} }
async function onSubmit(form: UserBasicDetailsForm) { async function onSubmit(form: UserBasicDetailsForm) {
if (!usersStore.currentUser?.mfaEnabled) { const emailChanged = usersStore.currentUser?.email !== form.email;
await saveUserSettings(form);
return;
}
if (usersStore.currentUser?.mfaEnabled && emailChanged) {
uiStore.openModal(PROMPT_MFA_CODE_MODAL_KEY); uiStore.openModal(PROMPT_MFA_CODE_MODAL_KEY);
promptMfaCodeBus.once('closed', async (payload: MfaModalEvents['closed']) => { promptMfaCodeBus.once('closed', async (payload: MfaModalEvents['closed']) => {
@@ -169,6 +167,9 @@ async function onSubmit(form: UserBasicDetailsForm) {
mfaCode: payload.mfaCode, mfaCode: payload.mfaCode,
}); });
}); });
} else {
await saveUserSettings(form);
}
} }
async function updateUserBasicInfo(userBasicInfo: UserBasicDetailsWithMfa) { async function updateUserBasicInfo(userBasicInfo: UserBasicDetailsWithMfa) {