eliott/ocis
1
0
Fork 0
mirror of https://github.com/owncloud/ocis synced 2026-04-26 17:55:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(auth-app): polish create cli

Browse Source 
Signed-off-by: jkoberg <jkoberg@owncloud.com>
This commit is contained in:
jkoberg
2024-07-15 11:59:35 +02:00
parent 11103a4220
commit a58a0f83f6
5 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/auth-app/pkg/config/defaults/defaultconfig.go
View File

@@ -64,6 +64,10 @@ func EnsureDefaults(cfg *config.Config) {
cfg.Reva = structs.CopyOrZeroValue(cfg.Commons.Reva)
}
if cfg.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
}
if cfg.TokenManager == nil && cfg.Commons != nil && cfg.Commons.TokenManager != nil {
cfg.TokenManager = &config.TokenManager{
JWTSecret: cfg.Commons.TokenManager.JWTSecret,