diff --git a/extensions/users/pkg/config/config.go b/extensions/users/pkg/config/config.go index 57b3f95c1d..9242f3306a 100644 --- a/extensions/users/pkg/config/config.go +++ b/extensions/users/pkg/config/config.go @@ -20,9 +20,8 @@ type Config struct { SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"USERS_SKIP_USER_GROUPS_IN_TOKEN"` - UsersCacheExpiration int `yaml:"users_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:"-"` @@ -83,7 +82,6 @@ type LDAPDriver struct { GroupFilter string `yaml:"group_filter" env:"LDAP_GROUPFILTER;USERS_LDAP_USERFILTER"` UserObjectClass string `yaml:"user_object_class" env:"LDAP_USER_OBJECTCLASS;USERS_LDAP_USER_OBJECTCLASS"` GroupObjectClass string `yaml:"group_object_class" env:"LDAP_GROUP_OBJECTCLASS;USERS_LDAP_GROUP_OBJECTCLASS"` - LoginAttributes []string `yaml:"login_attributes" env:"LDAP_LOGIN_ATTRIBUTES;USERS_LDAP_LOGIN_ATTRIBUTES"` IDP string `yaml:"idp" env:"OCIS_URL;OCIS_OIDC_ISSUER;USERS_IDP_URL"` UserSchema LDAPUserSchema `yaml:"user_schema"` GroupSchema LDAPGroupSchema `yaml:"group_schema"` diff --git a/extensions/users/pkg/config/defaults/defaultconfig.go b/extensions/users/pkg/config/defaults/defaultconfig.go index e3c55943b5..89db09946f 100644 --- a/extensions/users/pkg/config/defaults/defaultconfig.go +++ b/extensions/users/pkg/config/defaults/defaultconfig.go @@ -30,7 +30,6 @@ func DefaultConfig() *config.Config { Service: config.Service{ Name: "users", }, - UsersCacheExpiration: 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/users/pkg/revaconfig/config.go b/extensions/users/pkg/revaconfig/config.go index 215e131d53..1c29ccd4ab 100644 --- a/extensions/users/pkg/revaconfig/config.go +++ b/extensions/users/pkg/revaconfig/config.go @@ -65,7 +65,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,