update ocs + store to use go-micro v3
This commit is contained in:
committed by
Jörn Friedrich Dreyer
parent
f851b91489
commit
b167dc8b21
@@ -1,6 +1,7 @@
|
||||
package http
|
||||
|
||||
import (
|
||||
"github.com/asim/go-micro/v3"
|
||||
"github.com/owncloud/ocis/ocis-pkg/middleware"
|
||||
"github.com/owncloud/ocis/ocis-pkg/service/http"
|
||||
svc "github.com/owncloud/ocis/ocs/pkg/service/v0"
|
||||
@@ -45,10 +46,7 @@ func Server(opts ...Option) (http.Service, error) {
|
||||
handle = svc.NewTracing(handle)
|
||||
}
|
||||
|
||||
service.Handle(
|
||||
"/",
|
||||
handle,
|
||||
)
|
||||
micro.RegisterHandler(service.Server(), handle)
|
||||
|
||||
service.Init()
|
||||
return service, nil
|
||||
|
||||
@@ -15,12 +15,12 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/asim/go-micro/v3/client"
|
||||
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
|
||||
types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1"
|
||||
"github.com/cs3org/reva/pkg/token"
|
||||
"github.com/cs3org/reva/pkg/token/manager/jwt"
|
||||
"github.com/golang/protobuf/ptypes/empty"
|
||||
"github.com/micro/go-micro/v2/client"
|
||||
accountsCmd "github.com/owncloud/ocis/accounts/pkg/command"
|
||||
accountsCfg "github.com/owncloud/ocis/accounts/pkg/config"
|
||||
accountsProto "github.com/owncloud/ocis/accounts/pkg/proto/v0"
|
||||
@@ -51,7 +51,7 @@ const (
|
||||
userEinstein string = "einstein"
|
||||
userMarie string = "marie"
|
||||
userRichard string = "richard"
|
||||
userIDP string = "idp"
|
||||
userIDP string = "idp"
|
||||
userReva string = "reva"
|
||||
userMoss string = "moss"
|
||||
userAdmin string = "admin"
|
||||
@@ -138,7 +138,7 @@ const (
|
||||
userIDEinstein string = "4c510ada-c86b-4815-8820-42cdf82c3d51"
|
||||
userIDMarie string = "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c"
|
||||
userIDFeynman string = "932b4540-8d16-481e-8ef4-588e4b6b151c"
|
||||
userIDIDP string = "820ba2a1-3f54-4538-80a4-2d73007e30bf"
|
||||
userIDIDP string = "820ba2a1-3f54-4538-80a4-2d73007e30bf"
|
||||
userIDReva string = "bc596f3c-c955-4328-80a0-60d018b4ad57"
|
||||
userIDMoss string = "058bff95-6708-4fe5-91e4-9ea3d377588b"
|
||||
userIDAdmin string = "ddc2004c-0977-11eb-9d3f-a793888cd0f8"
|
||||
|
||||
Reference in New Issue
Block a user