zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-30 06:26:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Use inflector rule to acronym Api to API"

Browse source 
This reverts commit 06f5eb10d4.
This commit is contained in:
Maciej Szlosarczyk 2018-07-24 12:53:51 +03:00
parent 90b2455032
commit aac76b333c
No known key found for this signature in database
GPG key ID: 41D62D42D3B0D765
25 changed files with 43 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/registrar/sessions_controller.rb
View file

@ -26,7 +26,7 @@ class Registrar
@depp_user.errors.add(:base, :webserver_client_cert_directive_should_be_required)
end
@api_user = APIUser.find_by(username: params[:depp_user][:tag], password: params[:depp_user][:password])
@api_user = ApiUser.find_by(username: params[:depp_user][:tag], password: params[:depp_user][:password])
unless @api_user
@depp_user.errors.add(:base, t(:no_such_user))
@ -53,7 +53,7 @@ class Registrar
end
def id
@user = APIUser.find_by_idc_data_and_allowed(request.env['SSL_CLIENT_S_DN'], request.ip)
@user = ApiUser.find_by_idc_data_and_allowed(request.env['SSL_CLIENT_S_DN'], request.ip)
if @user
sign_in(@user, event: :authentication)
@ -150,12 +150,12 @@ class Registrar
def find_user_by_idc(idc)
return User.new unless idc
APIUser.find_by(identity_code: idc) || User.new
ApiUser.find_by(identity_code: idc) || User.new
end
def find_user_by_idc_and_allowed(idc)
return User.new unless idc
possible_users = APIUser.where(identity_code: idc) || User.new
possible_users = ApiUser.where(identity_code: idc) || User.new
possible_users.each do |selected_user|
if selected_user.registrar.white_ips.registrar_area.include_ip?(request.ip)
return selected_user