Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: add OIDC auto redirect to provider setting (#1522)
Dimariqeab85cea69115
diff --git a/backend/internal/config/config.go b/backend/internal/config/config.goindex 2113c6806..46ce1bea0 100644--- a/backend/internal/config/config.go+++ b/backend/internal/config/config.go@@ -31,14 +31,15 @@ type Config struct {JWTSecret string `env:"JWT_SECRET" default:"default-jwt-secret-change-me" options:"file"`EncryptionKey string `env:"ENCRYPTION_KEY" default:"arcane-dev-key-32-characters!!!" options:"file"`- OidcEnabled bool `env:"OIDC_ENABLED" default:"false"`- OidcClientID string `env:"OIDC_CLIENT_ID" default:"" options:"file"`- OidcClientSecret string `env:"OIDC_CLIENT_SECRET" default:"" options:"file"`- OidcIssuerURL string `env:"OIDC_ISSUER_URL" default:""`- OidcScopes string `env:"OIDC_SCOPES" default:"openid email profile"`- OidcAdminClaim string `env:"OIDC_ADMIN_CLAIM" default:""`- OidcAdminValue string `env:"OIDC_ADMIN_VALUE" default:""`- OidcSkipTlsVerify bool `env:"OIDC_SKIP_TLS_VERIFY" default:"false"`+ OidcEnabled bool `env:"OIDC_ENABLED" default:"false"`+ OidcClientID string `env:"OIDC_CLIENT_ID" default:"" options:"file"`+ OidcClientSecret string `env:"OIDC_CLIENT_SECRET" default:"" options:"file"`+ OidcIssuerURL string `env:"OIDC_ISSUER_URL" default:""`+ OidcScopes string `env:"OIDC_SCOPES" default:"openid email profile"`+ OidcAdminClaim string `env:"OIDC_ADMIN_CLAIM" default:""`+ OidcAdminValue string `env:"OIDC_ADMIN_VALUE" default:""`+ OidcSkipTlsVerify bool `env:"OIDC_SKIP_TLS_VERIFY" default:"false"`+ OidcAutoRedirectToProvider bool `env:"OIDC_AUTO_REDIRECT_TO_PROVIDER" default:"false"`DockerHost string `env:"DOCKER_HOST" default:"unix:///var/run/docker.sock"`ProjectsDirectory string `env:"PROJECTS_DIRECTORY" default:"/app/data/projects"`diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.goindex a244d00d8..69c6bc548 100644--- a/backend/internal/models/settings.go+++ b/backend/internal/models/settings.go@@ -89,6 +89,7 @@ type Settings struct {OidcAdminClaim SettingVariable `key:"oidcAdminClaim,public,envOverride" meta:"label=OIDC Admin Claim;type=text;keywords=oidc,admin,claim,role,group;category=security;description=Claim name for admin role mapping"`OidcAdminValue SettingVariable `key:"oidcAdminValue,public,envOverride" meta:"label=OIDC Admin Value;type=text;keywords=oidc,admin,value,role,group;category=security;description=Claim value that grants admin access"`OidcSkipTlsVerify SettingVariable `key:"oidcSkipTlsVerify,public,envOverride" meta:"label=OIDC Skip TLS Verify;type=boolean;keywords=oidc,tls,verify,skip,insecure;category=security;description=Skip TLS verification for OIDC provider"`+ OidcAutoRedirectToProvider SettingVariable `key:"oidcAutoRedirectToProvider,public,envOverride" meta:"label=OIDC Auto Redirect;type=boolean;keywords=oidc,auto,redirect,automatic,login,provider,sso;category=security;description=Automatically redirect to OIDC provider on login page"`OidcMergeAccounts SettingVariable `key:"oidcMergeAccounts,public,envOverride" meta:"label=OIDC Account Merging;type=boolean;keywords=oidc,merge,link,accounts,email,match,existing,users,combine;category=security;description=Allow OIDC logins to merge with existing accounts by email"`// Appearance categorydiff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.goindex 5171ae2fe..527a79071 100644--- a/backend/internal/services/settings_service.go+++ b/backend/internal/services/settings_service.go@@ -120,6 +120,7 @@ func (s *SettingsService) getDefaultSettings() *models.Settings {OidcAdminClaim: models.SettingVariable{Value: ""},OidcAdminValue: models.SettingVariable{Value: ""},OidcSkipTlsVerify: models.SettingVariable{Value: "false"},+ OidcAutoRedirectToProvider: models.SettingVariable{Value: "false"},OidcMergeAccounts: models.SettingVariable{Value: "false"},MobileNavigationMode: models.SettingVariable{Value: "floating"},MobileNavigationShowLabels: models.SettingVariable{Value: "true"},diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 8d30b9ba8..c0b6c09d1 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -1439,6 +1439,8 @@"oidc_admin_value_help": "Leave empty for boolean claims (admin=true).","oidc_skip_tls_verify_label": "Skip TLS Verification","oidc_skip_tls_verify_description": "Disable TLS certificate verification for OIDC endpoints. Proceed with CAUTION.",+ "oidc_auto_redirect_label": "Auto Redirect to Provider",+ "oidc_auto_redirect_description": "Automatically redirect to OIDC provider on login page when enabled.","oidc_redirect_uri_title": "Redirect URI Configuration","oidc_redirect_uri_description": "Configure this redirect URI in your OIDC provider:","_comment_prune": "=== PRUNE ===",diff --git a/frontend/src/lib/types/settings.type.ts b/frontend/src/lib/types/settings.type.tsindex a6159ea2a..71ef3555f 100644--- a/frontend/src/lib/types/settings.type.ts+++ b/frontend/src/lib/types/settings.type.ts@@ -36,6 +36,7 @@ export type Settings = {oidcAdminClaim: string;oidcAdminValue: string;oidcSkipTlsVerify: boolean;+ oidcAutoRedirectToProvider: boolean;oidcMergeAccounts: boolean;mobileNavigationMode: 'floating' | 'docked';diff --git a/frontend/src/routes/(app)/settings/security/+page.svelte b/frontend/src/routes/(app)/settings/security/+page.svelteindex 617b88294..fe8def6fd 100644--- a/frontend/src/routes/(app)/settings/security/+page.svelte+++ b/frontend/src/routes/(app)/settings/security/+page.svelte@@ -35,6 +35,7 @@oidcEnabled: z.boolean(),oidcMergeAccounts: z.boolean(),oidcSkipTlsVerify: z.boolean(),+ oidcAutoRedirectToProvider: z.boolean(),oidcClientId: z.string(),oidcClientSecret: z.string(),oidcIssuerUrl: z.string(),@@ -62,6 +63,7 @@oidcEnabled: currentSettings.oidcEnabled,oidcMergeAccounts: currentSettings.oidcMergeAccounts,oidcSkipTlsVerify: currentSettings.oidcSkipTlsVerify,+ oidcAutoRedirectToProvider: currentSettings.oidcAutoRedirectToProvider,oidcClientId: currentSettings.oidcClientId,oidcClientSecret: '',oidcIssuerUrl: currentSettings.oidcIssuerUrl,@@ -82,6 +84,7 @@oidcEnabled: ($settingsStore || data.settings!).oidcEnabled,oidcMergeAccounts: ($settingsStore || data.settings!).oidcMergeAccounts,oidcSkipTlsVerify: ($settingsStore || data.settings!).oidcSkipTlsVerify,+ oidcAutoRedirectToProvider: ($settingsStore || data.settings!).oidcAutoRedirectToProvider,oidcClientId: ($settingsStore || data.settings!).oidcClientId,oidcClientSecret: '',oidcIssuerUrl: ($settingsStore || data.settings!).oidcIssuerUrl,@@ -101,6 +104,7 @@$formInputs.oidcEnabled.value !== currentSettings.oidcEnabled ||$formInputs.oidcMergeAccounts.value !== currentSettings.oidcMergeAccounts ||$formInputs.oidcSkipTlsVerify.value !== currentSettings.oidcSkipTlsVerify ||+ $formInputs.oidcAutoRedirectToProvider.value !== currentSettings.oidcAutoRedirectToProvider ||$formInputs.oidcClientId.value !== currentSettings.oidcClientId ||$formInputs.oidcIssuerUrl.value !== currentSettings.oidcIssuerUrl ||$formInputs.oidcScopes.value !== currentSettings.oidcScopes ||@@ -403,6 +407,24 @@</div></div>+ <div class="border-t pt-4">+ <div class="flex items-center gap-2">+ <Switch+ id="oidcAutoRedirectSwitch"+ disabled={isOidcEnvForced}+ bind:checked={$formInputs.oidcAutoRedirectToProvider.value}+ />+ <div class="grid gap-1.5 leading-none">+ <Label for="oidcAutoRedirectSwitch" class="font-normal">+ {m.oidc_auto_redirect_label()}+ </Label>+ <p class="text-muted-foreground text-xs">+ {m.oidc_auto_redirect_description()}+ </p>+ </div>+ </div>+ </div>+<div class="bg-muted/30 rounded-lg border p-4"><div class="mb-2 flex items-center gap-2"><InfoIcon class="size-4 text-blue-600" />diff --git a/frontend/src/routes/(auth)/login/+page.svelte b/frontend/src/routes/(auth)/login/+page.svelteindex d86c1fe7e..c4452d033 100644--- a/frontend/src/routes/(auth)/login/+page.svelte+++ b/frontend/src/routes/(auth)/login/+page.svelte@@ -12,6 +12,7 @@import { getApplicationLogo } from '$lib/utils/image.util';import { Motion } from 'svelte-motion';import { ArcaneButton } from '$lib/components/arcane-button/index.js';+ import { onMount } from 'svelte';let { data }: { data: PageData } = $props();@@ -31,6 +32,14 @@const localAuthEnabledBySettings = $derived(data.settings?.authLocalEnabled !== false);const showLocalLoginForm = $derived(localAuthEnabledBySettings);+ const oidcAutoRedirect = $derived(data.settings?.oidcAutoRedirectToProvider === true);++ onMount(() => {+ if (oidcAutoRedirect && oidcEnabledBySettings && !data.error) {+ handleOidcLogin();+ }+ });+async function handleOidcLogin() {isLoading.oidc = true;const currentRedirect = data.redirectTo || '/dashboard';diff --git a/types/settings/settings.go b/types/settings/settings.goindex ae904a991..ea4e12112 100644--- a/types/settings/settings.go+++ b/types/settings/settings.go@@ -207,6 +207,11 @@ type Update struct {// Required: falseOidcSkipTlsVerify *string `json:"oidcSkipTlsVerify,omitempty"`+ // OidcAutoRedirectToProvider indicates if the login page should automatically redirect to OIDC provider.+ //+ // Required: false+ OidcAutoRedirectToProvider *string `json:"oidcAutoRedirectToProvider,omitempty"`+// MobileNavigationMode is the navigation mode for mobile devices.//// Required: false