From 68be48b95ae00069bb25c43f0b48d7e968ff89d7 Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Fri, 6 May 2022 12:52:47 +0200
Subject: [PATCH] use userprovider in owncloudsql storage and add gateway for
 sharing driver

---
 extensions/sharing/pkg/revaconfig/config.go   |  1 +
 extensions/storage-users/pkg/config/config.go |  2 +-
 .../pkg/config/defaults/defaultconfig.go      | 19 ++++++++++---------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/sharing/pkg/revaconfig/config.go b/extensions/sharing/pkg/revaconfig/config.go
index 6fdb79d3cd..10c2458511 100644
--- a/extensions/sharing/pkg/revaconfig/config.go
+++ b/extensions/sharing/pkg/revaconfig/config.go
@@ -41,6 +41,7 @@ func SharingConfigFromStruct(cfg *config.Config) map[string]interface{} {
 							"janitor_run_interval":          cfg.UserSharingDrivers.SQL.JanitorRunInterval,
 						},
 						"owncloudsql": map[string]interface{}{
+							"gateway_addr":     cfg.Reva.Address,
 							"storage_mount_id": cfg.UserSharingDrivers.OwnCloudSQL.UserStorageMountID,
 							"db_username":      cfg.UserSharingDrivers.OwnCloudSQL.DBUsername,
 							"db_password":      cfg.UserSharingDrivers.OwnCloudSQL.DBPassword,
diff --git a/extensions/storage-users/pkg/config/config.go b/extensions/storage-users/pkg/config/config.go
index be37a5bfbc..d740644999 100644
--- a/extensions/storage-users/pkg/config/config.go
+++ b/extensions/storage-users/pkg/config/config.go
@@ -129,7 +129,7 @@ type OwnCloudSQLDriver struct {
 	DBHost                string `yaml:"db_host" env:"STORAGE_USERS_OWNCLOUDSQL_DB_HOST"`
 	DBPort                int    `yaml:"db_port" env:"STORAGE_USERS_OWNCLOUDSQL_DB_PORT"`
 	DBName                string `yaml:"db_name" env:"STORAGE_USERS_OWNCLOUDSQL_DB_NAME"`
-	UsersProviderEndpoint string `yaml:"users_provider_endpoint" env:"STORAGE_USERS_PERMISSION_ENDPOINT;STORAGE_USERS_OWNCLOUDSQL_USERS_PROVIDER_ENDPOINT"`
+	UsersProviderEndpoint string `yaml:"users_provider_endpoint" env:"STORAGE_USERS_OWNCLOUDSQL_USERS_PROVIDER_ENDPOINT"`
 }
 
 type Events struct {
diff --git a/extensions/storage-users/pkg/config/defaults/defaultconfig.go b/extensions/storage-users/pkg/config/defaults/defaultconfig.go
index aec7a9d68c..3827096c9c 100644
--- a/extensions/storage-users/pkg/config/defaults/defaultconfig.go
+++ b/extensions/storage-users/pkg/config/defaults/defaultconfig.go
@@ -45,15 +45,16 @@ func DefaultConfig() *config.Config {
 		Driver:        "ocis",
 		Drivers: config.Drivers{
 			OwnCloudSQL: config.OwnCloudSQLDriver{
-				Root:          filepath.Join(defaults.BaseDataPath(), "storage", "owncloud"),
-				ShareFolder:   "/Shares",
-				UserLayout:    "{{.Username}}",
-				UploadInfoDir: filepath.Join(defaults.BaseDataPath(), "storage", "uploadinfo"),
-				DBUsername:    "owncloud",
-				DBPassword:    "owncloud",
-				DBHost:        "",
-				DBPort:        3306,
-				DBName:        "owncloud",
+				Root:                  filepath.Join(defaults.BaseDataPath(), "storage", "owncloud"),
+				ShareFolder:           "/Shares",
+				UserLayout:            "{{.Username}}",
+				UploadInfoDir:         filepath.Join(defaults.BaseDataPath(), "storage", "uploadinfo"),
+				DBUsername:            "owncloud",
+				DBPassword:            "owncloud",
+				DBHost:                "",
+				DBPort:                3306,
+				DBName:                "owncloud",
+				UsersProviderEndpoint: "localhost:9144",
 			},
 			S3NG: config.S3NGDriver{
 				Root:                       filepath.Join(defaults.BaseDataPath(), "storage", "users"),