From 7457117dbf1e0cdb34d0919361c2d0c4994c4c05 Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <rhaferkamp@owncloud.com>
Date: Thu, 12 May 2022 12:58:55 +0200
Subject: [PATCH] Remove unused config vars

GroupMembersCacheExpiration is referenced nowhere. Currently we don't
have any caching. LoginAttributes is not used by the reva groupprovider.
---
 extensions/groups/pkg/config/config.go        |  6 ++----
 .../pkg/config/defaults/defaultconfig.go      |  2 --
 extensions/groups/pkg/revaconfig/config.go    | 20 +++++++++----------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/extensions/groups/pkg/config/config.go b/extensions/groups/pkg/config/config.go
index ac7859ef3..d115b5725 100644
--- a/extensions/groups/pkg/config/config.go
+++ b/extensions/groups/pkg/config/config.go
@@ -20,9 +20,8 @@ type Config struct {
 
 	SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"GROUPS_SKIP_USER_GROUPS_IN_TOKEN"`
 
-	GroupMembersCacheExpiration int     `yaml:"group_members_cache_expiration"`
-	Driver                      string  `yaml:"driver"`
-	Drivers                     Drivers `yaml:"drivers"`
+	Driver  string  `yaml:"driver"`
+	Drivers Drivers `yaml:"drivers"`
 
 	Supervised bool            `yaml:"-"`
 	Context    context.Context `yaml:"-"`
@@ -79,7 +78,6 @@ type LDAPDriver struct {
 	GroupFilter      string          `yaml:"group_filter" env:"LDAP_GROUPFILTER;GROUPS_LDAP_USERFILTER"`
 	UserObjectClass  string          `yaml:"user_object_class" env:"LDAP_USER_OBJECTCLASS;GROUPS_LDAP_USER_OBJECTCLASS"`
 	GroupObjectClass string          `yaml:"group_object_class" env:"LDAP_GROUP_OBJECTCLASS;GROUPS_LDAP_GROUP_OBJECTCLASS"`
-	LoginAttributes  []string        `yaml:"login_attributes" env:"LDAP_LOGIN_ATTRIBUTES;GROUPS_LDAP_LOGIN_ATTRIBUTES"`
 	IDP              string          `yaml:"idp" env:"OCIS_URL;OCIS_OIDC_ISSUER;GROUPS_IDP_URL"`
 	UserSchema       LDAPUserSchema  `yaml:"user_schema"`
 	GroupSchema      LDAPGroupSchema `yaml:"group_schema"`
diff --git a/extensions/groups/pkg/config/defaults/defaultconfig.go b/extensions/groups/pkg/config/defaults/defaultconfig.go
index 98ad82649..459d6f097 100644
--- a/extensions/groups/pkg/config/defaults/defaultconfig.go
+++ b/extensions/groups/pkg/config/defaults/defaultconfig.go
@@ -30,7 +30,6 @@ func DefaultConfig() *config.Config {
 		Service: config.Service{
 			Name: "groups",
 		},
-		GroupMembersCacheExpiration: 5,
 		Reva: &config.Reva{
 			Address: "127.0.0.1:9142",
 		},
@@ -44,7 +43,6 @@ func DefaultConfig() *config.Config {
 				GroupBaseDN:      "ou=groups,o=libregraph-idm",
 				UserScope:        "sub",
 				GroupScope:       "sub",
-				LoginAttributes:  []string{"uid", "mail"},
 				UserFilter:       "",
 				GroupFilter:      "",
 				UserObjectClass:  "inetOrgPerson",
diff --git a/extensions/groups/pkg/revaconfig/config.go b/extensions/groups/pkg/revaconfig/config.go
index 4ccb98153..2bdae3d6e 100644
--- a/extensions/groups/pkg/revaconfig/config.go
+++ b/extensions/groups/pkg/revaconfig/config.go
@@ -31,16 +31,15 @@ func GroupsConfigFromStruct(cfg *config.Config) map[string]interface{} {
 						},
 						"ldap": ldapConfigFromString(cfg.Drivers.LDAP),
 						"rest": map[string]interface{}{
-							"client_id":                      cfg.Drivers.REST.ClientID,
-							"client_secret":                  cfg.Drivers.REST.ClientSecret,
-							"redis_address":                  cfg.Drivers.REST.RedisAddr,
-							"redis_username":                 cfg.Drivers.REST.RedisUsername,
-							"redis_password":                 cfg.Drivers.REST.RedisPassword,
-							"group_members_cache_expiration": cfg.GroupMembersCacheExpiration,
-							"id_provider":                    cfg.Drivers.REST.IDProvider,
-							"api_base_url":                   cfg.Drivers.REST.APIBaseURL,
-							"oidc_token_endpoint":            cfg.Drivers.REST.OIDCTokenEndpoint,
-							"target_api":                     cfg.Drivers.REST.TargetAPI,
+							"client_id":           cfg.Drivers.REST.ClientID,
+							"client_secret":       cfg.Drivers.REST.ClientSecret,
+							"redis_address":       cfg.Drivers.REST.RedisAddr,
+							"redis_username":      cfg.Drivers.REST.RedisUsername,
+							"redis_password":      cfg.Drivers.REST.RedisPassword,
+							"id_provider":         cfg.Drivers.REST.IDProvider,
+							"api_base_url":        cfg.Drivers.REST.APIBaseURL,
+							"oidc_token_endpoint": cfg.Drivers.REST.OIDCTokenEndpoint,
+							"target_api":          cfg.Drivers.REST.TargetAPI,
 						},
 					},
 				},
@@ -64,7 +63,6 @@ func ldapConfigFromString(cfg config.LDAPDriver) map[string]interface{} {
 		"group_filter":      cfg.GroupFilter,
 		"user_objectclass":  cfg.UserObjectClass,
 		"group_objectclass": cfg.GroupObjectClass,
-		"login_attributes":  cfg.LoginAttributes,
 		"idp":               cfg.IDP,
 		"user_schema": map[string]interface{}{
 			"id":              cfg.UserSchema.ID,