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

make auth machine config similar to other services

Browse Source
This commit is contained in:
David Christofas
2022-04-25 15:43:48 +02:00
parent d303bb6f55
commit 4c6848e6bf
8 changed files with 166 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ocis/pkg/command/storageauthmachine.go
+5 -5
View File
@@ -1,7 +1,7 @@
package command
import (
"github.com/owncloud/ocis/extensions/storage/pkg/command"
"github.com/owncloud/ocis/extensions/auth-machine/pkg/command"
"github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis/pkg/register"
"github.com/urfave/cli/v2"
@@ -14,11 +14,11 @@ func StorageAuthMachineCommand(cfg *config.Config) *cli.Command {
Usage: "start storage auth-machine service",
Category: "extensions",
//Flags: flagset.AuthMachineWithConfig(cfg.Storage),
Before: func(ctx *cli.Context) error {
return ParseStorageCommon(ctx, cfg)
},
// Before: func(ctx *cli.Context) error {
// return ParseStorageCommon(ctx, cfg)
// },
Action: func(c *cli.Context) error {
origCmd := command.AuthMachine(cfg.Storage)
origCmd := command.AuthMachine(cfg.AuthMachine)
return handleOriginalAction(c, origCmd)
},
}
ocis/pkg/runtime/service/service.go
+2 -1
View File
@@ -23,6 +23,7 @@ import (
appprovider "github.com/owncloud/ocis/extensions/appprovider/pkg/command"
authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/command"
authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/command"
authmachine "github.com/owncloud/ocis/extensions/auth-machine/pkg/command"
glauth "github.com/owncloud/ocis/extensions/glauth/pkg/command"
graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/command"
graph "github.com/owncloud/ocis/extensions/graph/pkg/command"
@@ -120,7 +121,7 @@ func NewService(options ...Option) (*Service, error) {
s.ServicesRegistry["storage-groupprovider"] = group.NewGroupProvider
s.ServicesRegistry["storage-authbasic"] = authbasic.NewAuthBasic
s.ServicesRegistry["storage-authbearer"] = authbearer.NewAuthBearer
s.ServicesRegistry["storage-authmachine"] = storage.NewAuthMachine
s.ServicesRegistry["storage-authmachine"] = authmachine.NewAuthMachine
s.ServicesRegistry["storage-users"] = storage.NewStorageUsers
s.ServicesRegistry["storage-shares"] = storage.NewStorageShares
s.ServicesRegistry["storage-public-link"] = storage.NewStoragePublicLink