Move Tokenmanager to shared.Commons

Signed-off-by: Christian Richter <crichter@owncloud.com>

extensions/graph/pkg/config/config.go

@@ -18,8 +18,8 @@ type Config struct {
 
 	HTTP HTTP `yaml:"http,omitempty"`
 
-	Reva         Reva         `yaml:"reva,omitempty"`
-	TokenManager TokenManager `yaml:"token_manager"`
+	Reva         Reva                 `yaml:"reva,omitempty"`
+	TokenManager *shared.TokenManager `yaml:"token_manager,omitempty"`
 
 	Spaces   Spaces   `yaml:"spaces,omitempty"`
 	Identity Identity `yaml:"identity,omitempty"`

extensions/graph/pkg/config/defaults/defaultconfig.go

@@ -4,6 +4,7 @@ import (
 	"strings"
 
 	"github.com/owncloud/ocis/extensions/graph/pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/shared"
 )
 
 func DefaultConfig() *config.Config {
@@ -23,9 +24,6 @@ func DefaultConfig() *config.Config {
 		Reva: config.Reva{
 			Address: "127.0.0.1:9142",
 		},
-		TokenManager: config.TokenManager{
-			JWTSecret: "Pive-Fumkiu4",
-		},
 		Spaces: config.Spaces{
 			WebDavBase:   "https://localhost:9200",
 			WebDavPath:   "/dav/spaces/",
@@ -89,6 +87,14 @@ func EnsureDefaults(cfg *config.Config) {
 	} else if cfg.Tracing == nil {
 		cfg.Tracing = &config.Tracing{}
 	}
+
+	if cfg.TokenManager == nil && cfg.Commons != nil && cfg.Commons.TokenManager != nil {
+		cfg.TokenManager = &shared.TokenManager{
+			JWTSecret: cfg.Commons.TokenManager.JWTSecret,
+		}
+	} else {
+		cfg.TokenManager = &shared.TokenManager{}
+	}
 }
 
 func Sanitize(cfg *config.Config) {

extensions/graph/pkg/config/reva.go

@@ -4,8 +4,3 @@ 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"`
-}