post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Revert "Merge"

Browse source 
This reverts commit 84eae6fac9.
This commit is contained in:
KMY（雪あすか） 2023-10-18 11:10:21 +09:00
parent 84eae6fac9
commit 9972dfae61
32 changed files with 591 additions and 561 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/validators/unreserved_username_validator.rb
View file

@ -11,31 +11,16 @@ class UnreservedUsernameValidator < ActiveModel::Validator
private
def reserved_username?
pam_username_reserved? || settings_username_reserved?
end
def pam_username_reserved?
pam_controlled? && pam_reserves_username?
end
def pam_controlled?
Devise.pam_authentication && Devise.pam_controlled_service
return false unless Devise.pam_authentication && Devise.pam_controlled_service
Rpam2.account(Devise.pam_controlled_service, @username).present?
end
def pam_reserves_username?
Rpam2.account(Devise.pam_controlled_service, @username)
end
def reserved_username?
return true if pam_controlled?
return false unless Setting.reserved_usernames
def settings_username_reserved?
settings_has_reserved_usernames? && settings_reserves_username?
end
def settings_has_reserved_usernames?
Setting.reserved_usernames.present?
end
def settings_reserves_username?
Setting.reserved_usernames.include?(@username.downcase)
end
end