refactor accounts

Signed-off-by: Christian Richter <crichter@owncloud.com>

extensions/accounts/Makefile

@@ -1,7 +1,7 @@
 SHELL := bash
 NAME := accounts
 
-include ../.make/recursion.mk
+include ../../.make/recursion.mk
 
 .PHONY: test-acceptance-webui
 test-acceptance-webui:
@@ -10,27 +10,27 @@ test-acceptance-webui:
 
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
-include ../.bingo/Variables.mk
+include ../../.bingo/Variables.mk
 endif
 
 ############ go tooling ############
-include ../.make/go.mk
+include ../../.make/go.mk
 
 ############ release ############
-include ../.make/release.mk
+include ../../.make/release.mk
 
 ############ docs generate ############
-include ../.make/docs.mk
+include ../../.make/docs.mk
 
 ############ l10n ############
-include ../.make/l10n.mk
+include ../../.make/l10n.mk
 
 .PHONY: docs-generate
 docs-generate: config-docs-generate \
 			   grpc-docs-generate
 
 ############ generate ############
-include ../.make/generate.mk
+include ../../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
@@ -49,7 +49,7 @@ node_modules:
 	@yarn install --immutable 2>&1 >/dev/null
 
 ############ protobuf ############
-include ../.make/protobuf.mk
+include ../../.make/protobuf.mk
 
 .PHONY: protobuf
 protobuf: buf-generate

extensions/accounts/cmd/accounts/main.go

@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis/accounts/pkg/command"
-	"github.com/owncloud/ocis/accounts/pkg/config/defaults"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/command"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
 )
 
 func main() {

extensions/accounts/cmd/helper/defaultconfig/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	accountsdefaults "github.com/owncloud/ocis/accounts/pkg/config/defaults"
+	accountsdefaults "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
 	idpdefaults "github.com/owncloud/ocis/idp/pkg/config/defaults"
 	"gopkg.in/yaml.v2"
 )

extensions/accounts/pkg/assets/option.go

@@ -3,8 +3,8 @@ package assets
 import (
 	"net/http"
 
-	"github.com/owncloud/ocis/accounts"
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/assetsfs"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )

extensions/accounts/pkg/command/add_account.go

@@ -7,8 +7,8 @@ import (
 	accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
 
 	"github.com/asim/go-micro/plugins/client/grpc/v4"
-	"github.com/owncloud/ocis/accounts/pkg/config"
-	"github.com/owncloud/ocis/accounts/pkg/flagset"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/flagset"
 	"github.com/urfave/cli/v2"
 )
 

extensions/accounts/pkg/command/health.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/owncloud/ocis/accounts/pkg/config"
-	"github.com/owncloud/ocis/accounts/pkg/config/parser"
-	"github.com/owncloud/ocis/accounts/pkg/logging"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/logging"
 	"github.com/urfave/cli/v2"
 )
 

extensions/accounts/pkg/command/inspect_account.go

