From 89ae20758d593bdea47c053c1d261f1071169d95 Mon Sep 17 00:00:00 2001
From: Ishank Arora <ishank011@gmail.com>
Date: Tue, 19 Oct 2021 11:32:41 +0200
Subject: [PATCH] Add sharees additional info paramater config to ocs

---
 changelog/unreleased/ocs-additional-info.md |  3 +++
 storage/pkg/command/frontend.go             | 11 ++++-----
 storage/pkg/config/config.go                | 25 +++++++++++----------
 storage/pkg/flagset/frontend.go             |  7 ++++++
 4 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 changelog/unreleased/ocs-additional-info.md

diff --git a/changelog/unreleased/ocs-additional-info.md b/changelog/unreleased/ocs-additional-info.md
new file mode 100644
index 00000000000..a2dcda8690f
--- /dev/null
+++ b/changelog/unreleased/ocs-additional-info.md
@@ -0,0 +1,3 @@
+Enhancement: Add sharees additional info paramater config to ocs
+
+https://github.com/owncloud/ocis/pull/2637
\ No newline at end of file
diff --git a/storage/pkg/command/frontend.go b/storage/pkg/command/frontend.go
index 9e14b53de50..42314de1b62 100644
--- a/storage/pkg/command/frontend.go
+++ b/storage/pkg/command/frontend.go
@@ -194,11 +194,12 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s
 					"public_url":       cfg.Reva.Frontend.PublicURL,
 				},
 				"ocs": map[string]interface{}{
-					"share_prefix":            cfg.Reva.Frontend.OCSSharePrefix,
-					"home_namespace":          cfg.Reva.Frontend.OCSHomeNamespace,
-					"resource_info_cache_ttl": cfg.Reva.Frontend.OCSResourceInfoCacheTTL,
-					"prefix":                  cfg.Reva.Frontend.OCSPrefix,
-					"cache_warmup_driver":     cfg.Reva.Frontend.OCSCacheWarmupDriver,
+					"share_prefix":              cfg.Reva.Frontend.OCSSharePrefix,
+					"home_namespace":            cfg.Reva.Frontend.OCSHomeNamespace,
+					"resource_info_cache_ttl":   cfg.Reva.Frontend.OCSResourceInfoCacheTTL,
+					"prefix":                    cfg.Reva.Frontend.OCSPrefix,
+					"additional_info_attribute": cfg.Reva.Frontend.OCSAdditionalInfoAttribute,
+					"cache_warmup_driver":       cfg.Reva.Frontend.OCSCacheWarmupDriver,
 					"cache_warmup_drivers": map[string]interface{}{
 						"cbox": map[string]interface{}{
 							"db_username": cfg.Reva.Sharing.UserSQLUsername,
diff --git a/storage/pkg/config/config.go b/storage/pkg/config/config.go
index 1d690507cfb..a18c19ce32b 100644
--- a/storage/pkg/config/config.go
+++ b/storage/pkg/config/config.go
@@ -144,18 +144,19 @@ type Groups struct {
 type FrontendPort struct {
 	Port
 
-	AppProviderPrefix       string
-	ArchiverPrefix          string
-	DatagatewayPrefix       string
-	Favorites               bool
-	OCDavPrefix             string
-	OCSPrefix               string
-	OCSSharePrefix          string
-	OCSHomeNamespace        string
-	PublicURL               string
-	OCSCacheWarmupDriver    string
-	OCSResourceInfoCacheTTL int
-	Middleware              Middleware
+	AppProviderPrefix          string
+	ArchiverPrefix             string
+	DatagatewayPrefix          string
+	Favorites                  bool
+	OCDavPrefix                string
+	OCSPrefix                  string
+	OCSSharePrefix             string
+	OCSHomeNamespace           string
+	PublicURL                  string
+	OCSCacheWarmupDriver       string
+	OCSAdditionalInfoAttribute string
+	OCSResourceInfoCacheTTL    int
+	Middleware                 Middleware
 }
 
 // Middleware configures reva middlewares.
diff --git a/storage/pkg/flagset/frontend.go b/storage/pkg/flagset/frontend.go
index 2e84707d191..5dd5b4525e1 100644
--- a/storage/pkg/flagset/frontend.go
+++ b/storage/pkg/flagset/frontend.go
@@ -179,6 +179,13 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_FRONTEND_OCS_CACHE_WARMUP_DRIVER"},
 			Destination: &cfg.Reva.Frontend.OCSCacheWarmupDriver,
 		},
+		&cli.StringFlag{
+			Name:        "ocs-additional-info-attribute",
+			Value:       flags.OverrideDefaultString(cfg.Reva.Frontend.OCSAdditionalInfoAttribute, "{{.Mail}}"),
+			Usage:       "the additional info to be returned when searching for users",
+			EnvVars:     []string{"STORAGE_FRONTEND_OCS_ADDITIONAL_INFO_ATTRIBUTE"},
+			Destination: &cfg.Reva.Frontend.OCSAdditionalInfoAttribute,
+		},
 		// Gateway
 
 		&cli.StringFlag{