feat(auth): let admins keep the login page on OIDC-only instances (#2925)

A new app setting oidc_auto_redirect (default on) is part of the admin form
and the public app config. Off, an instance without password login no longer
sends visitors straight to the IdP: the login page shows its SSO button,
also while the cached config is read. Admin toggle on desktop and phone.
This commit is contained in:
Maurice
2026-11-13 09:35:18 +01:00
parent d5d9428cf2
commit 924b4e0787
45 changed files with 227 additions and 8 deletions
@@ -1,4 +1,4 @@
// FE-ADMSET-001 to FE-ADMSET-043
// FE-ADMSET-001 to FE-ADMSET-044
import { http, HttpResponse } from 'msw';
import React from 'react';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
@@ -143,6 +143,7 @@ describe('AdminSettingsTab', () => {
expect(screen.queryByText('SSO Login')).not.toBeInTheDocument();
expect(screen.queryByText('SSO Auto-Provisioning')).not.toBeInTheDocument();
expect(screen.queryByText('Go straight to SSO')).not.toBeInTheDocument();
});
it('FE-ADMSET-008: SSO login toggle sends the inverted value', () => {
@@ -167,6 +168,14 @@ describe('AdminSettingsTab', () => {
expect(admin.handleToggleAuthSetting).toHaveBeenCalledWith('oidc_registration', true, admin.setOidcRegistration);
});
it('FE-ADMSET-044: the SSO auto redirect toggle sends the inverted value (#2925)', () => {
const admin = renderTab({ oidcConfigured: true, oidcAutoRedirect: true });
fireEvent.click(toggleFor('Go straight to SSO'));
expect(admin.handleToggleAuthSetting).toHaveBeenCalledWith('oidc_auto_redirect', false, admin.setOidcAutoRedirect);
});
it('FE-ADMSET-011: passkey toggle sends the inverted value', () => {
const admin = renderTab({ passkeyLogin: false });
+15 -1
View File
@@ -121,7 +121,7 @@ export default function AdminSettingsTab({ admin, t }: AdminSettingsTabProps): R
placeShadowEnabled,
oidcConfig, setOidcConfig, savingOidc,
passwordLogin, setPasswordLogin, passwordRegistration, setPasswordRegistration,
oidcLogin, setOidcLogin, oidcRegistration, setOidcRegistration,
oidcLogin, setOidcLogin, oidcRegistration, setOidcRegistration, oidcAutoRedirect, setOidcAutoRedirect,
envOverrideOidcOnly, oidcConfigured, requireMfa,
passkeyLogin, setPasskeyLogin, passkeyConfigured,
webauthnRpId, setWebauthnRpId, webauthnOrigins, setWebauthnOrigins, savingWebauthn, handleSaveWebauthn,
@@ -235,6 +235,20 @@ export default function AdminSettingsTab({ admin, t }: AdminSettingsTabProps): R
}
/>
)}
{/* Whether an instance without password login skips its own login page (#2925) */}
{oidcConfigured && (
<SettingRow
label={t('admin.oidcAutoRedirect')}
hint={t('admin.oidcAutoRedirectHint')}
control={
<ToggleSwitch
on={oidcAutoRedirect}
label={t('admin.oidcAutoRedirect')}
onToggle={() => handleToggleAuthSetting('oidc_auto_redirect', !oidcAutoRedirect, setOidcAutoRedirect)}
/>
}
/>
)}
</SettingRows>
</SettingsCard>
+2
View File
@@ -100,6 +100,7 @@ describe('useAdmin', () => {
password_registration: false,
oidc_login: false,
oidc_registration: false,
oidc_auto_redirect: false,
env_override_oidc_only: true,
oidc_configured: true,
require_mfa: 1,
@@ -116,6 +117,7 @@ describe('useAdmin', () => {
expect(result.current.passwordRegistration).toBe(false);
expect(result.current.oidcLogin).toBe(false);
expect(result.current.oidcRegistration).toBe(false);
expect(result.current.oidcAutoRedirect).toBe(false);
expect(result.current.envOverrideOidcOnly).toBe(true);
expect(result.current.oidcConfigured).toBe(true);
expect(result.current.requireMfa).toBe(true);
+3 -1
View File
@@ -145,6 +145,7 @@ export function useAdmin() {
const [passwordRegistration, setPasswordRegistration] = useState<boolean>(true)
const [oidcLogin, setOidcLogin] = useState<boolean>(true)
const [oidcRegistration, setOidcRegistration] = useState<boolean>(true)
const [oidcAutoRedirect, setOidcAutoRedirect] = useState<boolean>(true)
const [envOverrideOidcOnly, setEnvOverrideOidcOnly] = useState<boolean>(false)
const [oidcConfigured, setOidcConfigured] = useState<boolean>(false)
const [requireMfa, setRequireMfa] = useState<boolean>(false)
@@ -286,6 +287,7 @@ export function useAdmin() {
setPasswordRegistration(config.password_registration ?? config.allow_registration ?? true)
setOidcLogin(config.oidc_login ?? true)
setOidcRegistration(config.oidc_registration ?? config.allow_registration ?? true)
setOidcAutoRedirect(config.oidc_auto_redirect ?? true)
setEnvOverrideOidcOnly(config.env_override_oidc_only ?? false)
setOidcConfigured(config.oidc_configured ?? false)
if (config.require_mfa !== undefined) setRequireMfa(!!config.require_mfa)
@@ -600,7 +602,7 @@ export function useAdmin() {
collabFeatures, setCollabFeatures,
oidcConfig, setOidcConfig, savingOidc, setSavingOidc,
passwordLogin, setPasswordLogin, passwordRegistration, setPasswordRegistration,
oidcLogin, setOidcLogin, oidcRegistration, setOidcRegistration,
oidcLogin, setOidcLogin, oidcRegistration, setOidcRegistration, oidcAutoRedirect, setOidcAutoRedirect,
envOverrideOidcOnly, setEnvOverrideOidcOnly, oidcConfigured, setOidcConfigured,
requireMfa, setRequireMfa,
passkeyLogin, setPasskeyLogin, passkeyConfigured,