wip

accounts/pkg/service/v0/permissions.go

@@ -3,7 +3,8 @@ package service
 import (
 	"context"
 
-	mclient "github.com/micro/go-micro/v2/client"
+	"github.com/owncloud/ocis/ocis-pkg/service/grpc"
+
 	olog "github.com/owncloud/ocis/ocis-pkg/log"
 	settings "github.com/owncloud/ocis/settings/pkg/proto/v0"
 	ssvc "github.com/owncloud/ocis/settings/pkg/service/v0"
@@ -28,7 +29,7 @@ const (
 func RegisterPermissions(l *olog.Logger) {
 	// TODO this won't work with a registry other than mdns. Look into Micro's client initialization.
 	// https://github.com/owncloud/ocis-proxy/issues/38
-	service := settings.NewBundleService("com.owncloud.api.settings", mclient.DefaultClient)
+	service := settings.NewBundleService("com.owncloud.api.settings", grpc.DefaultClient)
 
 	permissionRequests := generateAccountManagementPermissionsRequests()
 	for i := range permissionRequests {

accounts/pkg/service/v0/service.go

@@ -9,12 +9,14 @@ import (
 	"strings"
 	"time"
 
+	"github.com/owncloud/ocis/ocis-pkg/service/grpc"
+
 	"github.com/owncloud/ocis/accounts/pkg/storage"
 	"github.com/owncloud/ocis/ocis-pkg/indexer"
 	idxcfg "github.com/owncloud/ocis/ocis-pkg/indexer/config"
 	idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors"
 
-	mclient "github.com/micro/go-micro/v2/client"
+	//mclient "github.com/micro/go-micro/v2/client"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/proto/v0"
 	"github.com/owncloud/ocis/ocis-pkg/log"
@@ -36,7 +38,7 @@ func New(opts ...Option) (s *Service, err error) {
 	if roleService == nil {
 		// https://github.com/owncloud/ocis-proxy/issues/38
 		// TODO this won't work with a registry other than mdns. Look into Micro's client initialization.
-		roleService = settings.NewRoleService("com.owncloud.api.settings", mclient.DefaultClient)
+		roleService = settings.NewRoleService("com.owncloud.api.settings", grpc.DefaultClient)
 	}
 	roleManager := options.RoleManager
 	if roleManager == nil {

accounts/pkg/service/v0/settings.go

@@ -3,8 +3,8 @@ package service
 import (
 	"context"
 
-	mclient "github.com/micro/go-micro/v2/client"
 	olog "github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/owncloud/ocis/ocis-pkg/service/grpc"
 	settings "github.com/owncloud/ocis/settings/pkg/proto/v0"
 	ssvc "github.com/owncloud/ocis/settings/pkg/service/v0"
 )
@@ -17,7 +17,7 @@ const (
 func RegisterSettingsBundles(l *olog.Logger) {
 	// TODO this won't work with a registry other than mdns. Look into Micro's client initialization.
 	// https://github.com/owncloud/ocis-proxy/issues/38
-	service := settings.NewBundleService("com.owncloud.api.settings", mclient.DefaultClient)
+	service := settings.NewBundleService("com.owncloud.api.settings", grpc.DefaultClient)
 
 	bundleRequests := []settings.SaveBundleRequest{
 		generateBundleProfileRequest(),