mirrors/pocket-id
1
0
Fork 0
mirror of https://github.com/pocket-id/pocket-id.git synced 2026-02-12 09:43:31 +00:00
Code Activity

Merge branch 'main' into v2-main

Browse Source
This commit is contained in:
Elias Schneider
2025-11-30 18:28:00 +01:00
parent e06538a101 14c7471b52
commit 1da694f8ad
29 changed files with 1159 additions and 1153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/internal/common/env_config.go
View File

@@ -89,7 +89,8 @@ func defaultConfig() EnvConfigSchema {
AppEnv: AppEnvProduction,
LogLevel: "info",
DbProvider: "sqlite",
FileBackend: "fs",
FileBackend: "filesystem",
FileBackend: "filesystem",
AppURL: AppUrl,
Port: "1411",
Host: "0.0.0.0",
@@ -164,12 +165,12 @@ func ValidateEnvConfig(config *EnvConfigSchema) error {
switch config.FileBackend {
case "s3", "database":
case "", "fs":
case "", "filesystem":
if config.UploadPath == "" {
config.UploadPath = defaultFsUploadPath
}
default:
return errors.New("invalid FILE_BACKEND value. Must be 'fs', 'database', or 's3'")
return errors.New("invalid FILE_BACKEND value. Must be 'filesystem', 'database', or 's3'")
}
// Validate LOCAL_IPV6_RANGES

4
backend/internal/common/env_config_test.go
View File

@@ -153,12 +153,12 @@ func TestParseEnvConfig(t *testing.T) {
EnvConfig = defaultConfig()
t.Setenv("DB_CONNECTION_STRING", "file:test.db")
t.Setenv("APP_URL", "http://localhost:3000")
t.Setenv("FILE_BACKEND", "FS")
t.Setenv("FILE_BACKEND", "FILESYSTEM")
t.Setenv("UPLOAD_PATH", "")
err := parseAndValidateEnvConfig(t)
require.NoError(t, err)
assert.Equal(t, "fs", EnvConfig.FileBackend)
assert.Equal(t, "filesystem", EnvConfig.FileBackend)
assert.Equal(t, defaultFsUploadPath, EnvConfig.UploadPath)
})