Switch service LDAP attribute to serviceEnabled
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing

Improve internal naming on the way
This commit is contained in:
2024-03-13 16:41:49 +01:00
parent de20931d30
commit 4217ba52e0
3 changed files with 13 additions and 12 deletions

View File

@@ -168,21 +168,21 @@ class User < ApplicationRecord
end
def services_enabled
ldap_entry[:service] || []
ldap_entry[:services_enabled] || []
end
def enable_service(service)
current_services = services_enabled
new_services = Array(service).map(&:to_s)
services = (current_services + new_services).uniq
ldap.replace_attribute(dn, :service, services)
ldap.replace_attribute(dn, :serviceEnabled, services)
end
def disable_service(service)
current_services = services_enabled
disabled_services = Array(service).map(&:to_s)
services = (current_services - disabled_services).uniq
ldap.replace_attribute(dn, :service, services)
ldap.replace_attribute(dn, :serviceEnabled, services)
end
def disable_all_services

View File

@@ -74,9 +74,10 @@ class LdapService < ApplicationService
mail: e.try(:mail) ? e.mail.first : nil,
display_name: e.try(:displayName) ? e.displayName.first : nil,
admin: e.try(:admin) ? 'admin' : nil,
service: e.try(:service),
services_enabled: e.try(:serviceEnabled),
email_maildrop: e.try(:mailRoutingAddress),
email_password: e.try(:mailpassword)
email_password: e.try(:mailpassword),
nostr_key: e.try(:nostrKey)
}
end
end