mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-23 20:49:13 -05:00
Code Issues 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/graph/pkg/config/config.go
+2 -2
View File
@@ -18,8 +18,8 @@ type Config struct {
HTTP HTTP `yaml:"http,omitempty"`
Reva Reva `yaml:"reva,omitempty"`
TokenManager *shared.TokenManager `yaml:"token_manager,omitempty"`
Reva Reva `yaml:"reva,omitempty"`
TokenManager *TokenManager `yaml:"token_manager,omitempty"`
Spaces Spaces `yaml:"spaces,omitempty"`
Identity Identity `yaml:"identity,omitempty"`
extensions/graph/pkg/config/defaults/defaultconfig.go
+2 -3
View File
@@ -4,7 +4,6 @@ import (
"strings"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/shared"
)
func DefaultConfig() *config.Config {
@@ -89,11 +88,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{}
}
}
extensions/graph/pkg/config/reva.go
+5
View File
@@ -4,3 +4,8 @@ package config
type Reva struct {
Address string `yaml:"address" env:"REVA_GATEWAY"`
}
// TokenManager is the config for using the reva token manager
type TokenManager struct {
JWTSecret string `yaml:"jwt_secret" env:"OCIS_JWT_SECRET;GRAPH_JWT_SECRET"`
}