Refactor + tests

app/controllers/epp/sessions_controller.rb

@@ -18,7 +18,7 @@ class Epp::SessionsController < EppController
       @api_user = ApiUser.find_by(login_params)
     end
 
-    if @api_user.try(:active) && cert_valid
+    if @api_user.try(:active) && cert_valid && ip_white?
       if parsed_frame.css('newPW').first
         unless @api_user.update(password: parsed_frame.css('newPW').first.text)
           response.headers['X-EPP-Returncode'] = '2200'
@@ -33,6 +33,17 @@ class Epp::SessionsController < EppController
       render_epp_response('login_fail')
     end
   end
+
+  def ip_white?
+    if @api_user
+      unless @api_user.registrar.epp_ip_white?(request.ip)
+        @msg = t('ip_is_not_whitelisted')
+        return false
+      end
+    end
+    true
+  end
+
   # rubocop: enable Metrics/PerceivedComplexity
   # rubocop: enable Metrics/CyclomaticComplexity
 

app/controllers/epp_controller.rb

@@ -80,11 +80,7 @@ class EppController < ApplicationController
   end
 
   # VALIDATION
-  # rubocop: disable Metrics/PerceivedComplexity
-  # rubocop: disable Metrics/CyclomaticComplexity
   def validate_request
-    handle_errors and return unless ip_white?
-
     validation_method = "validate_#{params[:action]}"
     return unless respond_to?(validation_method, true)
     send(validation_method)
@@ -97,22 +93,6 @@ class EppController < ApplicationController
 
     handle_errors and return if epp_errors.any?
   end
-  # rubocop: enable Metrics/PerceivedComplexity
-  # rubocop: enable Metrics/CyclomaticComplexity
-
-  def ip_white?
-    if current_user
-      unless current_user.registrar.epp_ip_white?(request.ip)
-        epp_errors << {
-          msg: t('ip_is_not_whitelisted'),
-          code: '2201'
-        }
-        return false
-      end
-    end
-
-    true
-  end
 
   # let's follow grape's validations: https://github.com/intridea/grape/#parameter-validation-and-coercion