mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-07 04:40:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused config vars

Browse Source 
UsersCacheExpiration is referenced nowhere. Currently we don't have any
caching. LoginAttributes is not used by the reva userprovider.
This commit is contained in:
Ralf Haferkamp
2022-05-12 10:42:35 +02:00
parent c8279f7676
commit ae4e6e195f
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/users/pkg/config/config.go
View File

@@ -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"`

2
extensions/users/pkg/config/defaults/defaultconfig.go
View File

@@ -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",

1
extensions/users/pkg/revaconfig/config.go
View File

@@ -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,