diff --git a/cmd/tinyauth/generate_totp.go b/cmd/tinyauth/generate_totp.go index 696af69a..1cc7df80 100644 --- a/cmd/tinyauth/generate_totp.go +++ b/cmd/tinyauth/generate_totp.go @@ -116,11 +116,11 @@ func generateTotpCmd() *cli.Command { userStr := fmt.Sprintf("%s:%s:%s", user.Username, user.Password, user.TOTPSecret) fmt.Print("\nOr add the following TOTP secret to your authenticator app: ") - fmt.Print(colors.green.Render(secret)) + fmt.Print(colors.blue.Render(secret)) fmt.Print("\n\n") fmt.Printf("Finally, add your user '%s' back to your configuration: ", user.Username) - fmt.Print(colors.green.Render(userStr)) + fmt.Print(colors.blue.Render(userStr)) fmt.Print("\n") return nil diff --git a/cmd/tinyauth/tinyauth.go b/cmd/tinyauth/tinyauth.go index a39e49c2..b5720b0c 100644 --- a/cmd/tinyauth/tinyauth.go +++ b/cmd/tinyauth/tinyauth.go @@ -3,7 +3,6 @@ package main import ( "fmt" "os" - "reflect" "strings" "charm.land/huh/v2" @@ -32,10 +31,11 @@ func main() { Configuration: tConfig, Resources: loaders, Run: func(_ []string) error { - if !reflect.DeepEqual(model.NewDefaultConfiguration(env).Experimental, tConfig.Experimental) { - colors := getColors() - fmt.Println(colors.yellow.Render("⚠") + " Experimental features are enabled, use with caution. Experimental features may change with each release.") - } + // enable this on experimental features + //if !reflect.DeepEqual(model.NewDefaultConfiguration(env).Experimental, tConfig.Experimental) { + // colors := getColors() + // fmt.Println(colors.yellow.Render("⚠") + " Experimental features are enabled, use with caution. Experimental features may change with each release.") + //} return runCmd(*tConfig) }, } diff --git a/internal/model/config.go b/internal/model/config.go index c253d2f6..79e79788 100644 --- a/internal/model/config.go +++ b/internal/model/config.go @@ -101,22 +101,23 @@ func NewDefaultConfiguration(runtimeEnv RuntimeEnv) *Config { } type Config struct { - AppURL string `description:"The base URL where the app is hosted." yaml:"appUrl,omitempty"` - ConfigFile string `description:"Path to config file." yaml:"-" gen:"include"` - LabelProvider string `description:"Label provider to use for ACLs (auto, docker, kubernetes or none to disable). auto detects the environment." yaml:"labelProvider,omitempty"` - Database DatabaseConfig `description:"Database configuration." yaml:"database,omitempty"` - Analytics AnalyticsConfig `description:"Analytics configuration." yaml:"analytics,omitempty"` - Resources ResourcesConfig `description:"Resources configuration." yaml:"resources,omitempty"` - Server ServerConfig `description:"Server configuration." yaml:"server,omitempty"` - Auth AuthConfig `description:"Authentication configuration." yaml:"auth,omitempty"` - Apps map[string]App `description:"Application ACLs configuration." yaml:"apps,omitempty"` - OAuth OAuthConfig `description:"OAuth configuration." yaml:"oauth,omitempty"` - OIDC OIDCConfig `description:"OIDC configuration." yaml:"oidc,omitempty"` - UI UIConfig `description:"UI customization." yaml:"ui,omitempty"` - LDAP LDAPConfig `description:"LDAP configuration." yaml:"ldap,omitempty"` - Experimental ExperimentalConfig `description:"Experimental features, use with caution." yaml:"experimental,omitempty"` - Tailscale TailscaleConfig `description:"Tailscale configuration." yaml:"tailscale,omitempty"` - Log LogConfig `description:"Logging configuration." yaml:"log,omitempty"` + AppURL string `description:"The base URL where the app is hosted." yaml:"appUrl,omitempty"` + ConfigFile string `description:"Path to config file." yaml:"-" gen:"include"` + LabelProvider string `description:"Label provider to use for ACLs (auto, docker, kubernetes or none to disable). auto detects the environment." yaml:"labelProvider,omitempty"` + Database DatabaseConfig `description:"Database configuration." yaml:"database,omitempty"` + Analytics AnalyticsConfig `description:"Analytics configuration." yaml:"analytics,omitempty"` + Resources ResourcesConfig `description:"Resources configuration." yaml:"resources,omitempty"` + Server ServerConfig `description:"Server configuration." yaml:"server,omitempty"` + Auth AuthConfig `description:"Authentication configuration." yaml:"auth,omitempty"` + Apps map[string]App `description:"Application ACLs configuration." yaml:"apps,omitempty"` + OAuth OAuthConfig `description:"OAuth configuration." yaml:"oauth,omitempty"` + OIDC OIDCConfig `description:"OIDC configuration." yaml:"oidc,omitempty"` + UI UIConfig `description:"UI customization." yaml:"ui,omitempty"` + LDAP LDAPConfig `description:"LDAP configuration." yaml:"ldap,omitempty"` + // enable the cli warning on experimental features + //Experimental ExperimentalConfig `description:"Experimental features, use with caution." yaml:"experimental,omitempty"` + Tailscale TailscaleConfig `description:"Tailscale configuration." yaml:"tailscale,omitempty"` + Log LogConfig `description:"Logging configuration." yaml:"log,omitempty"` } type DatabaseConfig struct { @@ -237,7 +238,7 @@ type LogStreamConfig struct { Level string `description:"Log level for this stream. Use global if empty." yaml:"level,omitempty"` } -type ExperimentalConfig struct{} +//type ExperimentalConfig struct{} type TailscaleConfig struct { Enabled bool `description:"Enable Tailscale integration." yaml:"enabled,omitempty"`