Refactor Admin authentication related code

app/controllers/admin/base_controller.rb

@@ -1,10 +1,12 @@
 class Admin::BaseController < ApplicationController
  before_action :authenticate_admin!, :set_current_site
 
- helper_method :current_admin, :admin_signed_in?, :current_site
+ helper_method :current_admin, :current_site, :admin_signed_in?
 
  layout "admin"
 
+ private
+
  def current_admin
  @current_admin ||= find_current_admin
  end
@@ -26,11 +28,9 @@ def sign_out_admin
  end
 
  def authenticate_admin!
- admin_not_signed_in unless admin_signed_in?
+ raise_admin_not_signed_in unless admin_signed_in?
  end
 
- private
-
  def find_current_admin
  Admin.confirmed.find_by(id: session[:admin_id])
  end
@@ -43,16 +43,16 @@ def after_sign_out_path
  admin_root_path
  end
 
- def admin_not_signed_in
+ def raise_admin_not_signed_in
  redirect_to(
  new_admin_sessions_path,
  alert: "We need you to sign in to continue." # TODO. Missing localization.
  )
  end
 
- def admin_not_authorized
+ def raise_admin_not_authorized
  redirect_to(
- request.referrer || root_path,
+ request.referrer || admin_root_path,
  alert: "You are not authorized to perform this action." # TODO. Missing localization.
  )
  end

app/models/admin.rb

@@ -1,6 +1,6 @@
 class Admin < ApplicationRecord
- include Authenticable
- include Confirmable
+ include Authentication::Authenticable
+ include Authentication::Confirmable
 
  EMAIL_ADDRESS_REGEXP = /\A(.+)@(.+\..+)\z/
 

app/models/concerns/authenticable.rb → app/models/concerns/authentication/authenticable.rb

@@ -1,4 +1,4 @@
-module Authenticable
+module Authentication::Authenticable
  extend ActiveSupport::Concern
 
  included do

app/models/concerns/confirmable.rb → app/models/concerns/authentication/confirmable.rb

@@ -1,7 +1,11 @@
-module Confirmable
+module Authentication::Confirmable
  extend ActiveSupport::Concern
 
  included do
+ has_secure_token :confirmation_token
+
+ after_commit :send_confirmation_email, on: :create
+
  scope :confirmed, -> { where(confirmation_token: nil) }
  end
 
@@ -14,4 +18,12 @@ def confirm!
 
  update_columns(confirmation_token: nil)
  end
+
+ private
+
+ def send_confirmation_email
+ # TODO. Implement confirmation email delivery logic.
+
+ true
+ end
 end

test/models/admin_test.rb

@@ -13,6 +13,12 @@ def test_valid
  assert admin.valid?
  end
 
+ # -- Authentication::Authenticable
+ def test_password_authentication
+ assert admin.authenticate("gobierto")
+ end
+
+ # -- Authentication::Confirmable
  def test_confirmed_scope
  subject = Admin.confirmed