From 76390f3d4f1d41954c04500313aefc056e3ecf6b Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <rhaferkamp@owncloud.com>
Date: Thu, 18 Nov 2021 17:48:36 +0100
Subject: [PATCH] Rename userBackend to identityBackend

This is suppoosed to handle Groups and Users so adjust the Name
---
 graph/pkg/identity/backend.go   |  2 +-
 graph/pkg/service/v0/graph.go   |  8 ++++----
 graph/pkg/service/v0/service.go | 14 +++++++-------
 graph/pkg/service/v0/users.go   |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/graph/pkg/identity/backend.go b/graph/pkg/identity/backend.go
index b40fd022a..fe3897ce7 100644
--- a/graph/pkg/identity/backend.go
+++ b/graph/pkg/identity/backend.go
@@ -8,7 +8,7 @@ import (
 	msgraph "github.com/yaegashi/msgraph.go/beta"
 )
 
-type Users interface {
+type Backend interface {
 	GetUser(ctx context.Context, nameOrId string) (*msgraph.User, error)
 	GetUsers(ctx context.Context, queryParam url.Values) ([]*msgraph.User, error)
 }
diff --git a/graph/pkg/service/v0/graph.go b/graph/pkg/service/v0/graph.go
index 00e59bf74..428d41623 100644
--- a/graph/pkg/service/v0/graph.go
+++ b/graph/pkg/service/v0/graph.go
@@ -13,10 +13,10 @@ import (
 
 // Graph defines implements the business logic for Service.
 type Graph struct {
-	config      *config.Config
-	mux         *chi.Mux
-	logger      *log.Logger
-	userBackend identity.Users
+	config          *config.Config
+	mux             *chi.Mux
+	logger          *log.Logger
+	identityBackend identity.Backend
 }
 
 // ServeHTTP implements the Service interface.
diff --git a/graph/pkg/service/v0/service.go b/graph/pkg/service/v0/service.go
index 08a53b65b..9762845be 100644
--- a/graph/pkg/service/v0/service.go
+++ b/graph/pkg/service/v0/service.go
@@ -25,24 +25,24 @@ func NewService(opts ...Option) Service {
 	m := chi.NewMux()
 	m.Use(options.Middleware...)
 
-	var userBackend identity.Users
+	var backend identity.Backend
 	switch options.Config.Identity.Backend {
 	case "cs3":
-		userBackend = &identity.CS3{
+		backend = &identity.CS3{
 			Config: &options.Config.Reva,
 			Logger: &options.Logger,
 		}
 	case "ldap":
-		userBackend = identity.NewLDAPBackend(options.Config.Identity.LDAP, &options.Logger)
+		backend = identity.NewLDAPBackend(options.Config.Identity.LDAP, &options.Logger)
 	default:
 		options.Logger.Error().Msgf("Unknown Identity Backend: '%s'", options.Config.Identity.Backend)
 	}
 
 	svc := Graph{
-		config:      options.Config,
-		mux:         m,
-		logger:      &options.Logger,
-		userBackend: userBackend,
+		config:          options.Config,
+		mux:             m,
+		logger:          &options.Logger,
+		identityBackend: backend,
 	}
 
 	m.Route(options.Config.HTTP.Root, func(r chi.Router) {
diff --git a/graph/pkg/service/v0/users.go b/graph/pkg/service/v0/users.go
index 0eb7ebc41..8c73736dc 100644
--- a/graph/pkg/service/v0/users.go
+++ b/graph/pkg/service/v0/users.go
@@ -33,7 +33,7 @@ func (g Graph) GetMe(w http.ResponseWriter, r *http.Request) {
 // GetUsers implements the Service interface.
 // TODO use cs3 api to look up user
 func (g Graph) GetUsers(w http.ResponseWriter, r *http.Request) {
-	users, err := g.userBackend.GetUsers(r.Context(), r.URL.Query())
+	users, err := g.identityBackend.GetUsers(r.Context(), r.URL.Query())
 	if err != nil {
 		var errcode errorcode.Error
 		if errors.As(err, &errcode) {
@@ -54,7 +54,7 @@ func (g Graph) GetUser(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	user, err := g.userBackend.GetUser(r.Context(), userID)
+	user, err := g.identityBackend.GetUser(r.Context(), userID)
 
 	if err != nil {
 		var errcode errorcode.Error