From 3f1c36bd9a7416b77d3b04a9547929a1e608d23a Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Mon, 13 Nov 2017 18:43:37 +0200 Subject: [PATCH] fix some of the style bugs --- app/controllers/registrar/sessions_controller.rb | 12 ++++++------ app/models/api_user.rb | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/controllers/registrar/sessions_controller.rb b/app/controllers/registrar/sessions_controller.rb index fa8ab4a88..c39fa93d0 100644 --- a/app/controllers/registrar/sessions_controller.rb +++ b/app/controllers/registrar/sessions_controller.rb @@ -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) @@ -156,11 +156,11 @@ class Registrar def find_user_by_idc_and_allowed(idc) return User.new unless idc possible_users = ApiUser.where(identity_code: idc) || User.new - for i in 0..possible_users.count - if possible_users[i].registrar.white_ips.registrar_area.include_ip?(request.ip) - break - end - end + for i in 0..possible_users.count + if possible_users[i].registrar.white_ips.registrar_area.include_ip?(request.ip) + break + end + end possible_users[i] end diff --git a/app/models/api_user.rb b/app/models/api_user.rb index a6ec82b06..4f230d3b4 100644 --- a/app/models/api_user.rb +++ b/app/models/api_user.rb @@ -52,16 +52,16 @@ class ApiUser < User find_by(identity_code: identity_code) end - def find_by_idc_data_and_allowed(idc_data,ip) + def find_by_idc_data_and_allowed(idc_data, ip) return false if idc_data.blank? identity_code = idc_data.scan(/serialNumber=(\d+)/).flatten.first return false if ip.blank? possible_users = where(identity_code: identity_code) for i in 0..possible_users.count - if possible_users[i].registrar.white_ips.registrar_area.include_ip?(ip) - break - end + if possible_users[i].registrar.white_ips.registrar_area.include_ip?(ip) + break + end end possible_users[i] end