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

make auth bearer config similar to other services

Browse Source
This commit is contained in:
David Christofas
2022-04-25 15:43:35 +02:00
parent c70a60d7bc
commit 7c879343e8
8 changed files with 177 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ocis-pkg/config/config.go
+2
View File
@@ -7,6 +7,7 @@ import (
appprovider "github.com/owncloud/ocis/extensions/appprovider/pkg/config"
audit "github.com/owncloud/ocis/extensions/audit/pkg/config"
authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/config"
authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config"
glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config"
graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config"
graph "github.com/owncloud/ocis/extensions/graph/pkg/config"
@@ -78,6 +79,7 @@ type Config struct {
Settings *settings.Config `yaml:"settings"`
Storage *storage.Config `yaml:"storage"`
AuthBasic *authbasic.Config `yaml:"auth_basic"`
AuthBearer *authbearer.Config `yaml:"auth_bearer"`
User *user.Config `yaml:"user"`
Group *group.Config `yaml:"group"`
AppProvider *appprovider.Config `yaml:"app_provider"`
ocis-pkg/config/defaultconfig.go
+2
View File
@@ -5,6 +5,7 @@ import (
appprovider "github.com/owncloud/ocis/extensions/appprovider/pkg/config/defaults"
audit "github.com/owncloud/ocis/extensions/audit/pkg/config/defaults"
authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/config/defaults"
authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config/defaults"
glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config/defaults"
graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config/defaults"
graph "github.com/owncloud/ocis/extensions/graph/pkg/config/defaults"
@@ -51,6 +52,7 @@ func DefaultConfig() *Config {
WebDAV: webdav.DefaultConfig(),
Storage: storage.DefaultConfig(),
AuthBasic: authbasic.FullDefaultConfig(),
AuthBearer: authbearer.FullDefaultConfig(),
User: user.FullDefaultConfig(),
Group: group.FullDefaultConfig(),
AppProvider: appprovider.FullDefaultConfig(),