From 255fc4bc92197fb018d4eca66877b5ab69b87c1e Mon Sep 17 00:00:00 2001
From: "A.Unger" <zyxancf@gmail.com>
Date: Thu, 4 Mar 2021 14:58:19 +0100
Subject: [PATCH] leftover comment

---
 ocis/pkg/runtime/runtime.go  | 23 ++++++++++----------
 storage/pkg/command/users.go | 41 ++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/ocis/pkg/runtime/runtime.go b/ocis/pkg/runtime/runtime.go
index 7500f9ffb4..1ed8b7e840 100644
--- a/ocis/pkg/runtime/runtime.go
+++ b/ocis/pkg/runtime/runtime.go
@@ -36,17 +36,17 @@ var (
 
 	// Extensions are oCIS extension services
 	Extensions = []string{
-		"glauth",           // done
-		"idp",              // done
-		"ocs",              // done
-		"onlyoffice",       // done
-		"proxy",            // done
-		"settings",         // done
-		"store",            // done
-		"storage-metadata", // done
-		"storage-frontend", // done
-		"storage-gateway",
-		"storage-userprovider",
+		"glauth",               // done
+		"idp",                  // done
+		"ocs",                  // done
+		"onlyoffice",           // done
+		"proxy",                // done
+		"settings",             // done
+		"store",                // done
+		"storage-metadata",     // done
+		"storage-frontend",     // done
+		"storage-gateway",      // done
+		"storage-userprovider", // done
 		"storage-groupprovider",
 		"storage-auth-basic",
 		"storage-auth-bearer",
@@ -129,6 +129,7 @@ func (r *Runtime) Start() error {
 	addServiceToken("webdav", supervisor.Add(webdav.NewSutureService(globalCtx, r.c.WebDAV)))
 	addServiceToken("frontend", supervisor.Add(storage.NewFrontend(globalCtx, r.c.Storage)))
 	addServiceToken("gateway", supervisor.Add(storage.NewGateway(globalCtx, r.c.Storage)))
+	addServiceToken("users", supervisor.Add(storage.NewUsersProviderService(globalCtx, r.c.Storage)))
 
 	// TODO(refs) debug line with supervised services.
 	go supervisor.ServeBackground()
diff --git a/storage/pkg/command/users.go b/storage/pkg/command/users.go
index c1771aa6fe..bad94a4c8f 100644
--- a/storage/pkg/command/users.go
+++ b/storage/pkg/command/users.go
@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+	"flag"
 	"os"
 	"os/signal"
 	"path"
@@ -205,3 +206,43 @@ func Users(cfg *config.Config) *cli.Command {
 		},
 	}
 }
+
+// UsersProviderService allows for the storage-userprovider command to be embedded and supervised by a suture supervisor tree.
+type UsersProviderService struct {
+	ctx    context.Context
+	cancel context.CancelFunc // used to cancel the context go-micro services used to shutdown a service.
+	cfg    *config.Config
+}
+
+// NewUsersProviderService creates a new gateway.UsersProviderService
+func NewUsersProviderService(ctx context.Context, cfg *config.Config) UsersProviderService {
+	sctx, cancel := context.WithCancel(ctx)
+	cfg.Context = sctx
+	return UsersProviderService{
+		ctx:    sctx,
+		cancel: cancel,
+		cfg:    cfg,
+	}
+}
+
+func (s UsersProviderService) Serve() {
+	f := &flag.FlagSet{}
+	for k := range Users(s.cfg).Flags {
+		if err := Users(s.cfg).Flags[k].Apply(f); err != nil {
+			return
+		}
+	}
+	ctx := cli.NewContext(nil, f, nil)
+	if Users(s.cfg).Before != nil {
+		if err := Users(s.cfg).Before(ctx); err != nil {
+			return
+		}
+	}
+	if err := Users(s.cfg).Action(ctx); err != nil {
+		return
+	}
+}
+
+func (s UsersProviderService) Stop() {
+	s.cancel()
+}