Add rubocop-obsession

Author: KieranP

.rubocop.yml

@@ -7,6 +7,7 @@ require:
   - rubocop-rspec
   - rubocop-rspec_rails
   - rubocop-factory_bot
+  - rubocop-obsession
 
 AllCops:
   NewCops: enable
@@ -27,6 +28,9 @@ AllCops:
 FactoryBot/ExcessiveCreateList:
   Enabled: false
 
+Obsession/Graphql/MutationName:
+  Enabled: false
+
 RSpec/ExampleLength:
   Enabled: false
 

Gemfile

@@ -56,6 +56,7 @@ group :development do
   gem 'rubocop-rspec', require: false
   gem 'rubocop-rspec_rails', require: false
   gem 'rubocop-factory_bot', require: false
+  gem 'rubocop-obsession', require: false
   gem 'bundler-audit', require: false
   gem 'brakeman', require: false
   gem 'lefthook', require: false

Gemfile.lock

@@ -349,6 +349,9 @@ GEM
       parser (>= 3.3.1.0)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
+    rubocop-obsession (0.1.5)
+      activesupport
+      rubocop (~> 1.41)
     rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
@@ -456,6 +459,7 @@ DEPENDENCIES
   redis
   rspec-rails
   rubocop-factory_bot
+  rubocop-obsession
   rubocop-performance
   rubocop-rails
   rubocop-rspec

app/channels/application_cable/connection.rb

@@ -22,19 +22,19 @@ def jwt_payload
       @jwt_payload ||= jwt_token&.first
     end
 
-    def auth_token
-      @auth_token ||= begin
-        auth_token = request.headers['Authorization']
-        auth_token || cookies.signed['jwt_token']
-      end
-    end
-
     def jwt_token
       @jwt_token ||=
         if auth_token
           jwt_token = auth_token.remove('Bearer ')
           JwtToken.decode(jwt_token)
         end
     end
+
+    def auth_token
+      @auth_token ||= begin
+        auth_token = request.headers['Authorization']
+        auth_token || cookies.signed['jwt_token']
+      end
+    end
   end
 end

app/controllers/graphql_controller.rb

@@ -22,25 +22,22 @@ def execute
 
   private
 
-  def current_user
-    @current_user ||=
+  def update_session
+    current_session&.mark_visit!
+  end
+
+  def current_session
+    @current_session ||=
       if jwt_payload
-        uuid = jwt_payload.dig('user', 'uuid')
-        User.find_by(uuid: uuid)
+        jti = jwt_payload['jti']
+        Session.find_by(jwt_id: jti)
       end
   end
 
   def jwt_payload
     @jwt_payload ||= jwt_token&.first
   end
 
-  def auth_token
-    @auth_token ||= begin
-      auth_token = request.headers['Authorization']
-      auth_token || cookies.signed['jwt_token']
-    end
-  end
-
   def jwt_token
     @jwt_token ||=
       if auth_token
@@ -49,25 +46,11 @@ def jwt_token
       end
   end
 
-  def current_session
-    @current_session ||=
-      if jwt_payload
-        jti = jwt_payload['jti']
-        Session.find_by(jwt_id: jti)
-      end
-  end
-
-  def update_session
-    current_session&.mark_visit!
-  end
-
-  def invalid_jwt
-    render json: {
-      errors: [{
-        code: 401,
-        message: 'Invalid JWT Token',
-      }],
-    }
+  def auth_token
+    @auth_token ||= begin
+      auth_token = request.headers['Authorization']
+      auth_token || cookies.signed['jwt_token']
+    end
   end
 
   def schema_options
@@ -100,6 +83,23 @@ def ensure_hash(ambiguous_param)
     end
   end
 
+  def current_user
+    @current_user ||=
+      if jwt_payload
+        uuid = jwt_payload.dig('user', 'uuid')
+        User.find_by(uuid: uuid)
+      end
+  end
+
+  def invalid_jwt
+    render json: {
+      errors: [{
+        code: 401,
+        message: 'Invalid JWT Token',
+      }],
+    }
+  end
+
   def handle_error_in_development(err)
     logger.error(err.message)
     logger.error(err.backtrace.join("\n"))

app/graphql/loaders/association.rb

@@ -41,16 +41,16 @@ def validate
       raise ArgumentError, "No association #{@association_name} on #{@model}"
     end
 
-    def preload_association(records)
-      ::ActiveRecord::Associations::Preloader.new(records: records, associations: @association_name).call
+    def association_loaded?(record)
+      record.association(@association_name).loaded?
     end
 
     def read_association(record)
       record.public_send(@association_name)
     end
 
-    def association_loaded?(record)
-      record.association(@association_name).loaded?
+    def preload_association(records)
+      ::ActiveRecord::Associations::Preloader.new(records: records, associations: @association_name).call
     end
   end
 end

app/models/session.rb

@@ -27,12 +27,12 @@ class Session < ApplicationRecord
 
   belongs_to :user
 
-  before_validation :populate_jwt_id
-  before_validation :populate_expiration
-
   validates :jwt_id, presence: true
   validates :expires_at, presence: true
 
+  before_validation :populate_jwt_id
+  before_validation :populate_expiration
+
   def mark_visit!
     # rubocop:disable Rails/SkipsModelValidations
     update_column(:last_access_at, Time.zone.now)

app/models/user.rb

@@ -40,12 +40,12 @@ class User < ApplicationRecord
   has_many :sessions, dependent: :destroy
   has_many :posts, dependent: :destroy
 
-  before_validation :process_otp_action
-
   validates :email, presence: true, email: true, uniqueness: true
   validates :name, presence: true
   validates :password, format: { with: PASSWORD_FORMAT }, allow_blank: true
 
+  before_validation :process_otp_action
+
   def save_password_reset_token
     generate_unique_token(:password_reset_token)
     self.password_reset_sent_at = Time.zone.now
@@ -60,17 +60,6 @@ def otp_action=(input)
     @otp_action = input.to_h
   end
 
-  def process_otp_action
-    # otp_action = nil OR {} OR {enable:, code:}
-    return if @otp_action.blank?
-
-    if @otp_action[:enable]
-      enable_otp
-    else
-      disable_otp
-    end
-  end
-
   def enable_otp
     code = @otp_action[:code]
     if authenticate_otp(code, drift: 60)
@@ -89,4 +78,17 @@ def disable_otp
       errors.add(:otp_code)
     end
   end
+
+  private
+
+  def process_otp_action
+    # otp_action = nil OR {} OR {enable:, code:}
+    return if @otp_action.blank?
+
+    if @otp_action[:enable]
+      enable_otp
+    else
+      disable_otp
+    end
+  end
 end

db/migrate/20201205004037_create_sessions.rb

@@ -3,7 +3,7 @@
 class CreateSessions < ActiveRecord::Migration[6.0]
   def change
     create_table :sessions do |t|
-      t.references :user, null: false, foreign_key: true
+      t.belongs_to :user, null: false, foreign_key: true
       t.string :jwt_id, null: false
 
       t.timestamps

db/migrate/20201205020514_add_user_id_to_posts.rb

@@ -2,6 +2,6 @@
 
 class AddUserIdToPosts < ActiveRecord::Migration[6.0]
   def change
-    add_reference :posts, :user, foreign_key: true
+    add_belongs_to :posts, :user, foreign_key: true
   end
 end