From 90b2455032d783acee4f87dca3f16850e70d80d1 Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej.szlosarczyk@eestiinternet.ee>
Date: Tue, 24 Jul 2018 12:18:38 +0300
Subject: [PATCH] Fix codeclimate issues

---
 app/controllers/api/v1/registrant/auth_controller.rb | 9 ++++-----
 app/controllers/api/v1/registrant/base_controller.rb | 4 ++--
 app/models/registrant_user.rb                        | 4 ++--
 lib/auth_token/auth_token_creator.rb                 | 8 ++++----
 lib/auth_token/auth_token_decryptor.rb               | 2 +-
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/controllers/api/v1/registrant/auth_controller.rb b/app/controllers/api/v1/registrant/auth_controller.rb
index 656d1b4eb..0e014da02 100644
--- a/app/controllers/api/v1/registrant/auth_controller.rb
+++ b/app/controllers/api/v1/registrant/auth_controller.rb
@@ -21,14 +21,14 @@ module API
           if token
             render json: token
           else
-            render json: { error: 'Cannot create generate session token'}
+            render json: { error: 'Cannot create generate session token' }
           end
         end
 
         private
 
         def eid_params
-          required_params = [:ident, :first_name, :last_name]
+          required_params = %i[ident first_name last_name]
           required_params.each_with_object(params) do |key, obj|
             obj.require(key)
           end
@@ -44,10 +44,9 @@ module API
 
         def check_ip_whitelist
           allowed_ips = ENV['registrant_api_auth_allowed_ips'].to_s.split(',').map(&:strip)
+          return if allowed_ips.include?(request.ip) || Rails.env.development?
 
-          unless allowed_ips.include?(request.ip) || Rails.env.development?
-            render json: { error: 'Not authorized' }, status: 401
-          end
+          render json: { error: 'Not authorized' }, status: :unauthorized
         end
       end
     end
diff --git a/app/controllers/api/v1/registrant/base_controller.rb b/app/controllers/api/v1/registrant/base_controller.rb
index 01101bfb2..99ff9d90b 100644
--- a/app/controllers/api/v1/registrant/base_controller.rb
+++ b/app/controllers/api/v1/registrant/base_controller.rb
@@ -19,7 +19,7 @@ module API
         def bearer_token
           pattern = /^Bearer /
           header  = request.headers['Authorization']
-          header.gsub(pattern, '') if header && header.match(pattern)
+          header.gsub(pattern, '') if header&.match(pattern)
         end
 
         def authenticate
@@ -29,7 +29,7 @@ module API
           if decryptor.valid?
             sign_in decryptor.user
           else
-            render json: { error: 'Not authorized' }, status: 401
+            render json: { error: 'Not authorized' }, status: :unauthorized
           end
         end
       end
diff --git a/app/models/registrant_user.rb b/app/models/registrant_user.rb
index 850675f5e..889f2ca4c 100644
--- a/app/models/registrant_user.rb
+++ b/app/models/registrant_user.rb
@@ -54,8 +54,8 @@ class RegistrantUser < User
       return false unless user_data[:first_name]
       return false unless user_data[:last_name]
 
-      user_data.each { |k, v| v.upcase! if v.is_a?(String) }
-      user_data[:country_code] ||= "EE"
+      user_data.each_value { |v| v.upcase! if v.is_a?(String) }
+      user_data[:country_code] ||= 'EE'
 
       find_or_create_by_user_data(user_data)
     end
diff --git a/lib/auth_token/auth_token_creator.rb b/lib/auth_token/auth_token_creator.rb
index 0597e0489..9fff8e5cd 100644
--- a/lib/auth_token/auth_token_creator.rb
+++ b/lib/auth_token/auth_token_creator.rb
@@ -6,20 +6,20 @@ class AuthTokenCreator
   attr_reader :expires_at
 
   def self.create_with_defaults(user)
-    self.new(user, Rails.application.config.secret_key_base, Time.now + DEFAULT_VALIDITY)
+    new(user, Rails.application.config.secret_key_base, Time.now + DEFAULT_VALIDITY)
   end
 
   def initialize(user, key, expires_at)
     @user = user
     @key = key
-    @expires_at = expires_at.utc.strftime("%F %T %Z")
+    @expires_at = expires_at.utc.strftime('%F %T %Z')
   end
 
   def hashable
     {
       user_ident: user.registrant_ident,
       user_username: user.username,
-      expires_at: expires_at
+      expires_at: expires_at,
     }.to_json
   end
 
@@ -35,7 +35,7 @@ class AuthTokenCreator
     {
       access_token: encrypted_token,
       expires_at: expires_at,
-      type: 'Bearer'
+      type: 'Bearer',
     }
   end
 end
diff --git a/lib/auth_token/auth_token_decryptor.rb b/lib/auth_token/auth_token_decryptor.rb
index 61146aa4d..be6bd99cd 100644
--- a/lib/auth_token/auth_token_decryptor.rb
+++ b/lib/auth_token/auth_token_decryptor.rb
@@ -5,7 +5,7 @@ class AuthTokenDecryptor
   attr_reader :user
 
   def self.create_with_defaults(token)
-    self.new(token, Rails.application.config.secret_key_base)
+    new(token, Rails.application.config.secret_key_base)
   end
 
   def initialize(token, key)