@@ -8,11 +8,11 @@ import (
 	accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
 	accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
 
-	"github.com/owncloud/ocis/accounts/pkg/flagset"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/flagset"
 
 	"github.com/asim/go-micro/plugins/client/grpc/v4"
 	tw "github.com/olekukonko/tablewriter"
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 

extensions/accounts/pkg/command/list_accounts.go

@@ -8,11 +8,11 @@ import (
 	accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
 	accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
 
-	"github.com/owncloud/ocis/accounts/pkg/flagset"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/flagset"
 
 	"github.com/asim/go-micro/plugins/client/grpc/v4"
 	tw "github.com/olekukonko/tablewriter"
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 

extensions/accounts/pkg/command/rebuild_index.go

@@ -7,7 +7,7 @@ import (
 	accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
 
 	"github.com/asim/go-micro/plugins/client/grpc/v4"
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/urfave/cli/v2"
 	merrors "go-micro.dev/v4/errors"
 )

extensions/accounts/pkg/command/remove_account.go

@@ -6,10 +6,10 @@ import (
 
 	accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
 
-	"github.com/owncloud/ocis/accounts/pkg/flagset"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/flagset"
 
 	"github.com/asim/go-micro/plugins/client/grpc/v4"
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 

extensions/accounts/pkg/command/root.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/clihelper"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/thejerf/suture/v4"

extensions/accounts/pkg/command/server.go

@@ -5,15 +5,15 @@ import (
 	"fmt"
 
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/accounts/pkg/config"
-	"github.com/owncloud/ocis/accounts/pkg/config/parser"
-	"github.com/owncloud/ocis/accounts/pkg/logging"
-	"github.com/owncloud/ocis/accounts/pkg/metrics"
-	"github.com/owncloud/ocis/accounts/pkg/server/debug"
-	"github.com/owncloud/ocis/accounts/pkg/server/grpc"
-	"github.com/owncloud/ocis/accounts/pkg/server/http"
-	svc "github.com/owncloud/ocis/accounts/pkg/service/v0"
-	"github.com/owncloud/ocis/accounts/pkg/tracing"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/logging"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/metrics"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/server/debug"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/server/grpc"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/server/http"
+	svc "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/tracing"
 	"github.com/owncloud/ocis/ocis-pkg/version"
 	"github.com/urfave/cli/v2"
 )

extensions/accounts/pkg/command/update_account.go

@@ -7,10 +7,10 @@ import (
 	accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
 	accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
 
-	"github.com/owncloud/ocis/accounts/pkg/flagset"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/flagset"
 
 	"github.com/asim/go-micro/plugins/client/grpc/v4"
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/urfave/cli/v2"
 	"google.golang.org/genproto/protobuf/field_mask"
 )

extensions/accounts/pkg/command/version.go

@@ -8,7 +8,7 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/version"
 
 	tw "github.com/olekukonko/tablewriter"
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 

extensions/accounts/pkg/config/defaults/defaultconfig.go

@@ -4,7 +4,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
 )
 

extensions/accounts/pkg/config/parser/parse.go

@@ -3,8 +3,8 @@ package parser
 import (
 	"errors"
 
-	"github.com/owncloud/ocis/accounts/pkg/config"
-	defaults "github.com/owncloud/ocis/accounts/pkg/config/defaults"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
+	defaults "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 
 	"github.com/owncloud/ocis/ocis-pkg/config/envdecode"

extensions/accounts/pkg/flagset/flagset.go

@@ -3,7 +3,7 @@ package flagset
 import (
 	accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
 
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/urfave/cli/v2"
 )

extensions/accounts/pkg/logging/logging.go

@@ -1,7 +1,7 @@
 package logging
 
 import (
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 

extensions/accounts/pkg/server/debug/option.go

@@ -3,7 +3,7 @@ package debug
 import (
 	"context"
 
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 

extensions/accounts/pkg/server/debug/server.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/service/debug"
 	"github.com/owncloud/ocis/ocis-pkg/version"
 )

extensions/accounts/pkg/server/grpc/option.go

@@ -3,9 +3,9 @@ package grpc
 import (
 	"context"
 
-	"github.com/owncloud/ocis/accounts/pkg/config"
-	"github.com/owncloud/ocis/accounts/pkg/metrics"
-	svc "github.com/owncloud/ocis/accounts/pkg/service/v0"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/metrics"
+	svc "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/urfave/cli/v2"
 )
@@ -15,13 +15,13 @@ type Option func(o *Options)
 
 // Options defines the available options for this package.
 type Options struct {
-	Name      string
-	Logger    log.Logger
-	Context   context.Context
-	Config    *config.Config
-	Metrics   *metrics.Metrics
-	Flags     []cli.Flag
-	Handler	  *svc.Service
+	Name    string
+	Logger  log.Logger
+	Context context.Context
+	Config  *config.Config
+	Metrics *metrics.Metrics
+	Flags   []cli.Flag
+	Handler *svc.Service
 }
 
 // newOptions initializes the available default options.

extensions/accounts/pkg/server/http/option.go

@@ -3,9 +3,9 @@ package http
 import (
 	"context"
 
-	"github.com/owncloud/ocis/accounts/pkg/config"
-	"github.com/owncloud/ocis/accounts/pkg/metrics"
-	svc "github.com/owncloud/ocis/accounts/pkg/service/v0"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/metrics"
+	svc "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/urfave/cli/v2"
 )
@@ -15,13 +15,13 @@ type Option func(o *Options)
 
 // Options defines the available options for this package.
 type Options struct {
-	Name      string
-	Logger    log.Logger
-	Context   context.Context
-	Config    *config.Config
-	Metrics   *metrics.Metrics
-	Flags     []cli.Flag
-	Handler	  *svc.Service
+	Name    string
+	Logger  log.Logger
+	Context context.Context
+	Config  *config.Config
+	Metrics *metrics.Metrics
+	Flags   []cli.Flag
+	Handler *svc.Service
 }
 
 // newOptions initializes the available default options.

extensions/accounts/pkg/server/http/server.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/go-chi/chi/v5"
 	chimiddleware "github.com/go-chi/chi/v5/middleware"
-	"github.com/owncloud/ocis/accounts/pkg/assets"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/assets"
 	"github.com/owncloud/ocis/ocis-pkg/account"
 	"github.com/owncloud/ocis/ocis-pkg/cors"
 	"github.com/owncloud/ocis/ocis-pkg/middleware"

extensions/accounts/pkg/service/v0/accounts.go

@@ -22,8 +22,8 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/golang/protobuf/ptypes/empty"
 	fieldmask_utils "github.com/mennanov/fieldmask-utils"
-	"github.com/owncloud/ocis/accounts/pkg/storage"
-	accTracing "github.com/owncloud/ocis/accounts/pkg/tracing"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
+	accTracing "github.com/owncloud/ocis/extensions/accounts/pkg/tracing"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/roles"

extensions/accounts/pkg/service/v0/accounts_permission_test.go

@@ -13,7 +13,7 @@ import (
 	accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
 
 	"github.com/golang/protobuf/ptypes/empty"
-	config "github.com/owncloud/ocis/accounts/pkg/config/defaults"
+	config "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
 	olog "github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/roles"

extensions/accounts/pkg/service/v0/groups.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/gofrs/uuid"
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/owncloud/ocis/accounts/pkg/storage"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
 	merrors "go-micro.dev/v4/errors"
 	p "google.golang.org/protobuf/proto"
 )

extensions/accounts/pkg/service/v0/index.go

@@ -7,7 +7,7 @@ import (
 	accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
 	accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
 
-	"github.com/owncloud/ocis/accounts/pkg/storage"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
 
 	"github.com/owncloud/ocis/ocis-pkg/indexer"
 	"github.com/owncloud/ocis/ocis-pkg/indexer/config"

extensions/accounts/pkg/service/v0/option.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/roles"
 	settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"

extensions/accounts/pkg/service/v0/service.go

@@ -13,12 +13,12 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/service/grpc"
 
-	"github.com/owncloud/ocis/accounts/pkg/storage"
+	"github.com/owncloud/ocis/extensions/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"
 
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	oreg "github.com/owncloud/ocis/ocis-pkg/registry"
 	"github.com/owncloud/ocis/ocis-pkg/roles"

extensions/accounts/pkg/storage/cs3.go

@@ -15,7 +15,7 @@ import (
 	"github.com/cs3org/reva/v2/pkg/token"
 	"github.com/cs3org/reva/v2/pkg/token/manager/jwt"
 	"github.com/cs3org/reva/v2/pkg/utils"
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	olog "github.com/owncloud/ocis/ocis-pkg/log"
 	metadatastorage "github.com/owncloud/ocis/ocis-pkg/metadata_storage"
 	accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"

extensions/accounts/pkg/storage/disk.go

@@ -10,7 +10,7 @@ import (
 
 	accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
 
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	olog "github.com/owncloud/ocis/ocis-pkg/log"
 )
 

extensions/accounts/pkg/tracing/tracing.go

@@ -1,7 +1,7 @@
 package tracing
 
 import (
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
 	"go.opentelemetry.io/otel/trace"
 )

graph/pkg/middleware/requireadmin.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	revactx "github.com/cs3org/reva/v2/pkg/ctx"
-	accounts "github.com/owncloud/ocis/accounts/pkg/service/v0"
+	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
 	"github.com/owncloud/ocis/graph/pkg/service/v0/errorcode"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/roles"

ocis-pkg/config/config.go

@@ -3,8 +3,8 @@ package config
 import (
 	"github.com/owncloud/ocis/ocis-pkg/shared"
 
-	accounts "github.com/owncloud/ocis/accounts/pkg/config"
 	audit "github.com/owncloud/ocis/audit/pkg/config"
+	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	glauth "github.com/owncloud/ocis/glauth/pkg/config"
 	graphExplorer "github.com/owncloud/ocis/graph-explorer/pkg/config"
 	graph "github.com/owncloud/ocis/graph/pkg/config"

ocis-pkg/config/defaultconfig.go

@@ -1,8 +1,8 @@
 package config
 
 import (
-	accounts "github.com/owncloud/ocis/accounts/pkg/config/defaults"
 	audit "github.com/owncloud/ocis/audit/pkg/config/defaults"
+	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
 	glauth "github.com/owncloud/ocis/glauth/pkg/config/defaults"
 	graphExplorer "github.com/owncloud/ocis/graph-explorer/pkg/config/defaults"
 	graph "github.com/owncloud/ocis/graph/pkg/config/defaults"

ocis-pkg/indexer/config/config.go

@@ -2,7 +2,7 @@
 package config
 
 import (
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 )
 
 // Repo defines which storage implementation is to be used.

ocis-pkg/indexer/index/cs3/autoincrement.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/owncloud/ocis/accounts/pkg/storage"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
 
 	idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors"
 

ocis-pkg/indexer/index/cs3/config.go

@@ -1,7 +1,7 @@
 package cs3
 
 import (
-	acccfg "github.com/owncloud/ocis/accounts/pkg/config"
+	acccfg "github.com/owncloud/ocis/extensions/accounts/pkg/config"
 )
 
 // Config represents cs3conf. Should be deprecated in favor of config.Config.

ocis-pkg/indexer/index/cs3/non_unique.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/owncloud/ocis/accounts/pkg/storage"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
 
 	v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"

ocis-pkg/indexer/index/cs3/unique.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/owncloud/ocis/accounts/pkg/storage"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
 
 	v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"

ocis-pkg/indexer/index/disk/unique_test.go

@@ -5,7 +5,7 @@ import (
 	"path"
 	"testing"
 
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/indexer/errors"
 	"github.com/owncloud/ocis/ocis-pkg/indexer/index"
 	"github.com/owncloud/ocis/ocis-pkg/indexer/option"

ocis-pkg/indexer/option/option.go

@@ -1,6 +1,6 @@
 package option
 
-import "github.com/owncloud/ocis/accounts/pkg/config"
+import "github.com/owncloud/ocis/extensions/accounts/pkg/config"
 
 // Option defines a single option function.
 type Option func(o *Options)

ocis-pkg/metadata_storage/metadata_storage.go

@@ -15,7 +15,7 @@ import (
 	"github.com/cs3org/reva/v2/pkg/errtypes"
 	"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
 	"github.com/cs3org/reva/v2/pkg/utils"
-	"github.com/owncloud/ocis/accounts/pkg/config"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"google.golang.org/grpc/metadata"
 )
 

ocis/pkg/command/accounts.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/accounts/pkg/command"
+	"github.com/owncloud/ocis/extensions/accounts/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/ocis/pkg/register"

ocis/pkg/runtime/service/service.go

@@ -19,7 +19,7 @@ import (
 	"github.com/mohae/deepcopy"
 	"github.com/olekukonko/tablewriter"
 
-	accounts "github.com/owncloud/ocis/accounts/pkg/command"
+	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/command"
 	glauth "github.com/owncloud/ocis/glauth/pkg/command"
 	graphExplorer "github.com/owncloud/ocis/graph-explorer/pkg/command"
 	graph "github.com/owncloud/ocis/graph/pkg/command"

ocs/pkg/middleware/requireadmin.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/go-chi/render"
-	accounts "github.com/owncloud/ocis/accounts/pkg/service/v0"
+	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
 	"github.com/owncloud/ocis/ocis-pkg/roles"
 	"github.com/owncloud/ocis/ocs/pkg/service/v0/data"
 	"github.com/owncloud/ocis/ocs/pkg/service/v0/response"

ocs/pkg/middleware/requireselforadmin.go

@@ -7,7 +7,7 @@ import (
 	revactx "github.com/cs3org/reva/v2/pkg/ctx"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
-	accounts "github.com/owncloud/ocis/accounts/pkg/service/v0"
+	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
 	"github.com/owncloud/ocis/ocis-pkg/roles"
 	"github.com/owncloud/ocis/ocs/pkg/service/v0/data"
 	"github.com/owncloud/ocis/ocs/pkg/service/v0/response"

ocs/pkg/server/http/svc_test.go

@@ -20,9 +20,9 @@ import (
 	"github.com/cs3org/reva/v2/pkg/token"
 	"github.com/cs3org/reva/v2/pkg/token/manager/jwt"
 	"github.com/golang/protobuf/ptypes/empty"
-	accountsCfg "github.com/owncloud/ocis/accounts/pkg/config"
-	accountsLogging "github.com/owncloud/ocis/accounts/pkg/logging"
-	accountsServiceExt "github.com/owncloud/ocis/accounts/pkg/service/v0"
+	accountsCfg "github.com/owncloud/ocis/extensions/accounts/pkg/config"
+	accountsLogging "github.com/owncloud/ocis/extensions/accounts/pkg/logging"
+	accountsServiceExt "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
 	ocisLog "github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/service/grpc"
 	"github.com/owncloud/ocis/ocs/pkg/config"