sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move TokenManager back to extension config

Browse Source
This commit is contained in:
Willy Kloucek
2022-04-27 11:04:18 +02:00
parent c5d0791f53
commit 48a6978e24
14 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/settings/pkg/config/config.go
+2 -2
View File
@@ -23,8 +23,8 @@ type Config struct {
DataPath string `yaml:"data_path,omitempty" env:"SETTINGS_DATA_PATH"`
Metadata Metadata `yaml:"metadata_config,omitempty"`
Asset Asset `yaml:"asset,omitempty"`
TokenManager *shared.TokenManager `yaml:"token_manager,omitempty"`
Asset Asset `yaml:"asset,omitempty"`
TokenManager *TokenManager `yaml:"token_manager,omitempty"`
Context context.Context `yaml:"-"`
}
extensions/settings/pkg/config/defaults/defaultconfig.go
+2 -3
View File
@@ -7,7 +7,6 @@ import (
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/ocis-pkg/shared"
)
func FullDefaultConfig() *config.Config {
@@ -87,11 +86,11 @@ func EnsureDefaults(cfg *config.Config) {
}
if cfg.TokenManager == nil && cfg.Commons != nil && cfg.Commons.TokenManager != nil {
cfg.TokenManager = &shared.TokenManager{
cfg.TokenManager = &config.TokenManager{
JWTSecret: cfg.Commons.TokenManager.JWTSecret,
}
} else {
cfg.TokenManager = &shared.TokenManager{}
cfg.TokenManager = &config.TokenManager{}
}
if cfg.Metadata.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {