diff --git a/api/server/routes/auth.cross-site.test.js b/api/server/routes/auth.cross-site.test.js index 0ed216b372..8cf0ee6c16 100644 --- a/api/server/routes/auth.cross-site.test.js +++ b/api/server/routes/auth.cross-site.test.js @@ -76,7 +76,7 @@ jest.mock('~/server/middleware', () => { setTwoFactorTempUser: (...args) => mockSetTwoFactorTempUser(...args), twoFactorTempLimiter: pass, checkBan: pass, - validateEmailLogin: pass, + validateEmailLogin: jest.requireActual('~/server/middleware/validateEmailLogin'), requireLocalAuth: (...args) => mockRequireLocalAuth(...args), requireLdapAuth: (...args) => mockRequireLocalAuth(...args), registerLimiter: pass, @@ -213,4 +213,40 @@ describe('local login endpoints reject cross-site submissions', () => { expect(mockLoginController).toHaveBeenCalledTimes(1); }); + + describe('with email login disabled', () => { + beforeEach(() => { + process.env.ALLOW_EMAIL_LOGIN = 'false'; + }); + + afterEach(() => { + delete process.env.ALLOW_EMAIL_LOGIN; + }); + + it('still rejects the password login', async () => { + await request(app) + .post('/api/auth/login') + .send({ email: 'user@example.com', password: 'password' }) + .expect(403); + + expect(mockLoginController).not.toHaveBeenCalled(); + }); + + it('keeps passkey sign-in reachable', async () => { + const { + authenticatePasskey, + loginPasskeyOptions, + } = require('~/server/controllers/auth/PasskeyController'); + + await request(app).post('/api/auth/passkey/login/options').expect(204); + await request(app) + .post('/api/auth/passkey/login/verify') + .send({ sessionId: 'session', credential: { id: 'credential' } }) + .expect(204); + + expect(loginPasskeyOptions).toHaveBeenCalledTimes(1); + expect(authenticatePasskey).toHaveBeenCalledTimes(1); + expect(mockLoginController).toHaveBeenCalledTimes(1); + }); + }); }); diff --git a/api/server/routes/auth.js b/api/server/routes/auth.js index 74a220b606..55de3f365d 100644 --- a/api/server/routes/auth.js +++ b/api/server/routes/auth.js @@ -116,7 +116,6 @@ router.post( '/passkey/login/options', middleware.logHeaders, middleware.passkeyLimiter, - middleware.validateEmailLogin, middleware.checkBan, loginPasskeyOptions, ); @@ -125,7 +124,6 @@ router.post( middleware.logHeaders, middleware.requireSameOrigin, middleware.passkeyLimiter, - middleware.validateEmailLogin, middleware.checkBan, authenticatePasskey, setBalanceConfig, diff --git a/client/src/components/Auth/SocialLoginRender.tsx b/client/src/components/Auth/SocialLoginRender.tsx index 24630afd6f..495192fd91 100644 --- a/client/src/components/Auth/SocialLoginRender.tsx +++ b/client/src/components/Auth/SocialLoginRender.tsx @@ -119,11 +119,7 @@ function SocialLoginRender({ ), }; - /** The passkey sign-in routes sit behind the email-login gate; management does not. */ - const passkeyEnabled = - showPasskey && - startupConfig.passkeyLoginEnabled === true && - startupConfig.emailLoginEnabled !== false; + const passkeyEnabled = showPasskey && startupConfig.passkeyLoginEnabled === true; const socialEnabled = startupConfig.socialLoginEnabled === true && (startupConfig.socialLogins?.length ?? 0) > 0; diff --git a/e2e/specs/mock/scenarios/passkeys.spec.ts b/e2e/specs/mock/scenarios/passkeys.spec.ts index 304affc772..134874ad3f 100644 --- a/e2e/specs/mock/scenarios/passkeys.spec.ts +++ b/e2e/specs/mock/scenarios/passkeys.spec.ts @@ -318,7 +318,7 @@ test.describe('passkeys', () => { await expect(page.getByRole('button', { name: 'Sign in with a passkey' })).toHaveCount(0); }); - test('with email login off, passkey sign-in is hidden but management stays @scenario:passkey-management-stays-when-email-login-off', async ({ + test('with email login off, passkey sign-in and management both stay @scenario:passkey-management-stays-when-email-login-off', async ({ browser, playwright, baseURL, @@ -340,7 +340,7 @@ test.describe('passkeys', () => { await expect(passkeysDialog.getByText('Office key', { exact: true })).toBeVisible(); await logOut(page); - await expect(page.getByRole('button', { name: 'Sign in with a passkey' })).toHaveCount(0); + await expect(page.getByRole('button', { name: 'Sign in with a passkey' })).toBeVisible(); }); test('a passkey sign-in on a 2FA account asks for the second factor @scenario:passkey-sign-in-hands-off-to-2fa', async ({