- let ocis init generate jwt token for collaboration service
- separate REVA jwt secret from WOPI jwt secret - fix gatway service name configuration
This commit is contained in:
committed by
Jörn Friedrich Dreyer
parent
7b47d55837
commit
901a5e27fc
@@ -14,7 +14,7 @@ type Config struct {
|
||||
Service Service `yaml:"-"`
|
||||
App App `yaml:"app"`
|
||||
|
||||
JWTSecret string `yaml:"jwt_secret" env:"OCIS_JWT_SECRET;COLLABORATION_JWT_SECRET" desc:"Used as JWT token and to encrypt access token." introductionVersion:"5.1"`
|
||||
JWTSecret string `yaml:"jwt_secret" env:"COLLABORATION_JWT_SECRET" desc:"Used as mint and verify WOPI JWT tokens and encrypt and decrypt the REVA JWT token embedded in the WOPI JWT token." introductionVersion:"5.1"`
|
||||
|
||||
GRPC GRPC `yaml:"grpc"`
|
||||
HTTP HTTP `yaml:"http"`
|
||||
|
||||
@@ -8,7 +8,7 @@ type CS3Api struct {
|
||||
|
||||
// Gateway defines the available configuration for the CS3 API gateway
|
||||
type Gateway struct {
|
||||
Name string `yaml: "name" env:"OCIS_REVA_GATEWAY;COLLABORATION_CS3API_GATEWAY_NAME" desc:"The service name of the CS3API gateway." introductionVersion:"5.1"`
|
||||
Name string `yaml:"name" env:"OCIS_REVA_GATEWAY;COLLABORATION_CS3API_GATEWAY_NAME" desc:"The service name of the CS3API gateway." introductionVersion:"5.1"`
|
||||
}
|
||||
|
||||
// DataGateway defines the available configuration for the CS3 API data gateway
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package defaults
|
||||
|
||||
import (
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/generators"
|
||||
"github.com/owncloud/ocis/v2/services/collaboration/pkg/config"
|
||||
)
|
||||
|
||||
@@ -15,7 +14,6 @@ func FullDefaultConfig() *config.Config {
|
||||
|
||||
// DefaultConfig returns a basic default configuration
|
||||
func DefaultConfig() *config.Config {
|
||||
secret, _ := generators.GenerateRandomString(generators.AlphaNumChars, 32) // anything to do with the error?
|
||||
return &config.Config{
|
||||
Service: config.Service{
|
||||
Name: "collaboration",
|
||||
@@ -26,7 +24,6 @@ func DefaultConfig() *config.Config {
|
||||
Icon: "image-edit",
|
||||
LockName: "com.github.owncloud.collaboration",
|
||||
},
|
||||
JWTSecret: secret,
|
||||
GRPC: config.GRPC{
|
||||
Addr: "0.0.0.0:9301",
|
||||
Namespace: "com.owncloud.collaboration",
|
||||
|
||||
Reference in New Issue
Block a user