sharpen userlog service

Signed-off-by: jkoberg <jkoberg@owncloud.com>

services/userlog/pkg/command/root.go

@@ -43,7 +43,7 @@ type SutureService struct {
 
 // NewSutureService creates a new userlog.SutureService
 func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Notifications.Commons = cfg.Commons
+	cfg.Userlog.Commons = cfg.Commons
 	return SutureService{
 		cfg: cfg.Userlog,
 	}

services/userlog/pkg/command/server.go

@@ -3,25 +3,58 @@ package command
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/cs3org/reva/v2/pkg/events"
 	"github.com/cs3org/reva/v2/pkg/events/stream"
+	"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
+	"github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
 	ogrpc "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
+	"github.com/owncloud/ocis/v2/ocis-pkg/store"
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
+	ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0"
 	"github.com/owncloud/ocis/v2/services/userlog/pkg/config"
 	"github.com/owncloud/ocis/v2/services/userlog/pkg/config/parser"
 	"github.com/owncloud/ocis/v2/services/userlog/pkg/logging"
 	"github.com/owncloud/ocis/v2/services/userlog/pkg/metrics"
 	"github.com/owncloud/ocis/v2/services/userlog/pkg/server/http"
 	"github.com/urfave/cli/v2"
-	"go-micro.dev/v4/store"
 )
 
 // all events we care about
 var _registeredEvents = []events.Unmarshaller{
+	// file related
 	events.UploadReady{},
+	events.ContainerCreated{},
+	events.FileTouched{},
+	events.FileDownloaded{},
+	events.FileVersionRestored{},
+	events.ItemMoved{},
+	events.ItemTrashed{},
+	events.ItemPurged{},
+	events.ItemRestored{},
+
+	// space related
+	events.SpaceCreated{},
+	events.SpaceRenamed{},
+	events.SpaceEnabled{},
+	events.SpaceDisabled{},
+	events.SpaceDeleted{},
+	events.SpaceShared{},
+	events.SpaceUnshared{},
+	events.SpaceUpdated{},
+	events.SpaceMembershipExpired{},
+
+	// share related
+	events.ShareCreated{},
+	// events.ShareRemoved{}, // TODO: ShareRemoved doesn't hold sharee information
+	events.ShareUpdated{},
+	events.ShareExpired{},
+	events.LinkCreated{},
+	// events.LinkRemoved{}, // TODO: LinkRemoved doesn't hold sharee information
+	events.LinkUpdated{},
 }
 
 // Server is the entrypoint for the server command.
@@ -48,7 +81,9 @@ func Server(cfg *config.Config) *cli.Command {
 				}
 				return context.WithCancel(cfg.Context)
 			}()
+
 			mtrcs := metrics.New()
+			mtrcs.BuildInfo.WithLabelValues(version.GetString()).Set(1)
 
 			defer cancel()
 
@@ -57,15 +92,27 @@ func Server(cfg *config.Config) *cli.Command {
 				return err
 			}
 
-			var st store.Store
-			switch cfg.Store.Type {
-			case "inmemory":
-				st = store.NewMemoryStore()
-			default:
-				return fmt.Errorf("unknown store '%s' configured", cfg.Store.Type)
+			st := store.Create(
+				store.Type(cfg.Store.Type),
+				store.Addresses(strings.Split(cfg.Store.Addresses, ",")...),
+				store.Database(cfg.Store.Database),
+				store.Table(cfg.Store.Table),
+			)
+
+			tm, err := pool.StringToTLSMode(cfg.GRPCClientTLS.Mode)
+			if err != nil {
+				return err
+			}
+			gwclient, err := pool.GetGatewayServiceClient(
+				cfg.RevaGateway,
+				pool.WithTLSCACert(cfg.GRPCClientTLS.CACert),
+				pool.WithTLSMode(tm),
+			)
+			if err != nil {
+				return fmt.Errorf("could not get reva client: %s", err)
 			}
 
-			mtrcs.BuildInfo.WithLabelValues(version.GetString()).Set(1)
+			hClient := ehsvc.NewEventHistoryService("com.owncloud.api.eventhistory", grpc.DefaultClient())
 
 			{
 				server, err := http.Server(
@@ -75,6 +122,8 @@ func Server(cfg *config.Config) *cli.Command {
 					http.Metrics(mtrcs),
 					http.Store(st),
 					http.Consumer(consumer),
+					http.Gateway(gwclient),
+					http.History(hClient),
 					http.RegisteredEvents(_registeredEvents),
 				)