Rebrand graph service

leaving out LDAP related stuff for now

services/graph/pkg/command/root.go

@@ -24,11 +24,11 @@ func GetCommands(cfg *config.Config) cli.Commands {
 	}, UnifiedRoles(cfg)...)
 }
 
-// Execute is the entry point for the ocis-graph command.
+// Execute is the entry point for the opencloud graph command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
 		Name:     "graph",
-		Usage:    "Serve Graph API for oCIS",
+		Usage:    "Serve Graph API for OpenCloud",
 		Commands: GetCommands(cfg),
 	})
 	return app.RunContext(cfg.Context, os.Args)

services/graph/pkg/config/application.go

@@ -2,6 +2,6 @@ package config
 
 // Application defines the available graph application configuration.
 type Application struct {
-	ID          string `yaml:"id" env:"GRAPH_APPLICATION_ID" desc:"The ocis application ID shown in the graph. All app roles are tied to this ID." introductionVersion:"pre5.0"`
-	DisplayName string `yaml:"displayname" env:"GRAPH_APPLICATION_DISPLAYNAME" desc:"The ocis application name." introductionVersion:"pre5.0"`
+	ID          string `yaml:"id" env:"GRAPH_APPLICATION_ID" desc:"The OpenCloud application ID shown in the graph. All app roles are tied to this ID." introductionVersion:"pre5.0"`
+	DisplayName string `yaml:"displayname" env:"GRAPH_APPLICATION_DISPLAYNAME" desc:"The OpenCloud application name." introductionVersion:"pre5.0"`
 }

services/graph/pkg/config/defaults/defaultconfig.go

@@ -55,7 +55,7 @@ func DefaultConfig() *config.Config {
 			Name: "graph",
 		},
 		Application: config.Application{
-			DisplayName: "ownCloud Infinite Scale",
+			DisplayName: "OpenCloud",
 		},
 		API: config.API{
 			GroupMembersPatchLimit:  20,

services/graph/pkg/middleware/auth.go

@@ -30,7 +30,7 @@ func authOptions(opts ...account.Option) account.Options {
 // Auth provides a middleware to authenticate requests using the x-access-token header value
 // and write it to the context. If there is no x-access-token the middleware prevents access and renders a json document.
 func Auth(opts ...account.Option) func(http.Handler) http.Handler {
-	// Note: This largely duplicates what ocis-pkg/middleware/account.go already does (apart from a slightly different error
+	// Note: This largely duplicates what pkg/middleware/account.go already does (apart from a slightly different error
 	// handling). Ideally we should merge both middlewares.
 	opt := authOptions(opts...)
 	tokenManager, err := jwt.New(map[string]interface{}{

services/graph/pkg/service/v0/service.go

@@ -22,7 +22,7 @@ import (
 	"github.com/cs3org/reva/v2/pkg/store"
 	"github.com/cs3org/reva/v2/pkg/utils"
 
-	ocisldap "github.com/opencloud-eu/opencloud/pkg/ldap"
+	ocldap "github.com/opencloud-eu/opencloud/pkg/ldap"
 	"github.com/opencloud-eu/opencloud/pkg/log"
 	"github.com/opencloud-eu/opencloud/pkg/registry"
 	"github.com/opencloud-eu/opencloud/pkg/roles"
@@ -436,7 +436,7 @@ func setIdentityBackends(options Options, svc *Graph) error {
 			}
 
 			if options.Config.Identity.LDAP.CACert != "" {
-				if err := ocisldap.WaitForCA(options.Logger,
+				if err := ocldap.WaitForCA(options.Logger,
 					options.Config.Identity.LDAP.Insecure,
 					options.Config.Identity.LDAP.CACert); err != nil {
 					options.Logger.Fatal().Err(err).Msg("The configured LDAP CA cert does not exist")

services/graph/pkg/service/v0/users.go

@@ -28,7 +28,7 @@ import (
 	settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/opencloud/services/settings/v0"
 	"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
 	"github.com/opencloud-eu/opencloud/services/graph/pkg/identity"
-	ocissettingssvc "github.com/opencloud-eu/opencloud/services/settings/pkg/service/v0"
+	ocsettingssvc "github.com/opencloud-eu/opencloud/services/settings/pkg/service/v0"
 	"github.com/opencloud-eu/opencloud/services/settings/pkg/store/defaults"
 	libregraph "github.com/owncloud/libre-graph-api-go"
 )
@@ -402,10 +402,10 @@ func (g Graph) PostUser(w http.ResponseWriter, r *http.Request) {
 		// to all new users for now, as create Account request does not have any role field
 		if _, err = g.roleService.AssignRoleToUser(r.Context(), &settingssvc.AssignRoleToUserRequest{
 			AccountUuid: *u.Id,
-			RoleId:      ocissettingssvc.BundleUUIDRoleUser,
+			RoleId:      ocsettingssvc.BundleUUIDRoleUser,
 		}); err != nil {
 			// log as error, admin eventually needs to do something
-			logger.Error().Err(err).Str("id", *u.Id).Str("role", ocissettingssvc.BundleUUIDRoleUser).Msg("could not create user: role assignment failed")
+			logger.Error().Err(err).Str("id", *u.Id).Str("role", ocsettingssvc.BundleUUIDRoleUser).Msg("could not create user: role assignment failed")
 			errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, "role assignment failed")
 			return
 		}