Skip to content

Modern Docker Management, Designed for Everyone

fix: oidc settings not saving after changing other security settings (#1003)

Kyle Mendell94a74892b9da
diff --git a/backend/internal/api/settings_handler.go b/backend/internal/api/settings_handler.go
index a60f13a3a..ee78ba56e 100644
--- a/backend/internal/api/settings_handler.go
+++ b/backend/internal/api/settings_handler.go
@@ -125,9 +125,12 @@ func (h *SettingsHandler) UpdateSettings(c *gin.Context) {
}
if environmentID != "0" {
- if req.AuthLocalEnabled != nil || req.AuthOidcEnabled != nil ||
+ if req.AuthLocalEnabled != nil || req.OidcEnabled != nil ||
req.AuthSessionTimeout != nil || req.AuthPasswordPolicy != nil ||
- req.AuthOidcConfig != nil {
+ req.AuthOidcConfig != nil || req.OidcClientId != nil ||
+ req.OidcClientSecret != nil || req.OidcIssuerUrl != nil ||
+ req.OidcScopes != nil || req.OidcAdminClaim != nil ||
+ req.OidcAdminValue != nil || req.OidcMergeAccounts != nil {
c.JSON(http.StatusForbidden, gin.H{
"success": false,
"data": gin.H{"error": (&common.AuthSettingsUpdateError{}).Error()},
diff --git a/backend/internal/bootstrap/bootstrap.go b/backend/internal/bootstrap/bootstrap.go
index 2080c29b1..cd1a1bf9e 100644
--- a/backend/internal/bootstrap/bootstrap.go
+++ b/backend/internal/bootstrap/bootstrap.go
@@ -72,7 +72,8 @@ func Bootstrap(ctx context.Context) error {
func(ctx context.Context) error {
_, err := appServices.Settings.SyncOidcEnvToDatabase(ctx)
return err
- })
+ },
+ appServices.Settings.MigrateOidcConfigToFields)
scheduler, err := initializeScheduler()
if err != nil {
diff --git a/backend/internal/dto/settings_dto.go b/backend/internal/dto/settings_dto.go
index b03013248..e6886a8bd 100644
--- a/backend/internal/dto/settings_dto.go
+++ b/backend/internal/dto/settings_dto.go
@@ -12,26 +12,33 @@ type SettingDto struct {
}
type UpdateSettingsDto struct {
- ProjectsDirectory *string `json:"projectsDirectory,omitempty"`
- DiskUsagePath *string `json:"diskUsagePath,omitempty"`
- AutoUpdate *string `json:"autoUpdate,omitempty"`
- AutoUpdateInterval *string `json:"autoUpdateInterval,omitempty"`
- PollingEnabled *string `json:"pollingEnabled,omitempty"`
- PollingInterval *string `json:"pollingInterval,omitempty"`
- EnvironmentHealthInterval *string `json:"environmentHealthInterval,omitempty"`
- PruneMode *string `json:"dockerPruneMode,omitempty" binding:"omitempty,oneof=all dangling"`
- MaxImageUploadSize *string `json:"maxImageUploadSize,omitempty"`
- BaseServerURL *string `json:"baseServerUrl,omitempty"`
- EnableGravatar *string `json:"enableGravatar,omitempty"`
- DefaultShell *string `json:"defaultShell,omitempty"`
- DockerHost *string `json:"dockerHost,omitempty"`
- AccentColor *string `json:"accentColor,omitempty"`
- AuthLocalEnabled *string `json:"authLocalEnabled,omitempty"`
- AuthOidcEnabled *string `json:"authOidcEnabled,omitempty"`
- AuthOidcMergeAccounts *string `json:"authOidcMergeAccounts,omitempty"`
- AuthSessionTimeout *string `json:"authSessionTimeout,omitempty"`
- AuthPasswordPolicy *string `json:"authPasswordPolicy,omitempty"`
+ ProjectsDirectory *string `json:"projectsDirectory,omitempty"`
+ DiskUsagePath *string `json:"diskUsagePath,omitempty"`
+ AutoUpdate *string `json:"autoUpdate,omitempty"`
+ AutoUpdateInterval *string `json:"autoUpdateInterval,omitempty"`
+ PollingEnabled *string `json:"pollingEnabled,omitempty"`
+ PollingInterval *string `json:"pollingInterval,omitempty"`
+ EnvironmentHealthInterval *string `json:"environmentHealthInterval,omitempty"`
+ PruneMode *string `json:"dockerPruneMode,omitempty" binding:"omitempty,oneof=all dangling"`
+ MaxImageUploadSize *string `json:"maxImageUploadSize,omitempty"`
+ BaseServerURL *string `json:"baseServerUrl,omitempty"`
+ EnableGravatar *string `json:"enableGravatar,omitempty"`
+ DefaultShell *string `json:"defaultShell,omitempty"`
+ DockerHost *string `json:"dockerHost,omitempty"`
+ AccentColor *string `json:"accentColor,omitempty"`
+ AuthLocalEnabled *string `json:"authLocalEnabled,omitempty"`
+ OidcEnabled *string `json:"oidcEnabled,omitempty"`
+ OidcMergeAccounts *string `json:"oidcMergeAccounts,omitempty"`
+ AuthSessionTimeout *string `json:"authSessionTimeout,omitempty"`
+ AuthPasswordPolicy *string `json:"authPasswordPolicy,omitempty"`
+ // AuthOidcConfig DEPRECATED will be removed in a future release
AuthOidcConfig *string `json:"authOidcConfig,omitempty"`
+ OidcClientId *string `json:"oidcClientId,omitempty"`
+ OidcClientSecret *string `json:"oidcClientSecret,omitempty"`
+ OidcIssuerUrl *string `json:"oidcIssuerUrl,omitempty"`
+ OidcScopes *string `json:"oidcScopes,omitempty"`
+ OidcAdminClaim *string `json:"oidcAdminClaim,omitempty"`
+ OidcAdminValue *string `json:"oidcAdminValue,omitempty"`
OnboardingCompleted *string `json:"onboardingCompleted,omitempty"`
OnboardingSteps *string `json:"onboardingSteps,omitempty"`
MobileNavigationMode *string `json:"mobileNavigationMode,omitempty"`
diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.go
index 1fbbb8fec..f6238a754 100644
--- a/backend/internal/models/settings.go
+++ b/backend/internal/models/settings.go
@@ -72,12 +72,18 @@ type Settings struct {
DockerHost SettingVariable `key:"dockerHost,public,envOverride" meta:"label=Docker Host;type=text;keywords=docker,host,daemon,socket,unix,remote;category=docker;description=URI for Docker daemon"`
// Security category
- AuthLocalEnabled SettingVariable `key:"authLocalEnabled,public" meta:"label=Local Authentication;type=boolean;keywords=local,auth,authentication,username,password,login,credentials;category=security;description=Enable local username/password authentication" catmeta:"id=security;title=Security;icon=shield;url=/settings/security;description=Manage authentication and security settings"`
- AuthOidcEnabled SettingVariable `key:"authOidcEnabled,public" meta:"label=OIDC Authentication;type=boolean;keywords=oidc,openid,connect,sso,oauth,external,provider,federation;category=security;description=Enable OpenID Connect (OIDC) authentication"`
- AuthOidcMergeAccounts SettingVariable `key:"authOidcMergeAccounts,public" 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"`
- AuthSessionTimeout SettingVariable `key:"authSessionTimeout" meta:"label=Session Timeout;type=number;keywords=session,timeout,expire,duration,lifetime,minutes,logout;category=security;description=How long user sessions remain active"`
- AuthPasswordPolicy SettingVariable `key:"authPasswordPolicy" meta:"label=Password Policy;type=select;keywords=password,policy,strength,complexity,requirements,security,rules;category=security;description=Set password strength requirements"`
- AuthOidcConfig SettingVariable `key:"authOidcConfig,sensitive" meta:"label=OIDC Config;type=text;keywords=oidc,config,client,id,issuer,secret,oauth;category=security;description=OIDC provider configuration"`
+ AuthLocalEnabled SettingVariable `key:"authLocalEnabled,public" meta:"label=Local Authentication;type=boolean;keywords=local,auth,authentication,username,password,login,credentials;category=security;description=Enable local username/password authentication" catmeta:"id=security;title=Security;icon=shield;url=/settings/security;description=Manage authentication and security settings"`
+ AuthSessionTimeout SettingVariable `key:"authSessionTimeout" meta:"label=Session Timeout;type=number;keywords=session,timeout,expire,duration,lifetime,minutes,logout;category=security;description=How long user sessions remain active"`
+ AuthPasswordPolicy SettingVariable `key:"authPasswordPolicy" meta:"label=Password Policy;type=select;keywords=password,policy,strength,complexity,requirements,security,rules;category=security;description=Set password strength requirements"`
+ AuthOidcConfig SettingVariable `key:"authOidcConfig,sensitive,deprecated" meta:"label=OIDC Config;type=text;keywords=oidc,config,client,id,issuer,secret,oauth;category=security;description=OIDC provider configuration (deprecated - use individual fields)"`
+ OidcEnabled SettingVariable `key:"oidcEnabled,public" meta:"label=OIDC Authentication;type=boolean;keywords=oidc,openid,connect,sso,oauth,external,provider,federation;category=security;description=Enable OpenID Connect (OIDC) authentication"`
+ OidcClientId SettingVariable `key:"oidcClientId,public" meta:"label=OIDC Client ID;type=text;keywords=oidc,client,id,oauth,openid;category=security;description=OIDC provider client ID"`
+ OidcClientSecret SettingVariable `key:"oidcClientSecret,sensitive" meta:"label=OIDC Client Secret;type=password;keywords=oidc,client,secret,oauth,openid;category=security;description=OIDC provider client secret"`
+ OidcIssuerUrl SettingVariable `key:"oidcIssuerUrl,public" meta:"label=OIDC Issuer URL;type=text;keywords=oidc,issuer,url,oauth,openid,provider;category=security;description=OIDC provider issuer URL"`
+ OidcScopes SettingVariable `key:"oidcScopes,public" meta:"label=OIDC Scopes;type=text;keywords=oidc,scopes,oauth,openid,permissions;category=security;description=OIDC scopes to request"`
+ OidcAdminClaim SettingVariable `key:"oidcAdminClaim,public" 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" meta:"label=OIDC Admin Value;type=text;keywords=oidc,admin,value,role,group;category=security;description=Claim value that grants admin access"`
+ OidcMergeAccounts SettingVariable `key:"oidcMergeAccounts,public" 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"`
// Navigation category
MobileNavigationMode SettingVariable `key:"mobileNavigationMode,public,local" meta:"label=Mobile Navigation Mode;type=select;keywords=mode,style,type,floating,docked,position,layout,design,appearance,bottom;category=navigation;description=Choose between floating or docked navigation on mobile" catmeta:"id=navigation;title=Navigation;icon=navigation;url=/settings/navigation;description=Customize navigation and interface behavior"`
diff --git a/backend/internal/services/auth_service.go b/backend/internal/services/auth_service.go
index a282a79c8..a0df78b08 100644
--- a/backend/internal/services/auth_service.go
+++ b/backend/internal/services/auth_service.go
@@ -2,7 +2,6 @@ package services
import (
"context"
- "encoding/json"
"errors"
"fmt"
"log/slog"
@@ -80,14 +79,22 @@ func (s *AuthService) getAuthSettings(ctx context.Context) (*AuthSettings, error
authSettings := &AuthSettings{
LocalAuthEnabled: settings.AuthLocalEnabled.IsTrue(),
- OidcEnabled: settings.AuthOidcEnabled.IsTrue(),
+ OidcEnabled: settings.OidcEnabled.IsTrue(),
SessionTimeout: timeoutMinutes,
}
- if authSettings.OidcEnabled && settings.AuthOidcConfig.Value != "" {
- var oidcConfig models.OidcConfig
- if err := json.Unmarshal([]byte(settings.AuthOidcConfig.Value), &oidcConfig); err == nil {
- authSettings.Oidc = &oidcConfig
+ if authSettings.OidcEnabled {
+ oidcConfig := &models.OidcConfig{
+ ClientID: settings.OidcClientId.Value,
+ ClientSecret: settings.OidcClientSecret.Value,
+ IssuerURL: settings.OidcIssuerUrl.Value,
+ Scopes: settings.OidcScopes.Value,
+ AdminClaim: settings.OidcAdminClaim.Value,
+ AdminValue: settings.OidcAdminValue.Value,
+ }
+
+ if oidcConfig.ClientID != "" || oidcConfig.IssuerURL != "" {
+ authSettings.Oidc = oidcConfig
}
}
@@ -103,7 +110,7 @@ func (s *AuthService) GetOidcConfigurationStatus(ctx context.Context) (*dto.Oidc
_ = recover()
}()
if settings, err := s.settingsService.GetSettings(ctx); err == nil {
- mergeAccounts = settings.AuthOidcMergeAccounts.IsTrue()
+ mergeAccounts = settings.OidcMergeAccounts.IsTrue()
}
}()
}
@@ -151,7 +158,7 @@ func (s *AuthService) IsOidcEnabled(ctx context.Context) (bool, error) {
if err != nil {
return false, err
}
- return settings.AuthOidcEnabled.IsTrue(), nil
+ return settings.OidcEnabled.IsTrue(), nil
}
func (s *AuthService) GetOidcConfig(ctx context.Context) (*models.OidcConfig, error) {
@@ -273,7 +280,7 @@ func (s *AuthService) findOrCreateOidcUser(ctx context.Context, userInfo dto.Oid
if user == nil {
// Check if merge accounts is enabled in settings
settings, settingsErr := s.settingsService.GetSettings(ctx)
- mergeEnabled := settingsErr == nil && settings.AuthOidcMergeAccounts.IsTrue()
+ mergeEnabled := settingsErr == nil && settings.OidcMergeAccounts.IsTrue()
// If merge accounts is enabled, try to find existing user by email
if mergeEnabled && userInfo.Email != "" {
diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.go
index 048d8fda7..6f132cc86 100644
--- a/backend/internal/services/settings_service.go
+++ b/backend/internal/services/settings_service.go
@@ -77,23 +77,30 @@ func (s *SettingsService) LoadDatabaseSettings(ctx context.Context) (err error)
func (s *SettingsService) getDefaultSettings() *models.Settings {
return &models.Settings{
- ProjectsDirectory: models.SettingVariable{Value: "data/projects"},
- DiskUsagePath: models.SettingVariable{Value: "data/projects"},
- AutoUpdate: models.SettingVariable{Value: "false"},
- AutoUpdateInterval: models.SettingVariable{Value: "1440"},
- PollingEnabled: models.SettingVariable{Value: "true"},
- PollingInterval: models.SettingVariable{Value: "60"},
- PruneMode: models.SettingVariable{Value: "dangling"},
- BaseServerURL: models.SettingVariable{Value: "http://localhost"},
- EnableGravatar: models.SettingVariable{Value: "true"},
- DefaultShell: models.SettingVariable{Value: "/bin/sh"},
- DockerHost: models.SettingVariable{Value: "unix:///var/run/docker.sock"},
- AuthLocalEnabled: models.SettingVariable{Value: "true"},
- AuthOidcEnabled: models.SettingVariable{Value: "false"},
- AuthOidcMergeAccounts: models.SettingVariable{Value: "false"},
- AuthSessionTimeout: models.SettingVariable{Value: "1440"},
- AuthPasswordPolicy: models.SettingVariable{Value: "strong"},
+ ProjectsDirectory: models.SettingVariable{Value: "data/projects"},
+ DiskUsagePath: models.SettingVariable{Value: "data/projects"},
+ AutoUpdate: models.SettingVariable{Value: "false"},
+ AutoUpdateInterval: models.SettingVariable{Value: "1440"},
+ PollingEnabled: models.SettingVariable{Value: "true"},
+ PollingInterval: models.SettingVariable{Value: "60"},
+ PruneMode: models.SettingVariable{Value: "dangling"},
+ BaseServerURL: models.SettingVariable{Value: "http://localhost"},
+ EnableGravatar: models.SettingVariable{Value: "true"},
+ DefaultShell: models.SettingVariable{Value: "/bin/sh"},
+ DockerHost: models.SettingVariable{Value: "unix:///var/run/docker.sock"},
+ AuthLocalEnabled: models.SettingVariable{Value: "true"},
+ AuthSessionTimeout: models.SettingVariable{Value: "1440"},
+ AuthPasswordPolicy: models.SettingVariable{Value: "strong"},
+ // AuthOidcConfig DEPRECATED will be removed in a future release
AuthOidcConfig: models.SettingVariable{Value: "{}"},
+ OidcEnabled: models.SettingVariable{Value: "false"},
+ OidcClientId: models.SettingVariable{Value: ""},
+ OidcClientSecret: models.SettingVariable{Value: ""},
+ OidcIssuerUrl: models.SettingVariable{Value: ""},
+ OidcScopes: models.SettingVariable{Value: "openid email profile"},
+ OidcAdminClaim: models.SettingVariable{Value: ""},
+ OidcAdminValue: models.SettingVariable{Value: ""},
+ OidcMergeAccounts: models.SettingVariable{Value: "false"},
OnboardingCompleted: models.SettingVariable{Value: "false"},
OnboardingSteps: models.SettingVariable{Value: "[]"},
MobileNavigationMode: models.SettingVariable{Value: "floating"},
@@ -266,25 +273,127 @@ func (s *SettingsService) SyncOidcEnvToDatabase(ctx context.Context) ([]models.S
return nil, errors.New("missing OIDC_CLIENT_ID or OIDC_ISSUER_URL")
}
- envOidc := models.OidcConfig{
- ClientID: cfg.OidcClientID,
- ClientSecret: cfg.OidcClientSecret,
- IssuerURL: cfg.OidcIssuerURL,
- Scopes: cfg.OidcScopes,
- AdminClaim: cfg.OidcAdminClaim,
- AdminValue: cfg.OidcAdminValue,
+ trueStr := "true"
+ scopes := cfg.OidcScopes
+ if scopes == "" {
+ scopes = "openid email profile"
}
- b, err := json.Marshal(envOidc)
+
+ return s.UpdateSettings(ctx, dto.UpdateSettingsDto{
+ OidcEnabled: &trueStr,
+ OidcClientId: &cfg.OidcClientID,
+ OidcClientSecret: &cfg.OidcClientSecret,
+ OidcIssuerUrl: &cfg.OidcIssuerURL,
+ OidcScopes: &scopes,
+ OidcAdminClaim: &cfg.OidcAdminClaim,
+ OidcAdminValue: &cfg.OidcAdminValue,
+ })
+}
+
+// MigrateOidcConfigToFields migrates the legacy JSON authOidcConfig to individual fields,
+// and renames legacy auth* keys to their new oidc* names.
+// This should be called during bootstrap to ensure existing configurations are preserved.
+func (s *SettingsService) MigrateOidcConfigToFields(ctx context.Context) error {
+ settings, err := s.GetSettings(ctx)
if err != nil {
- return nil, fmt.Errorf("marshal oidc config: %w", err)
+ return fmt.Errorf("failed to get settings for OIDC migration: %w", err)
}
- trueStr := "true"
- cfgStr := string(b)
+ // Migrate legacy key names (authOidcEnabled -> oidcEnabled, authOidcMergeAccounts -> oidcMergeAccounts)
+ if err := s.migrateOidcKeyNames(ctx); err != nil {
+ slog.WarnContext(ctx, "Failed to migrate OIDC key names", "error", err)
+ // Continue with JSON migration even if key rename fails
+ }
- return s.UpdateSettings(ctx, dto.UpdateSettingsDto{
- AuthOidcEnabled: &trueStr,
- AuthOidcConfig: &cfgStr,
+ // Check if migration is needed: if we have authOidcConfig but no oidcClientId
+ if settings.AuthOidcConfig.Value == "" || settings.AuthOidcConfig.Value == "{}" {
+ slog.DebugContext(ctx, "No OIDC config to migrate")
+ return nil
+ }
+
+ // If individual fields are already populated, skip migration
+ if settings.OidcClientId.Value != "" {
+ slog.DebugContext(ctx, "OIDC fields already populated, skipping migration")
+ return nil
+ }
+
+ var oidcConfig models.OidcConfig
+ if err := json.Unmarshal([]byte(settings.AuthOidcConfig.Value), &oidcConfig); err != nil {
+ slog.WarnContext(ctx, "Failed to parse legacy OIDC config for migration", "error", err)
+ return nil
+ }
+
+ // Only migrate if there's actual data
+ if oidcConfig.ClientID == "" && oidcConfig.IssuerURL == "" {
+ slog.DebugContext(ctx, "Legacy OIDC config is empty, skipping migration")
+ return nil
+ }
+
+ slog.InfoContext(ctx, "Migrating legacy OIDC config to individual fields")
+
+ scopes := oidcConfig.Scopes
+ if scopes == "" {
+ scopes = "openid email profile"
+ }
+
+ _, err = s.UpdateSettings(ctx, dto.UpdateSettingsDto{
+ OidcClientId: &oidcConfig.ClientID,
+ OidcClientSecret: &oidcConfig.ClientSecret,
+ OidcIssuerUrl: &oidcConfig.IssuerURL,
+ OidcScopes: &scopes,
+ OidcAdminClaim: &oidcConfig.AdminClaim,
+ OidcAdminValue: &oidcConfig.AdminValue,
+ })
+ if err != nil {
+ return fmt.Errorf("failed to migrate OIDC config: %w", err)
+ }
+
+ slog.InfoContext(ctx, "Successfully migrated OIDC config to individual fields")
+ return nil
+}
+
+// migrateOidcKeyNames renames legacy authOidc* keys to new oidc* keys in the database.
+func (s *SettingsService) migrateOidcKeyNames(ctx context.Context) error {
+ keyMappings := map[string]string{
+ "authOidcEnabled": "oidcEnabled",
+ "authOidcMergeAccounts": "oidcMergeAccounts",
+ "authOidcClientId": "oidcClientId",
+ "authOidcClientSecret": "oidcClientSecret",
+ "authOidcIssuerUrl": "oidcIssuerUrl",
+ "authOidcScopes": "oidcScopes",
+ "authOidcAdminClaim": "oidcAdminClaim",
+ "authOidcAdminValue": "oidcAdminValue",
+ }
+
+ return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+ for oldKey, newKey := range keyMappings {
+ // Check if old key exists
+ var oldSetting models.SettingVariable
+ if err := tx.Where("key = ?", oldKey).First(&oldSetting).Error; err != nil {
+ if errors.Is(err, gorm.ErrRecordNotFound) {
+ continue // Old key doesn't exist, nothing to migrate
+ }
+ return fmt.Errorf("failed to check old key %s: %w", oldKey, err)
+ }
+
+ // Check if new key already exists
+ var newSetting models.SettingVariable
+ if err := tx.Where("key = ?", newKey).First(&newSetting).Error; err == nil {
+ // New key already exists, delete the old one
+ if err := tx.Delete(&oldSetting).Error; err != nil {
+ return fmt.Errorf("failed to delete old key %s: %w", oldKey, err)
+ }
+ slog.DebugContext(ctx, "Deleted duplicate legacy key", "oldKey", oldKey, "newKey", newKey)
+ continue
+ }
+
+ // Rename: update key from old to new
+ if err := tx.Model(&oldSetting).Update("key", newKey).Error; err != nil {
+ return fmt.Errorf("failed to rename key %s to %s: %w", oldKey, newKey, err)
+ }
+ slog.InfoContext(ctx, "Migrated OIDC setting key", "oldKey", oldKey, "newKey", newKey)
+ }
+ return nil
})
}
@@ -403,37 +512,57 @@ func (s *SettingsService) persistSettings(ctx context.Context, values []models.S
}
func (s *SettingsService) handleOidcConfigUpdate(ctx context.Context, updates dto.UpdateSettingsDto) error {
- if updates.AuthOidcConfig == nil {
- return nil
- }
-
- newCfgStr := *updates.AuthOidcConfig
- var incoming models.OidcConfig
- if err := json.Unmarshal([]byte(newCfgStr), &incoming); err != nil {
- return fmt.Errorf("invalid authOidcConfig JSON: %w", err)
- }
+ // Handle legacy JSON config format (for backward compatibility during migration)
+ if updates.AuthOidcConfig != nil {
+ newCfgStr := *updates.AuthOidcConfig
+ var incoming models.OidcConfig
+ if err := json.Unmarshal([]byte(newCfgStr), &incoming); err != nil {
+ return fmt.Errorf("invalid authOidcConfig JSON: %w", err)
+ }
- current, err := s.GetSettings(ctx)
- if err != nil {
- return fmt.Errorf("failed to load current settings: %w", err)
- }
+ current, err := s.GetSettings(ctx)
+ if err != nil {
+ return fmt.Errorf("failed to load current settings: %w", err)
+ }
- if current.AuthOidcConfig.Value != "" {
- var existing models.OidcConfig
- if err := json.Unmarshal([]byte(current.AuthOidcConfig.Value), &existing); err == nil {
- if incoming.ClientSecret == "" {
- incoming.ClientSecret = existing.ClientSecret
+ if current.AuthOidcConfig.Value != "" {
+ var existing models.OidcConfig
+ if err := json.Unmarshal([]byte(current.AuthOidcConfig.Value), &existing); err == nil {
+ if incoming.ClientSecret == "" {
+ incoming.ClientSecret = existing.ClientSecret
+ }
}
}
- }
- mergedBytes, err := json.Marshal(incoming)
- if err != nil {
- return fmt.Errorf("failed to marshal merged OIDC config: %w", err)
+ mergedBytes, err := json.Marshal(incoming)
+ if err != nil {
+ return fmt.Errorf("failed to marshal merged OIDC config: %w", err)
+ }
+
+ if err := s.UpdateSetting(ctx, "authOidcConfig", string(mergedBytes)); err != nil {
+ return fmt.Errorf("failed to update authOidcConfig: %w", err)
+ }
}
- if err := s.UpdateSetting(ctx, "authOidcConfig", string(mergedBytes)); err != nil {
- return fmt.Errorf("failed to update authOidcConfig: %w", err)
+ // Handle new individual field for client secret (sensitive field)
+ if updates.OidcClientSecret != nil {
+ secret := *updates.OidcClientSecret
+
+ // If empty secret provided, preserve existing secret
+ if secret == "" {
+ current, err := s.GetSettings(ctx)
+ if err != nil {
+ return fmt.Errorf("failed to load current settings for secret: %w", err)
+ }
+ if current.OidcClientSecret.Value != "" {
+ // Keep existing secret, don't update
+ return nil
+ }
+ }
+
+ if err := s.UpdateSetting(ctx, "oidcClientSecret", secret); err != nil {
+ return fmt.Errorf("failed to update oidcClientSecret: %w", err)
+ }
}
return nil
diff --git a/backend/internal/services/settings_service_test.go b/backend/internal/services/settings_service_test.go
index f9594eb51..0f043ff00 100644
--- a/backend/internal/services/settings_service_test.go
+++ b/backend/internal/services/settings_service_test.go
@@ -138,20 +138,33 @@ func TestSettingsService_SyncOidcEnvToDatabase(t *testing.T) {
require.NotEmpty(t, vars)
var enabled models.SettingVariable
- require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "authOidcEnabled").First(&enabled).Error)
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcEnabled").First(&enabled).Error)
require.Equal(t, "true", enabled.Value)
- var cfgVar models.SettingVariable
- require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "authOidcConfig").First(&cfgVar).Error)
+ // Check individual OIDC fields (new approach)
+ var clientId models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcClientId").First(&clientId).Error)
+ require.Equal(t, "cid", clientId.Value)
+
+ var clientSecret models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcClientSecret").First(&clientSecret).Error)
+ require.Equal(t, "csec", clientSecret.Value)
+
+ var issuerUrl models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcIssuerUrl").First(&issuerUrl).Error)
+ require.Equal(t, "https://issuer.example", issuerUrl.Value)
+
+ var scopes models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcScopes").First(&scopes).Error)
+ require.Equal(t, "openid profile email", scopes.Value)
+
+ var adminClaim models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcAdminClaim").First(&adminClaim).Error)
+ require.Equal(t, "roles", adminClaim.Value)
- var oc models.OidcConfig
- require.NoError(t, json.Unmarshal([]byte(cfgVar.Value), &oc))
- require.Equal(t, "cid", oc.ClientID)
- require.Equal(t, "csec", oc.ClientSecret)
- require.Equal(t, "https://issuer.example", oc.IssuerURL)
- require.Equal(t, "openid profile email", oc.Scopes)
- require.Equal(t, "roles", oc.AdminClaim)
- require.Equal(t, "admin", oc.AdminValue)
+ var adminValue models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcAdminValue").First(&adminValue).Error)
+ require.Equal(t, "admin", adminValue.Value)
}
func TestSettingsService_UpdateSettings_MergeOidcSecret(t *testing.T) {
@@ -284,3 +297,180 @@ func TestSettingsService_LoadDatabaseSettings_InternalKeys_EnvMode(t *testing.T)
// Should have loaded the internal setting from DB even in env mode
require.Equal(t, internalVal, cfg.InstanceID.Value)
}
+
+func TestSettingsService_MigrateOidcConfigToFields(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, svc.EnsureDefaultSettings(ctx))
+
+ // Seed legacy OIDC JSON config
+ legacyConfig := models.OidcConfig{
+ ClientID: "legacy-client-id",
+ ClientSecret: "legacy-secret",
+ IssuerURL: "https://legacy-issuer.example",
+ Scopes: "openid email profile",
+ AdminClaim: "groups",
+ AdminValue: "admin",
+ }
+ b, err := json.Marshal(legacyConfig)
+ require.NoError(t, err)
+ require.NoError(t, svc.UpdateSetting(ctx, "authOidcConfig", string(b)))
+
+ // Run migration
+ err = svc.MigrateOidcConfigToFields(ctx)
+ require.NoError(t, err)
+
+ // Verify individual fields were populated
+ var clientId models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcClientId").First(&clientId).Error)
+ require.Equal(t, "legacy-client-id", clientId.Value)
+
+ var clientSecret models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcClientSecret").First(&clientSecret).Error)
+ require.Equal(t, "legacy-secret", clientSecret.Value)
+
+ var issuerUrl models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcIssuerUrl").First(&issuerUrl).Error)
+ require.Equal(t, "https://legacy-issuer.example", issuerUrl.Value)
+
+ var scopes models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcScopes").First(&scopes).Error)
+ require.Equal(t, "openid email profile", scopes.Value)
+
+ var adminClaim models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcAdminClaim").First(&adminClaim).Error)
+ require.Equal(t, "groups", adminClaim.Value)
+
+ var adminValue models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcAdminValue").First(&adminValue).Error)
+ require.Equal(t, "admin", adminValue.Value)
+}
+
+func TestSettingsService_MigrateOidcConfigToFields_SkipsIfAlreadyMigrated(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, svc.EnsureDefaultSettings(ctx))
+
+ // Pre-populate individual field
+ require.NoError(t, svc.UpdateSetting(ctx, "oidcClientId", "already-migrated"))
+
+ // Seed legacy config too
+ legacyConfig := models.OidcConfig{
+ ClientID: "old-id",
+ IssuerURL: "https://old-issuer.example",
+ }
+ b, err := json.Marshal(legacyConfig)
+ require.NoError(t, err)
+ require.NoError(t, svc.UpdateSetting(ctx, "authOidcConfig", string(b)))
+
+ // Run migration - should skip since individual field is populated
+ err = svc.MigrateOidcConfigToFields(ctx)
+ require.NoError(t, err)
+
+ // Verify field was NOT overwritten
+ var clientId models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcClientId").First(&clientId).Error)
+ require.Equal(t, "already-migrated", clientId.Value)
+}
+
+func TestSettingsService_MigrateOidcConfigToFields_RealWorldJSON(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, svc.EnsureDefaultSettings(ctx))
+
+ // Test with real-world JSON format (as stored in database)
+ realWorldJSON := `{"clientId":"ab92b6cf-283d-4764-9308-92a9b9496bf1","clientSecret":"super-secret-value","issuerUrl":"https://id.ofkm.us","scopes":"openid email profile groups","adminClaim":"groups","adminValue":"_arcane_admins"}`
+ require.NoError(t, svc.UpdateSetting(ctx, "authOidcConfig", realWorldJSON))
+
+ // Run migration
+ err = svc.MigrateOidcConfigToFields(ctx)
+ require.NoError(t, err)
+
+ // Verify all individual fields were populated correctly
+ var clientId models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcClientId").First(&clientId).Error)
+ require.Equal(t, "ab92b6cf-283d-4764-9308-92a9b9496bf1", clientId.Value)
+
+ var clientSecret models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcClientSecret").First(&clientSecret).Error)
+ require.Equal(t, "super-secret-value", clientSecret.Value)
+
+ var issuerUrl models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcIssuerUrl").First(&issuerUrl).Error)
+ require.Equal(t, "https://id.ofkm.us", issuerUrl.Value)
+
+ var scopes models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcScopes").First(&scopes).Error)
+ require.Equal(t, "openid email profile groups", scopes.Value)
+
+ var adminClaim models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcAdminClaim").First(&adminClaim).Error)
+ require.Equal(t, "groups", adminClaim.Value)
+
+ var adminValue models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcAdminValue").First(&adminValue).Error)
+ require.Equal(t, "_arcane_admins", adminValue.Value)
+}
+
+func TestSettingsService_MigrateOidcConfigToFields_EmptyConfig(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, svc.EnsureDefaultSettings(ctx))
+
+ // Empty config should not cause errors
+ require.NoError(t, svc.UpdateSetting(ctx, "authOidcConfig", "{}"))
+
+ err = svc.MigrateOidcConfigToFields(ctx)
+ require.NoError(t, err)
+
+ // Verify fields remain empty
+ var clientId models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcClientId").First(&clientId).Error)
+ require.Empty(t, clientId.Value)
+}
+
+func TestSettingsService_MigrateOidcConfigToFields_InvalidJSON(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, svc.EnsureDefaultSettings(ctx))
+
+ // Invalid JSON should not cause errors (gracefully handled)
+ require.NoError(t, svc.UpdateSetting(ctx, "authOidcConfig", "not valid json"))
+
+ err = svc.MigrateOidcConfigToFields(ctx)
+ require.NoError(t, err) // Should not return error, just skip
+
+ // Verify fields remain empty
+ var clientId models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcClientId").First(&clientId).Error)
+ require.Empty(t, clientId.Value)
+}
+
+func TestSettingsService_MigrateOidcConfigToFields_DefaultScopes(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, svc.EnsureDefaultSettings(ctx))
+
+ // Config without scopes should get default scopes
+ configWithoutScopes := `{"clientId":"test-client","issuerUrl":"https://test.example"}`
+ require.NoError(t, svc.UpdateSetting(ctx, "authOidcConfig", configWithoutScopes))
+
+ err = svc.MigrateOidcConfigToFields(ctx)
+ require.NoError(t, err)
+
+ var scopes models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcScopes").First(&scopes).Error)
+ require.Equal(t, "openid email profile", scopes.Value)
+}
diff --git a/backend/internal/utils/bootstrap_util.go b/backend/internal/utils/bootstrap_util.go
index b7dbec11a..99aea3511 100644
--- a/backend/internal/utils/bootstrap_util.go
+++ b/backend/internal/utils/bootstrap_util.go
@@ -20,8 +20,7 @@ func EnsureEncryptionKey(ctx context.Context, cfg *config.Config, ensureKeyFunc
if cfg.AgentMode || cfg.Environment != "production" {
key, err := ensureKeyFunc(ctx)
if err != nil {
- slog.WarnContext(ctx, "Failed to ensure encryption key; falling back to derived behavior",
- slog.String("error", err.Error()))
+ slog.WarnContext(ctx, "Failed to ensure encryption key; falling back to derived behavior", "error", err.Error())
return
}
cfg.EncryptionKey = key
@@ -38,21 +37,21 @@ func InitializeDefaultSettings(ctx context.Context, cfg *config.Config, settings
slog.InfoContext(ctx, "Ensuring default settings are initialized")
if err := settingsMgr.EnsureDefaultSettings(ctx); err != nil {
- slog.WarnContext(ctx, "Failed to initialize default settings", slog.String("error", err.Error()))
+ slog.WarnContext(ctx, "Failed to initialize default settings", "error", err.Error())
} else {
slog.InfoContext(ctx, "Default settings initialized successfully")
}
// Mark onboarding as completed for all installs (onboarding is replaced with first-login password change)
if err := settingsMgr.SetBoolSetting(ctx, "onboardingCompleted", true); err != nil {
- slog.WarnContext(ctx, "Failed to mark onboarding as completed", slog.String("error", err.Error()))
+ slog.WarnContext(ctx, "Failed to mark onboarding as completed", "error", err.Error())
} else {
slog.InfoContext(ctx, "Onboarding marked as completed")
}
if cfg.AgentMode || cfg.UIConfigurationDisabled {
if err := settingsMgr.PersistEnvSettingsIfMissing(ctx); err != nil {
- slog.WarnContext(ctx, "Failed to persist env-driven settings", slog.String("error", err.Error()))
+ slog.WarnContext(ctx, "Failed to persist env-driven settings", "error", err.Error())
} else {
slog.DebugContext(ctx, "Persisted env-driven settings if missing")
}
@@ -61,25 +60,29 @@ func InitializeDefaultSettings(ctx context.Context, cfg *config.Config, settings
func TestDockerConnection(ctx context.Context, testFunc func(context.Context) error) {
if err := testFunc(ctx); err != nil {
- slog.WarnContext(ctx, "Docker connection failed during init, local Docker features may be unavailable",
- slog.String("error", err.Error()))
+ slog.WarnContext(ctx, "Docker connection failed during init, local Docker features may be unavailable", "error", err.Error())
}
}
-func InitializeNonAgentFeatures(ctx context.Context, cfg *config.Config, createAdminFunc func(context.Context) error, syncOidcFunc func(context.Context) error) {
+func InitializeNonAgentFeatures(ctx context.Context, cfg *config.Config, createAdminFunc func(context.Context) error, syncOidcFunc func(context.Context) error, migrateOidcFunc func(context.Context) error) {
if cfg.AgentMode {
return
}
if err := createAdminFunc(ctx); err != nil {
- slog.WarnContext(ctx, "Failed to create default admin user",
- slog.String("error", err.Error()))
+ slog.WarnContext(ctx, "Failed to create default admin user", "error", err.Error())
+ }
+
+ // Migrate legacy OIDC JSON config to individual fields (runs before env sync)
+ if migrateOidcFunc != nil {
+ if err := migrateOidcFunc(ctx); err != nil {
+ slog.WarnContext(ctx, "Failed to migrate OIDC config to individual fields", "error", err.Error())
+ }
}
if cfg.OidcEnabled {
if err := syncOidcFunc(ctx); err != nil {
- slog.WarnContext(ctx, "Failed to sync OIDC environment variables to database",
- slog.String("error", err.Error()))
+ slog.WarnContext(ctx, "Failed to sync OIDC environment variables to database", "error", err.Error())
}
}
}
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index f2369a597..3da3dbf45 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -868,7 +868,10 @@
"security_local_auth_description": "Username and password stored by Arcane. Keep enabled as a fallback.",
"security_oidc_auth_label": "OIDC Authentication",
"security_oidc_auth_description": "Use an external OIDC provider",
- "security_oidc_auth_description_forced": "Use an external OIDC provider (forced by server)",
+ "security_server_configured": "Server Configured",
+ "security_oidc_enabled_label": "Enable OIDC Authentication",
+ "security_oidc_enabled_description": "Allow users to sign in using an OpenID Connect provider",
+ "security_oidc_client_secret_help": "Leave blank to keep the existing secret",
"security_oidc_merge_accounts_label": "Link OIDC with Existing Accounts",
"security_oidc_merge_accounts_description": "Allow OIDC logins to merge with existing local accounts by matching email addresses",
"security_oidc_merge_accounts_alert_title": "Enable Account Linking?",
@@ -885,6 +888,7 @@
"security_session_timeout_min": "Minimum is 15 minutes",
"security_session_timeout_max": "Maximum is 1440 minutes",
"security_password_policy_label": "Password Policy",
+ "security_password_policy_description": "Set password strength requirements",
"security_password_policy_basic": "Basic",
"security_password_policy_standard": "Standard",
"security_password_policy_strong": "Strong",
@@ -893,6 +897,8 @@
"security_password_policy_strong_tooltip": "12+ chars with upper, lower, number, and symbol.",
"security_enable_one_provider": "Enable at least one authentication provider.",
"security_enable_one_provider_error": "At least one authentication provider must be enabled.",
+ "security_form_validation_error": "Please check the form for errors.",
+ "security_oidc_required_fields": "Client ID and Issuer URL are required to enable OIDC.",
"security_settings_saved": "Settings saved successfully.",
"security_local_enabled_info": "Local Authentication enabled to ensure at least one provider is active.",
"security_oidc_saved": "OIDC configuration saved successfully.",
@@ -1304,15 +1310,10 @@
"image_update_auth": "Auth: {label}",
"_comment_oidc": "=== OIDC CONFIGURATION ===",
- "oidc_viewmode_description": "OIDC authentication is configured and forced ON by server-side environment variables. These settings are read-only.",
- "oidc_configure_description": "Configure the OIDC settings for your application. These settings will be saved to the database and used for OIDC authentication.",
- "oidc_server_env_config_title": "Server Environment Configuration",
- "oidc_server_env_config_description": "The following OIDC settings are loaded from the server environment:",
"oidc_client_id_label": "Client ID",
"oidc_client_id_placeholder": "Provided by your OIDC Provider",
"oidc_client_secret_label": "Client Secret",
"oidc_client_secret_placeholder": "Provided by your OIDC Provider (leave blank to keep existing)",
- "oidc_client_secret_hidden": "(Sensitive - Not Displayed)",
"oidc_issuer_url_label": "Issuer URL",
"oidc_issuer_url_placeholder": "https://id.example.com",
"oidc_issuer_url_description": "The issuer URL will be used to auto-discover OIDC endpoints.",
@@ -1325,21 +1326,8 @@
"oidc_admin_claim_placeholder": "e.g., roles, groups, realm_access.roles, admin",
"oidc_admin_value_placeholder": "e.g., admin (comma-separated)",
"oidc_admin_value_help": "Leave empty for boolean claims (admin=true).",
- "oidc_env_config_missing": "OIDC configuration details not found in effective settings.",
- "oidc_env_changes_note": "Changes to these settings must be made in your server's environment configuration.",
- "oidc_server_override_warning_title": "Server Override Warning",
"oidc_redirect_uri_title": "Redirect URI Configuration",
"oidc_redirect_uri_description": "Configure this redirect URI in your OIDC provider:",
- "oidc_status_env_forced": "Env Forced",
- "oidc_status_env_forced_hint": "Server forces OIDC",
- "oidc_status_env_configured": "Env Configured",
- "oidc_status_env_configured_hint": "Server OIDC vars present",
- "oidc_tips_title": "Tips",
- "oidc_tip_1": "If your server forces OIDC, app settings become read-only.",
- "oidc_tip_2": "Use issuer discovery; avoid hardcoding endpoints.",
- "oidc_tip_3": "Keep client secrets out of the UI when possible.",
- "oidc_basic_configuration_title": "Basic Configuration",
- "oidc_basic_description": "Essential OIDC provider settings",
"_comment_prune": "=== PRUNE ===",
"prune_confirm_system_title": "Confirm System Prune",
diff --git a/frontend/src/lib/components/dialogs/oidc-config-dialog.svelte b/frontend/src/lib/components/dialogs/oidc-config-dialog.svelte
deleted file mode 100644
index 0c012044c..000000000
--- a/frontend/src/lib/components/dialogs/oidc-config-dialog.svelte
+++ /dev/null
@@ -1,260 +0,0 @@
-<script lang="ts">
- import { ResponsiveDialog } from '$lib/components/ui/responsive-dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
- import { Input } from '$lib/components/ui/input/index.js';
- import { Label } from '$lib/components/ui/label/index.js';
- import KeyIcon from '@lucide/svelte/icons/key';
- import TriangleAlertIcon from '@lucide/svelte/icons/triangle-alert';
- import InfoIcon from '@lucide/svelte/icons/info';
- import CopyIcon from '@lucide/svelte/icons/copy';
- import { m } from '$lib/paraglide/messages';
- import type { Settings, OidcStatusInfo } from '$lib/types/settings.type';
- import { UseClipboard } from '$lib/hooks/use-clipboard.svelte';
-
- interface OidcConfig {
- clientId: string;
- clientSecret: string;
- issuerUrl: string;
- scopes: string;
- adminClaim: string;
- adminValue: string;
- }
-
- interface Props {
- open: boolean;
- currentSettings: Settings;
- oidcStatus: OidcStatusInfo;
- oidcForm: OidcConfig;
- onSave: () => void;
- }
-
- let { open = $bindable(), currentSettings, oidcStatus, oidcForm = $bindable(), onSave }: Props = $props();
-
- const DEFAULT_CONFIG: OidcConfig = {
- clientId: '',
- clientSecret: '',
- issuerUrl: '',
- scopes: 'openid email profile',
- adminClaim: '',
- adminValue: ''
- };
-
- const isViewMode = $derived(oidcStatus.envForced && oidcStatus.envConfigured);
- const isWarningMode = $derived(oidcStatus.envForced && !oidcStatus.envConfigured);
- const redirectUri = $derived(`${globalThis?.location?.origin ?? ''}/auth/oidc/callback`);
-
- const parsedConfig = $derived.by(() => {
- if (!currentSettings.authOidcConfig) return DEFAULT_CONFIG;
-
- try {
- return JSON.parse(currentSettings.authOidcConfig) as OidcConfig;
- } catch (error) {
- console.warn('Failed to parse OIDC config:', error);
- return DEFAULT_CONFIG;
- }
- });
-
- const dialogTitle = $derived(
- isViewMode
- ? m.security_oidc_configured_forced_view()
- : isWarningMode
- ? m.security_server_forces_oidc_missing_env()
- : m.security_manage_oidc_config()
- );
-
- const dialogDescription = $derived(
- isViewMode
- ? m.oidc_viewmode_description()
- : isWarningMode
- ? m.security_server_forces_oidc_missing_env()
- : m.oidc_configure_description()
- );
-
- const clipboard = new UseClipboard();
-
- function handleCopy(text?: string) {
- if (!text) return;
- clipboard.copy(text);
- }
-
- function handleClose() {
- open = false;
- }
-</script>
-
-<ResponsiveDialog bind:open title={dialogTitle} description={dialogDescription} contentClass="sm:max-w-[860px]">
- {#snippet children()}
- <div class="space-y-6">
- {#if isViewMode}
- {@render viewModeContent()}
- {:else}
- {@render editModeContent()}
- {/if}
-
- {#if isWarningMode}
- {@render warningBanner()}
- {/if}
-
- {@render redirectUriSection()}
- </div>
- {/snippet}
-
- {#snippet footer()}
- <Button variant="outline" onclick={handleClose} class="flex-1 sm:flex-none">
- {m.common_close()}
- </Button>
- {#if !isViewMode}
- <Button onclick={onSave} class="flex-1 sm:flex-none">
- <KeyIcon class="mr-2 size-4" />
- {m.common_save()}
- </Button>
- {/if}
- {/snippet}
-</ResponsiveDialog>
-
-{#snippet viewModeContent()}
- <div class="bg-card/90 rounded-lg border p-4 backdrop-blur-sm">
- <h3 class="text-base font-semibold">{m.oidc_server_env_config_title()}</h3>
- <p class="text-muted-foreground mt-1 mb-4 text-sm">{m.oidc_server_env_config_description()}</p>
-
- {#if currentSettings.authOidcEnabled}
- <div class="divide-border/60 divide-y text-sm">
- {@render configRow(m.oidc_client_id_label(), parsedConfig.clientId)}
- {@render configRow(m.oidc_issuer_url_label(), parsedConfig.issuerUrl)}
- <div class="flex items-center justify-between py-2">
- <span class="font-medium">{m.oidc_client_secret_label()}</span>
- <span class="text-muted-foreground text-xs italic">{m.oidc_client_secret_hidden()}</span>
- </div>
- {@render configRow(m.oidc_scopes_label(), parsedConfig.scopes || m.oidc_scopes_placeholder())}
- {@render configRow(m.oidc_admin_claim_label(), parsedConfig.adminClaim)}
- {@render configRow(m.oidc_admin_value_label(), parsedConfig.adminValue)}
- </div>
- {:else}
- <div class="py-6 text-center">
- <TriangleAlertIcon class="text-destructive mx-auto mb-2 size-8" />
- <p class="text-destructive text-sm font-medium">{m.oidc_env_config_missing()}</p>
- </div>
- {/if}
-
- <div class="bg-muted/40 mt-4 rounded-md p-3">
- <p class="text-muted-foreground text-xs">{m.oidc_env_changes_note()}</p>
- </div>
- </div>
-{/snippet}
-
-{#snippet configRow(label: string, value: string)}
- <div class="flex items-center justify-between py-2">
- <span class="font-medium">{label}</span>
- <code class="bg-muted rounded px-2 py-1 text-xs">{value || m.common_unknown()}</code>
- </div>
-{/snippet}
-
-{#snippet editModeContent()}
- <div class="bg-card/90 rounded-lg border p-4 backdrop-blur-sm">
- <h3 class="text-base font-semibold">{m.oidc_basic_configuration_title()}</h3>
- <p class="text-muted-foreground mt-1 mb-4 text-sm">{m.oidc_basic_description()}</p>
-
- <div class="space-y-4">
- <div class="space-y-2">
- <Label for="oidcClientId" class="text-sm font-medium">{m.oidc_client_id_label()}</Label>
- <Input
- id="oidcClientId"
- type="text"
- placeholder={m.oidc_client_id_placeholder()}
- bind:value={oidcForm.clientId}
- class="font-mono text-sm"
- />
- </div>
-
- <div class="space-y-2">
- <Label for="oidcClientSecret" class="text-sm font-medium">{m.oidc_client_secret_label()}</Label>
- <Input
- id="oidcClientSecret"
- type="password"
- placeholder={m.oidc_client_secret_placeholder()}
- bind:value={oidcForm.clientSecret}
- class="font-mono text-sm"
- />
- </div>
-
- <div class="space-y-2">
- <Label for="oidcIssuerUrl" class="text-sm font-medium">{m.oidc_issuer_url_label()}</Label>
- <Input
- id="oidcIssuerUrl"
- type="text"
- placeholder={m.oidc_issuer_url_placeholder()}
- bind:value={oidcForm.issuerUrl}
- class="font-mono text-sm"
- />
- <p class="text-muted-foreground text-xs">{m.oidc_issuer_url_description()}</p>
- </div>
-
- <div class="space-y-2">
- <Label for="oidcScopes" class="text-sm font-medium">{m.oidc_scopes_label()}</Label>
- <Input
- id="oidcScopes"
- type="text"
- placeholder={m.oidc_scopes_placeholder()}
- bind:value={oidcForm.scopes}
- class="font-mono text-sm"
- />
- </div>
-
- <div class="pt-2">
- <h4 class="text-sm font-semibold">{m.oidc_admin_role_mapping_title()}</h4>
- <p class="text-muted-foreground mb-3 text-xs">{m.oidc_admin_role_mapping_description()}</p>
- <div class="grid gap-3 sm:grid-cols-2">
- <div class="space-y-2">
- <Label for="oidcAdminClaim" class="text-sm font-medium">{m.oidc_admin_claim_label()}</Label>
- <Input
- id="oidcAdminClaim"
- type="text"
- placeholder={m.oidc_admin_claim_placeholder()}
- bind:value={oidcForm.adminClaim}
- class="font-mono text-sm"
- />
- </div>
- <div class="space-y-2">
- <Label for="oidcAdminValue" class="text-sm font-medium">{m.oidc_admin_value_label()}</Label>
- <Input
- id="oidcAdminValue"
- type="text"
- placeholder={m.oidc_admin_value_placeholder()}
- bind:value={oidcForm.adminValue}
- class="font-mono text-sm"
- />
- <p class="text-muted-foreground text-[11px]">{m.oidc_admin_value_help()}</p>
- </div>
- </div>
- </div>
- </div>
- </div>
-{/snippet}
-
-{#snippet warningBanner()}
- <div class="border-destructive/50 bg-destructive/5 rounded-lg border p-4">
- <div class="mb-2 flex items-center gap-2">
- <TriangleAlertIcon class="text-destructive size-4" />
- <h3 class="text-destructive text-base font-semibold">
- {m.oidc_server_override_warning_title()}
- </h3>
- </div>
- <p class="text-destructive/80 text-sm">{m.security_server_forces_oidc_missing_env()}</p>
- </div>
-{/snippet}
-
-{#snippet redirectUriSection()}
- <div class="bg-card/90 rounded-lg border p-4 backdrop-blur-sm">
- <div class="mb-3 flex items-center gap-2">
- <InfoIcon class="size-4 text-blue-600" />
- <h3 class="text-base font-semibold">{m.oidc_redirect_uri_title()}</h3>
- </div>
- <p class="text-muted-foreground mb-3 text-sm">{m.oidc_redirect_uri_description()}</p>
- <div class="flex items-center gap-2">
- <code class="bg-muted flex-1 rounded p-2 font-mono text-xs break-all">{redirectUri}</code>
- <Button size="sm" variant="outline" onclick={() => handleCopy(redirectUri)} class="shrink-0" title={m.common_copy()}>
- <CopyIcon class="size-3" />
- </Button>
- </div>
- </div>
-{/snippet}
diff --git a/frontend/src/lib/components/dropdown-card.svelte b/frontend/src/lib/components/dropdown-card.svelte
index d12d6f132..850a50624 100644
--- a/frontend/src/lib/components/dropdown-card.svelte
+++ b/frontend/src/lib/components/dropdown-card.svelte
@@ -13,6 +13,7 @@
description,
defaultExpanded = false,
icon,
+ badge,
children
}: {
id: string;
@@ -20,6 +21,7 @@
description?: string;
defaultExpanded?: boolean;
icon?: typeof IconType;
+ badge?: Snippet;
children: Snippet;
} = $props();
@@ -73,7 +75,12 @@
onkeydown={onHeaderKeydown}
>
<div>
- <Card.Title>{title}</Card.Title>
+ <div class="flex items-center gap-2">
+ <Card.Title>{title}</Card.Title>
+ {#if badge}
+ {@render badge()}
+ {/if}
+ </div>
{#if description}
<Card.Description class="mt-1">{description}</Card.Description>
{/if}
@@ -92,7 +99,7 @@
</Card.Header>
{#if expanded}
<div transition:slide={{ duration: 200 }}>
- <Card.Content class="pt-4">
+ <Card.Content class="pt-4 pb-6">
{@render children()}
</Card.Content>
</div>
diff --git a/frontend/src/lib/types/settings.type.ts b/frontend/src/lib/types/settings.type.ts
index f23291d01..ee24f1c10 100644
--- a/frontend/src/lib/types/settings.type.ts
+++ b/frontend/src/lib/types/settings.type.ts
@@ -25,11 +25,16 @@ export type Settings = {
accentColor: string;
authLocalEnabled: boolean;
- authOidcEnabled: boolean;
- authOidcMergeAccounts: boolean;
+ oidcEnabled: boolean;
+ oidcMergeAccounts: boolean;
authSessionTimeout: number;
authPasswordPolicy: 'basic' | 'standard' | 'strong';
- authOidcConfig: string;
+ oidcClientId: string;
+ oidcClientSecret?: string;
+ oidcIssuerUrl: string;
+ oidcScopes: string;
+ oidcAdminClaim: string;
+ oidcAdminValue: string;
onboardingCompleted: boolean;
onboardingSteps: {
diff --git a/frontend/src/routes/auth/login/+page.svelte b/frontend/src/routes/auth/login/+page.svelte
index ac52961fe..b1f2f035a 100644
--- a/frontend/src/routes/auth/login/+page.svelte
+++ b/frontend/src/routes/auth/login/+page.svelte
@@ -25,7 +25,7 @@
// Make logo URL reactive to accent color changes
let logoUrl = $derived(getApplicationLogo());
- const oidcEnabledBySettings = data.settings?.authOidcEnabled === true;
+ const oidcEnabledBySettings = data.settings?.oidcEnabled === true;
const showOidcLoginButton = $derived(oidcEnabledBySettings);
const localAuthEnabledBySettings = data.settings?.authLocalEnabled !== false;
diff --git a/frontend/src/routes/settings/notifications/+page.svelte b/frontend/src/routes/settings/notifications/+page.svelte
index d964ba42e..abb504993 100644
--- a/frontend/src/routes/settings/notifications/+page.svelte
+++ b/frontend/src/routes/settings/notifications/+page.svelte
@@ -117,7 +117,7 @@
// Validate Discord fields when Discord is enabled
if (data.discordEnabled && !data.discordWebhookUrl.trim()) {
ctx.addIssue({
- code: z.ZodIssueCode.custom,
+ code: 'custom',
message: 'Webhook URL is required when Discord is enabled',
path: ['discordWebhookUrl']
});
@@ -125,7 +125,7 @@
if (data.emailEnabled) {
if (!data.emailSmtpHost.trim()) {
ctx.addIssue({
- code: z.ZodIssueCode.custom,
+ code: 'custom',
message: 'SMTP host is required when email is enabled',
path: ['emailSmtpHost']
});
@@ -133,7 +133,7 @@
if (!data.emailFromAddress.trim()) {
ctx.addIssue({
- code: z.ZodIssueCode.custom,
+ code: 'custom',
message: 'From address is required when email is enabled',
path: ['emailFromAddress']
});
@@ -142,7 +142,7 @@
const emailValidation = z.string().email().safeParse(data.emailFromAddress.trim());
if (!emailValidation.success) {
ctx.addIssue({
- code: z.ZodIssueCode.custom,
+ code: 'custom',
message: 'Invalid email address format',
path: ['emailFromAddress']
});
@@ -151,7 +151,7 @@
if (!data.emailToAddresses.trim()) {
ctx.addIssue({
- code: z.ZodIssueCode.custom,
+ code: 'custom',
message: 'At least one recipient address is required when email is enabled',
path: ['emailToAddresses']
});
@@ -172,7 +172,7 @@
if (invalidAddresses.length > 0) {
ctx.addIssue({
- code: z.ZodIssueCode.custom,
+ code: 'custom',
message: `Invalid email addresses: ${invalidAddresses.join(', ')}`,
path: ['emailToAddresses']
});
diff --git a/frontend/src/routes/settings/security/+page.svelte b/frontend/src/routes/settings/security/+page.svelte
index b64fe8548..40d273c2d 100644
--- a/frontend/src/routes/settings/security/+page.svelte
+++ b/frontend/src/routes/settings/security/+page.svelte
@@ -5,8 +5,10 @@
import { onMount } from 'svelte';
import { createForm } from '$lib/utils/form.utils';
import { Button } from '$lib/components/ui/button';
+ import { Input } from '$lib/components/ui/input';
+ import { Label } from '$lib/components/ui/label';
import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
- import OidcConfigDialog from '$lib/components/dialogs/oidc-config-dialog.svelte';
+ import DropdownCard from '$lib/components/dropdown-card.svelte';
import { toast } from 'svelte-sonner';
import type { PageData } from './$types';
import type { Settings } from '$lib/types/settings.type';
@@ -15,10 +17,14 @@
import LockIcon from '@lucide/svelte/icons/lock';
import ClockIcon from '@lucide/svelte/icons/clock';
import KeyIcon from '@lucide/svelte/icons/key';
+ import ShieldCheckIcon from '@lucide/svelte/icons/shield-check';
+ import CopyIcon from '@lucide/svelte/icons/copy';
+ import InfoIcon from '@lucide/svelte/icons/info';
import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
import settingsStore from '$lib/stores/config-store';
import { SettingsPageLayout } from '$lib/layouts';
import { UseSettingsForm } from '$lib/hooks/use-settings-form.svelte';
+ import { UseClipboard } from '$lib/hooks/use-clipboard.svelte';
let { data }: { data: PageData } = $props();
const currentSettings = $derived<Settings>($settingsStore || data.settings!);
@@ -27,115 +33,131 @@
const formSchema = z
.object({
authLocalEnabled: z.boolean(),
- authOidcEnabled: z.boolean(),
- authOidcMergeAccounts: z.boolean(),
authSessionTimeout: z
.number(m.security_session_timeout_required())
.int(m.security_session_timeout_integer())
.min(15, m.security_session_timeout_min())
.max(1440, m.security_session_timeout_max()),
- authPasswordPolicy: z.enum(['basic', 'standard', 'strong'])
+ authPasswordPolicy: z.enum(['basic', 'standard', 'strong']),
+ oidcEnabled: z.boolean(),
+ oidcMergeAccounts: z.boolean(),
+ oidcClientId: z.string(),
+ oidcClientSecret: z.string(),
+ oidcIssuerUrl: z.string(),
+ oidcScopes: z.string(),
+ oidcAdminClaim: z.string(),
+ oidcAdminValue: z.string()
})
.superRefine((formData, ctx) => {
- // If server forces OIDC, the constraint is already satisfied
- if (data.oidcStatus.envForced) return;
- if (!formData.authLocalEnabled && !formData.authOidcEnabled) {
+ // If server forces OIDC or OIDC is enabled, local auth can be disabled
+ if (data.oidcStatus.envForced || formData.oidcEnabled) return;
+ if (!formData.authLocalEnabled) {
ctx.addIssue({
- code: z.ZodIssueCode.custom,
+ code: 'custom',
message: m.security_enable_one_provider(),
path: ['authLocalEnabled']
});
}
});
- let showOidcConfigDialog = $state(false);
let showMergeAccountsAlert = $state(false);
- let oidcConfigForm = $state({
- clientId: '',
- clientSecret: '',
- issuerUrl: '',
- scopes: 'openid email profile',
- adminClaim: '',
- adminValue: ''
+ // Form initial values with OIDC defaults
+ const formDefaults = $derived({
+ authLocalEnabled: currentSettings.authLocalEnabled,
+ authSessionTimeout: currentSettings.authSessionTimeout,
+ authPasswordPolicy: currentSettings.authPasswordPolicy,
+ oidcEnabled: currentSettings.oidcEnabled,
+ oidcMergeAccounts: currentSettings.oidcMergeAccounts,
+ oidcClientId: currentSettings.oidcClientId,
+ oidcClientSecret: '',
+ oidcIssuerUrl: currentSettings.oidcIssuerUrl,
+ oidcScopes: currentSettings.oidcScopes,
+ oidcAdminClaim: currentSettings.oidcAdminClaim,
+ oidcAdminValue: currentSettings.oidcAdminValue
});
- let { inputs: formInputs, ...form } = $derived(createForm<typeof formSchema>(formSchema, currentSettings));
+ let { inputs: formInputs, ...form } = $derived(createForm<typeof formSchema>(formSchema, formDefaults));
const settingsForm = new UseSettingsForm({
hasChangesChecker: () =>
$formInputs.authLocalEnabled.value !== currentSettings.authLocalEnabled ||
- $formInputs.authOidcEnabled.value !== currentSettings.authOidcEnabled ||
- $formInputs.authOidcMergeAccounts.value !== currentSettings.authOidcMergeAccounts ||
$formInputs.authSessionTimeout.value !== currentSettings.authSessionTimeout ||
- $formInputs.authPasswordPolicy.value !== currentSettings.authPasswordPolicy
+ $formInputs.authPasswordPolicy.value !== currentSettings.authPasswordPolicy ||
+ $formInputs.oidcEnabled.value !== currentSettings.oidcEnabled ||
+ $formInputs.oidcMergeAccounts.value !== currentSettings.oidcMergeAccounts ||
+ $formInputs.oidcClientId.value !== currentSettings.oidcClientId ||
+ $formInputs.oidcIssuerUrl.value !== currentSettings.oidcIssuerUrl ||
+ $formInputs.oidcScopes.value !== currentSettings.oidcScopes ||
+ $formInputs.oidcAdminClaim.value !== currentSettings.oidcAdminClaim ||
+ $formInputs.oidcAdminValue.value !== currentSettings.oidcAdminValue ||
+ $formInputs.oidcClientSecret.value !== ''
});
- // Helper: treat OIDC as active if forced by server or enabled in form
- const isOidcActive = () => $formInputs.authOidcEnabled.value || data.oidcStatus.envForced;
+ const clipboard = new UseClipboard();
+ const redirectUri = $derived(`${globalThis?.location?.origin ?? ''}/auth/oidc/callback`);
+ const isOidcEnvForced = $derived(data.oidcStatus.envForced);
async function onSubmit() {
const formData = form.validate();
if (!formData) {
- toast.error('Please check the form for errors');
+ toast.error(m.security_form_validation_error());
return;
}
- settingsForm.setLoading(true);
-
- let authOidcConfig = currentSettings.authOidcConfig;
- if (formData.authOidcEnabled && !data.oidcStatus.envForced) {
- authOidcConfig = JSON.stringify({
- clientId: oidcConfigForm.clientId,
- clientSecret: oidcConfigForm.clientSecret || '',
- issuerUrl: oidcConfigForm.issuerUrl,
- scopes: oidcConfigForm.scopes,
- adminClaim: oidcConfigForm.adminClaim || '',
- adminValue: oidcConfigForm.adminValue || ''
- });
+ // Validate OIDC required fields when enabling
+ if (formData.oidcEnabled && !isOidcEnvForced) {
+ if (!formData.oidcClientId || !formData.oidcIssuerUrl) {
+ toast.error(m.security_oidc_required_fields());
+ return;
+ }
}
- await settingsForm
- .updateSettings({
+ settingsForm.setLoading(true);
+
+ try {
+ await settingsForm.updateSettings({
authLocalEnabled: formData.authLocalEnabled,
- authOidcEnabled: formData.authOidcEnabled,
- authOidcMergeAccounts: formData.authOidcMergeAccounts,
authSessionTimeout: formData.authSessionTimeout,
authPasswordPolicy: formData.authPasswordPolicy,
- ...(formData.authOidcEnabled && !data.oidcStatus.envForced && { authOidcConfig })
- })
- .then(() => toast.success(m.security_settings_saved()))
- .catch((error: any) => {
- console.error('Failed to save settings:', error);
- toast.error('Failed to save settings. Please try again.');
- })
- .finally(() => settingsForm.setLoading(false));
+ oidcEnabled: formData.oidcEnabled,
+ oidcMergeAccounts: formData.oidcMergeAccounts,
+ oidcClientId: formData.oidcClientId,
+ oidcIssuerUrl: formData.oidcIssuerUrl,
+ oidcScopes: formData.oidcScopes,
+ oidcAdminClaim: formData.oidcAdminClaim,
+ oidcAdminValue: formData.oidcAdminValue,
+ ...(formData.oidcClientSecret && { oidcClientSecret: formData.oidcClientSecret })
+ });
+
+ // Clear the secret field after save
+ $formInputs.oidcClientSecret.value = '';
+ toast.success(m.security_settings_saved());
+ } catch (error: any) {
+ console.error('Failed to save settings:', error);
+ toast.error(m.security_settings_save_failed());
+ } finally {
+ settingsForm.setLoading(false);
+ }
}
function resetForm() {
$formInputs.authLocalEnabled.value = currentSettings.authLocalEnabled;
- $formInputs.authOidcEnabled.value = currentSettings.authOidcEnabled;
- $formInputs.authOidcMergeAccounts.value = currentSettings.authOidcMergeAccounts;
$formInputs.authSessionTimeout.value = currentSettings.authSessionTimeout;
$formInputs.authPasswordPolicy.value = currentSettings.authPasswordPolicy;
- }
-
- // Only depend on envForced; open config when enabling and not forced
- function handleOidcSwitchChange(checked: boolean) {
- $formInputs.authOidcEnabled.value = checked;
-
- if (!checked && !$formInputs.authLocalEnabled.value && !data.oidcStatus.envForced) {
- $formInputs.authLocalEnabled.value = true;
- toast.info(m.security_local_enabled_info());
- }
-
- if (checked && !data.oidcStatus.envForced) {
- showOidcConfigDialog = true;
- }
+ $formInputs.oidcEnabled.value = currentSettings.oidcEnabled;
+ $formInputs.oidcMergeAccounts.value = currentSettings.oidcMergeAccounts;
+ $formInputs.oidcClientId.value = currentSettings.oidcClientId;
+ $formInputs.oidcClientSecret.value = '';
+ $formInputs.oidcIssuerUrl.value = currentSettings.oidcIssuerUrl;
+ $formInputs.oidcScopes.value = currentSettings.oidcScopes;
+ $formInputs.oidcAdminClaim.value = currentSettings.oidcAdminClaim;
+ $formInputs.oidcAdminValue.value = currentSettings.oidcAdminValue;
}
function handleLocalSwitchChange(checked: boolean) {
- if (!checked && !isOidcActive()) {
+ // If trying to disable local auth, check if OIDC is enabled
+ if (!checked && !$formInputs.oidcEnabled.value && !data.oidcStatus.envForced) {
$formInputs.authLocalEnabled.value = true;
toast.error(m.security_enable_one_provider_error());
return;
@@ -143,67 +165,36 @@
$formInputs.authLocalEnabled.value = checked;
}
+ function handleOidcEnabledChange(checked: boolean) {
+ // If trying to disable OIDC and local auth is also disabled
+ if (!checked && !$formInputs.authLocalEnabled.value && !data.oidcStatus.envForced) {
+ $formInputs.authLocalEnabled.value = true;
+ toast.info(m.security_local_enabled_info());
+ }
+ $formInputs.oidcEnabled.value = checked;
+ }
+
function handleMergeAccountsChange(checked: boolean) {
- if (checked && !currentSettings.authOidcMergeAccounts) {
+ if (checked && !currentSettings.oidcMergeAccounts) {
showMergeAccountsAlert = true;
} else {
- $formInputs.authOidcMergeAccounts.value = checked;
+ $formInputs.oidcMergeAccounts.value = checked;
}
}
function confirmMergeAccounts() {
- $formInputs.authOidcMergeAccounts.value = true;
+ $formInputs.oidcMergeAccounts.value = true;
showMergeAccountsAlert = false;
}
function cancelMergeAccounts() {
- $formInputs.authOidcMergeAccounts.value = false;
+ $formInputs.oidcMergeAccounts.value = false;
showMergeAccountsAlert = false;
}
- function openOidcDialog() {
- if (currentSettings.authOidcConfig) {
- const cfg = JSON.parse(currentSettings.authOidcConfig);
- oidcConfigForm.clientId = cfg.clientId || '';
- oidcConfigForm.issuerUrl = cfg.issuerUrl || '';
- oidcConfigForm.scopes = cfg.scopes || 'openid email profile';
- oidcConfigForm.adminClaim = cfg.adminClaim || '';
- oidcConfigForm.adminValue = cfg.adminValue || '';
- }
- oidcConfigForm.clientSecret = '';
- showOidcConfigDialog = true;
- }
-
- async function handleSaveOidcConfig() {
- try {
- settingsForm.setLoading(true);
- $formInputs.authOidcEnabled.value = true;
-
- const formData = form.validate();
- if (!formData) {
- settingsForm.setLoading(false);
- return;
- }
-
- const authOidcConfig = JSON.stringify({
- clientId: oidcConfigForm.clientId,
- clientSecret: oidcConfigForm.clientSecret || '',
- issuerUrl: oidcConfigForm.issuerUrl,
- scopes: oidcConfigForm.scopes,
- adminClaim: oidcConfigForm.adminClaim || '',
- adminValue: oidcConfigForm.adminValue || ''
- });
-
- await settingsForm.updateSettings({
- authOidcEnabled: true,
- authOidcConfig
- });
-
- toast.success(m.security_oidc_saved());
- showOidcConfigDialog = false;
- } finally {
- settingsForm.setLoading(false);
- }
+ function handleCopy(text?: string) {
+ if (!text) return;
+ clipboard.copy(text);
}
onMount(() => {
@@ -228,68 +219,157 @@
</div>
</Card.Header>
<Card.Content class="px-3 py-4 sm:px-6">
- <div class="space-y-3">
- <SwitchWithLabel
- id="localAuthSwitch"
- label={m.security_local_auth_label()}
- description={m.security_local_auth_description()}
- error={$formInputs.authLocalEnabled.error}
- bind:checked={$formInputs.authLocalEnabled.value}
- onCheckedChange={handleLocalSwitchChange}
- />
+ <SwitchWithLabel
+ id="localAuthSwitch"
+ label={m.security_local_auth_label()}
+ description={m.security_local_auth_description()}
+ error={$formInputs.authLocalEnabled.error}
+ bind:checked={$formInputs.authLocalEnabled.value}
+ onCheckedChange={handleLocalSwitchChange}
+ />
+ </Card.Content>
+ </Card.Root>
+ <DropdownCard
+ id="oidc-settings"
+ title={m.security_oidc_auth_label()}
+ description={m.security_oidc_auth_description()}
+ icon={ShieldCheckIcon}
+ defaultExpanded={currentSettings.oidcEnabled || isOidcEnvForced}
+ >
+ {#snippet badge()}
+ {#if isOidcEnvForced}
+ <span
+ class="inline-flex items-center gap-1.5 rounded-full bg-amber-100 px-2.5 py-1 text-xs font-medium text-amber-800 ring-1 ring-amber-200 dark:bg-amber-900/50 dark:text-amber-200 dark:ring-amber-800"
+ >
+ {m.security_server_configured()}
+ </span>
+ {/if}
+ {/snippet}
+ <div class="space-y-4">
+ <SwitchWithLabel
+ id="oidcEnabledSwitch"
+ label={m.security_oidc_enabled_label()}
+ description={m.security_oidc_enabled_description()}
+ disabled={isOidcEnvForced}
+ bind:checked={$formInputs.oidcEnabled.value}
+ onCheckedChange={handleOidcEnabledChange}
+ />
+
+ <div class="space-y-4 border-t pt-4">
<div class="space-y-2">
- <SwitchWithLabel
- id="oidcAuthSwitch"
- label={m.security_oidc_auth_label()}
- description={data.oidcStatus.envForced
- ? m.security_oidc_auth_description_forced()
- : m.security_oidc_auth_description()}
- error={$formInputs.authOidcEnabled.error}
- disabled={data.oidcStatus.envForced}
- bind:checked={$formInputs.authOidcEnabled.value}
- onCheckedChange={handleOidcSwitchChange}
+ <Label for="oidcClientId" class="text-sm font-medium">{m.oidc_client_id_label()}</Label>
+ <Input
+ id="oidcClientId"
+ type="text"
+ placeholder={m.oidc_client_id_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcClientId.value}
+ class="font-mono text-sm"
/>
+ </div>
- {#if isOidcActive()}
- <div class="pl-8 sm:pl-11">
- {#if data.oidcStatus.envForced}
- {#if !data.oidcStatus.envConfigured}
- <Button
- variant="link"
- class="text-destructive h-auto p-0 text-xs hover:underline"
- onclick={openOidcDialog}
- >
- {m.security_server_forces_oidc_missing_env()}
- </Button>
- {:else}
- <Button variant="link" class="h-auto p-0 text-xs text-sky-600 hover:underline" onclick={openOidcDialog}>
- {m.security_oidc_configured_forced_view()}
- </Button>
- {/if}
- {:else}
- <Button variant="link" class="h-auto p-0 text-xs text-sky-600 hover:underline" onclick={openOidcDialog}>
- {m.security_manage_oidc_config()}
- </Button>
- {/if}
- </div>
- {/if}
+ <div class="space-y-2">
+ <Label for="oidcClientSecret" class="text-sm font-medium">{m.oidc_client_secret_label()}</Label>
+ <Input
+ id="oidcClientSecret"
+ type="password"
+ placeholder={m.oidc_client_secret_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcClientSecret.value}
+ class="font-mono text-sm"
+ />
+ <p class="text-muted-foreground text-xs">{m.security_oidc_client_secret_help()}</p>
+ </div>
+
+ <div class="space-y-2">
+ <Label for="oidcIssuerUrl" class="text-sm font-medium">{m.oidc_issuer_url_label()}</Label>
+ <Input
+ id="oidcIssuerUrl"
+ type="text"
+ placeholder={m.oidc_issuer_url_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcIssuerUrl.value}
+ class="font-mono text-sm"
+ />
+ <p class="text-muted-foreground text-xs">{m.oidc_issuer_url_description()}</p>
+ </div>
+
+ <div class="space-y-2">
+ <Label for="oidcScopes" class="text-sm font-medium">{m.oidc_scopes_label()}</Label>
+ <Input
+ id="oidcScopes"
+ type="text"
+ placeholder={m.oidc_scopes_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcScopes.value}
+ class="font-mono text-sm"
+ />
</div>
- {#if isOidcActive()}
- <div class="mt-3">
- <SwitchWithLabel
- id="oidcMergeAccountsSwitch"
- label={m.security_oidc_merge_accounts_label()}
- description={m.security_oidc_merge_accounts_description()}
- bind:checked={$formInputs.authOidcMergeAccounts.value}
- onCheckedChange={handleMergeAccountsChange}
- />
+ <div class="border-t pt-4">
+ <h4 class="text-sm font-semibold">{m.oidc_admin_role_mapping_title()}</h4>
+ <p class="text-muted-foreground mb-3 text-xs">{m.oidc_admin_role_mapping_description()}</p>
+ <div class="grid gap-3 sm:grid-cols-2">
+ <div class="space-y-2">
+ <Label for="oidcAdminClaim" class="text-sm font-medium">{m.oidc_admin_claim_label()}</Label>
+ <Input
+ id="oidcAdminClaim"
+ type="text"
+ placeholder={m.oidc_admin_claim_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcAdminClaim.value}
+ class="font-mono text-sm"
+ />
+ </div>
+ <div class="space-y-2">
+ <Label for="oidcAdminValue" class="text-sm font-medium">{m.oidc_admin_value_label()}</Label>
+ <Input
+ id="oidcAdminValue"
+ type="text"
+ placeholder={m.oidc_admin_value_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcAdminValue.value}
+ class="font-mono text-sm"
+ />
+ <p class="text-muted-foreground text-[11px]">{m.oidc_admin_value_help()}</p>
+ </div>
</div>
- {/if}
+ </div>
+
+ <div class="border-t pt-4">
+ <SwitchWithLabel
+ id="oidcMergeAccountsSwitch"
+ label={m.security_oidc_merge_accounts_label()}
+ description={m.security_oidc_merge_accounts_description()}
+ disabled={isOidcEnvForced}
+ bind:checked={$formInputs.oidcMergeAccounts.value}
+ onCheckedChange={handleMergeAccountsChange}
+ />
+ </div>
</div>
- </Card.Content>
- </Card.Root>
+
+ <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" />
+ <span class="text-sm font-medium">{m.oidc_redirect_uri_title()}</span>
+ </div>
+ <p class="text-muted-foreground mb-3 text-sm">{m.oidc_redirect_uri_description()}</p>
+ <div class="flex items-center gap-2">
+ <code class="bg-muted flex-1 rounded p-2 font-mono text-xs break-all">{redirectUri}</code>
+ <Button
+ size="sm"
+ variant="outline"
+ onclick={() => handleCopy(redirectUri)}
+ class="shrink-0"
+ title={m.common_copy()}
+ >
+ <CopyIcon class="size-3" />
+ </Button>
+ </div>
+ </div>
+ </div></DropdownCard
+ >
<Card.Root>
<Card.Header icon={ClockIcon} class="items-start">
@@ -313,7 +393,7 @@
<Card.Header icon={KeyIcon} class="items-start">
<div class="flex flex-col space-y-1.5">
<Card.Title>{m.security_password_policy_label()}</Card.Title>
- <Card.Description>Set password strength requirements</Card.Description>
+ <Card.Description>{m.security_password_policy_description()}</Card.Description>
</div>
</Card.Header>
<Card.Content class="px-3 py-4 sm:px-6">
@@ -371,14 +451,6 @@
</fieldset>
{/snippet}
{#snippet additionalContent()}
- <OidcConfigDialog
- bind:open={showOidcConfigDialog}
- {currentSettings}
- oidcStatus={data.oidcStatus}
- bind:oidcForm={oidcConfigForm}
- onSave={handleSaveOidcConfig}
- />
-
<AlertDialog.Root bind:open={showMergeAccountsAlert}>
<AlertDialog.Content>
<AlertDialog.Header>