authentication-zero 2.2.5 → 2.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbf5451c5736444444c73e85d59820172c61985c90393c5a3eb4fc7e92dd476e
-  data.tar.gz: f6bea74bc5e5334f27036ce75831562d3f0e95e9eaea76be7e5d1e799df2afd6
+  metadata.gz: b36f33fad8ac0fd532efd29f0db68dc51bcac45a8fff39d53f914d7d3f4381e6
+  data.tar.gz: f44735476b0095bd9f4c5dd9db09c16b9e8bc7edf636d32372da2a974bfe249b
 SHA512:
-  metadata.gz: a0ae090e81d5ffe5149c3d2dea1a1ca64071335829393700732458c1f6b4d8167335c23e74cf1370e49b7f14a1751ecfd28e3d68205b7303198544a4a209ec73
-  data.tar.gz: bd43ec57382214d285cdd556b68468096aad74b689e41df5cce770d5334b1d11e1858267fd31aedf7260509f34b7e95b41d6e8f3cd50dc64e63f5170bbcf1e15
+  metadata.gz: 1fb6d2a12d39475fa1ced3b188230426ad18fc67bef7c6f560e1744bc73b17e45b676bf8b68c79129474004fbe9e47150c4fd82b36cdd78555772df03f398d8b
+  data.tar.gz: 0d1b0553b77a69ee1a67546c9d2e749abf47481cc2cf7355eda039777ade3ad14d95531ea640b694d698ccac7f7603fdf1d70faf2e1efac2ab59c79b90613e09

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    authentication-zero (2.2.5)
+    authentication-zero (2.2.8)
 
 GEM
   remote: https://rubygems.org/

data/lib/authentication_zero/version.rb

@@ -1,3 +1,3 @@
 module AuthenticationZero
-  VERSION = "2.2.5"
+  VERSION = "2.2.8"
 end

data/lib/generators/authentication/authentication_generator.rb

@@ -38,7 +38,6 @@ class AuthenticationGenerator < Rails::Generators::NamedBase
   def create_fixture_file
     if options.fixture && options.fixture_replacement.nil?
       template "#{test_framework}/fixtures.yml", "test/fixtures/#{fixture_file_name}.yml"
-      template "#{test_framework}/sessions.yml", "test/fixtures/sessions.yml"
     end
   end
 
@@ -97,7 +96,7 @@ class AuthenticationGenerator < Rails::Generators::NamedBase
       route "resource :registration, only: :destroy"
       route "resource :password_reset, only: [:new, :edit, :create, :update]"
       route "resource :password, only: [:edit, :update]"
-      route "resource :email_verification, only: [:new, :edit, :create, :update]"
+      route "resource :email_verification, only: [:edit, :create]"
       route "resource :email, only: [:edit, :update]"
       route "resources :sessions, only: [:index, :show, :destroy]"
       route "post 'sign_up', to: 'registrations#create'"

data/lib/generators/authentication/templates/controllers/api/email_verifications_controller.rb.tt

@@ -1,22 +1,18 @@
 class EmailVerificationsController < ApplicationController
-  before_action :set_<%= singular_table_name %>, only: :update
+  before_action :set_<%= singular_table_name %>, only: :edit
 
-  def create
-    IdentityMailer.with(<%= singular_table_name %>: Current.<%= singular_table_name %>).email_verify_confirmation.deliver_later
+  def edit
+    @<%= singular_table_name %>.update! verified: true
   end
 
-  def update
-    if Current.<%= singular_table_name %>.email == params[:email]
-      @<%= singular_table_name %>.update! verified: true
-    else
-      render json: { error: "That email verification link is invalid" }, status: :bad_request
-    end
+  def create
+    IdentityMailer.with(<%= singular_table_name %>: Current.<%= singular_table_name %>).email_verify_confirmation.deliver_later
   end
 
   private
     def set_<%= singular_table_name %>
-      @<%= singular_table_name %> = <%= class_name %>.find_signed!(params[:token], purpose: params[:email])
-    rescue ActiveSupport::MessageVerifier::InvalidSignature
+      @<%= singular_table_name %> = <%= class_name %>.where(email: params[:email]).find_signed!(params[:token], purpose: params[:email])
+    rescue
       render json: { error: "That email verification link is invalid" }, status: :bad_request
     end
 end

data/lib/generators/authentication/templates/controllers/api/emails_controller.rb.tt

@@ -1,10 +1,9 @@
 class EmailsController < ApplicationController
   before_action :set_<%= singular_table_name %>
+  before_action :validate_current_password
 
   def update
-    if !@<%= singular_table_name %>.authenticate(params[:current_password])
-      render json: { error: "The current password you entered is incorrect" }, status: :bad_request
-    elsif @<%= singular_table_name %>.update(<%= "#{singular_table_name}_params" %>)
+    if @<%= singular_table_name %>.update(<%= "#{singular_table_name}_params" %>)
       render json: @<%= singular_table_name %>
     else
       render json: @<%= singular_table_name %>.errors, status: :unprocessable_entity
@@ -19,4 +18,10 @@ class EmailsController < ApplicationController
     def <%= "#{singular_table_name}_params" %>
       params.permit(:email)
     end
+
+    def validate_current_password
+      unless @<%= singular_table_name %>.authenticate(params[:current_password])
+        render json: { error: "The current password you entered is incorrect" }, status: :bad_request
+      end
+    end
 end

data/lib/generators/authentication/templates/controllers/api/password_resets_controller.rb.tt

@@ -22,7 +22,7 @@ class PasswordResetsController < ApplicationController
   private
     def set_<%= singular_table_name %>
       @<%= singular_table_name %> = <%= class_name %>.find_signed!(params[:token], purpose: :password_reset)
-    rescue ActiveSupport::MessageVerifier::InvalidSignature
+    rescue
       render json: { error: "That password reset link is invalid" }, status: :bad_request
     end
 

data/lib/generators/authentication/templates/controllers/api/passwords_controller.rb.tt

@@ -1,10 +1,9 @@
 class PasswordsController < ApplicationController
   before_action :set_<%= singular_table_name %>
+  before_action :validate_current_password
 
   def update
-    if !@<%= singular_table_name %>.authenticate(params[:current_password])
-      render json: { error: "The current password you entered is incorrect" }, status: :bad_request
-    elsif @<%= singular_table_name %>.update(<%= "#{singular_table_name}_params" %>)
+    if @<%= singular_table_name %>.update(<%= "#{singular_table_name}_params" %>)
       render json: @<%= singular_table_name %>
     else
       render json: @<%= singular_table_name %>.errors, status: :unprocessable_entity
@@ -19,4 +18,10 @@ class PasswordsController < ApplicationController
     def <%= "#{singular_table_name}_params" %>
       params.permit(:password, :password_confirmation)
     end
+
+    def validate_current_password
+      unless @<%= singular_table_name %>.authenticate(params[:current_password])
+        render json: { error: "The current password you entered is incorrect" }, status: :bad_request
+      end
+    end
 end

data/lib/generators/authentication/templates/controllers/api/sessions_controller.rb.tt

@@ -14,7 +14,7 @@ class SessionsController < ApplicationController
   def create
     @<%= singular_table_name %> = <%= class_name %>.find_by_email(params[:email])
 
-    if @<%= singular_table_name %>.try(:authenticate, params[:password])
+    if @<%= singular_table_name %> && @<%= singular_table_name %>.authenticate(params[:password])
       session = @<%= singular_table_name %>.sessions.create!(session_params)
       response.set_header("X-Session-Token", session.signed_id)
 

data/lib/generators/authentication/templates/controllers/html/email_verifications_controller.rb.tt

@@ -2,12 +2,8 @@ class EmailVerificationsController < ApplicationController
   before_action :set_<%= singular_table_name %>, only: :edit
 
   def edit
-    if Current.<%= singular_table_name %>.email == params[:email]
-      @<%= singular_table_name %>.update! verified: true
-      redirect_to root_path, notice: "Thank you for verifying your email address"
-    else
-      redirect_to edit_email_path, alert: "That email verification link is invalid"
-    end
+    @<%= singular_table_name %>.update! verified: true
+    redirect_to root_path, notice: "Thank you for verifying your email address"
   end
 
   def create
@@ -17,8 +13,8 @@ class EmailVerificationsController < ApplicationController
 
   private
     def set_<%= singular_table_name %>
-      @<%= singular_table_name %> = <%= class_name %>.find_signed!(params[:token], purpose: params[:email])
-    rescue ActiveSupport::MessageVerifier::InvalidSignature
+      @<%= singular_table_name %> = <%= class_name %>.where(email: params[:email]).find_signed!(params[:token], purpose: params[:email])
+    rescue
       redirect_to edit_email_path, alert: "That email verification link is invalid"
     end
 end

data/lib/generators/authentication/templates/controllers/html/emails_controller.rb.tt

@@ -1,13 +1,12 @@
 class EmailsController < ApplicationController
   before_action :set_<%= singular_table_name %>
+  before_action :validate_current_password, only: :update
 
   def edit
   end
 
   def update
-    if !@<%= singular_table_name %>.authenticate(params[:current_password])
-      redirect_to edit_email_path, alert: "The current password you entered is incorrect"
-    elsif @<%= singular_table_name %>.update(<%= "#{singular_table_name}_params" %>)
+    if @<%= singular_table_name %>.update(<%= "#{singular_table_name}_params" %>)
       redirect_to root_path, notice: "Your email has been changed"
     else
       render :edit, status: :unprocessable_entity
@@ -22,4 +21,10 @@ class EmailsController < ApplicationController
     def <%= "#{singular_table_name}_params" %>
       params.require(:<%= singular_table_name %>).permit(:email)
     end
+
+    def validate_current_password
+      unless @<%= singular_table_name %>.authenticate(params[:current_password])
+        redirect_to edit_email_path, alert: "The current password you entered is incorrect"
+      end
+    end
 end

data/lib/generators/authentication/templates/controllers/html/password_resets_controller.rb.tt

@@ -29,7 +29,7 @@ class PasswordResetsController < ApplicationController
   private
     def set_<%= singular_table_name %>
       @<%= singular_table_name %> = <%= class_name %>.find_signed!(params[:token], purpose: :password_reset)
-    rescue ActiveSupport::MessageVerifier::InvalidSignature
+    rescue
       redirect_to new_password_reset_path, alert: "That password reset link is invalid"
     end
 

data/lib/generators/authentication/templates/controllers/html/passwords_controller.rb.tt

@@ -1,13 +1,12 @@
 class PasswordsController < ApplicationController
   before_action :set_<%= singular_table_name %>
+  before_action :validate_current_password, only: :update
 
   def edit
   end
 
   def update
-    if !@<%= singular_table_name %>.authenticate(params[:current_password])
-      redirect_to edit_password_path, alert: "The current password you entered is incorrect"
-    elsif @<%= singular_table_name %>.update(<%= "#{singular_table_name}_params" %>)
+    if @<%= singular_table_name %>.update(<%= "#{singular_table_name}_params" %>)
       redirect_to root_path, notice: "Your password has been changed"
     else
       render :edit, status: :unprocessable_entity
@@ -22,4 +21,10 @@ class PasswordsController < ApplicationController
     def <%= "#{singular_table_name}_params" %>
       params.require(:<%= singular_table_name %>).permit(:password, :password_confirmation)
     end
+
+    def validate_current_password
+      unless @<%= singular_table_name %>.authenticate(params[:current_password])
+        redirect_to edit_password_path, alert: "The current password you entered is incorrect"
+      end
+    end
 end

data/lib/generators/authentication/templates/controllers/html/sessions_controller.rb.tt

@@ -14,7 +14,7 @@ class SessionsController < ApplicationController
   def create
     @<%= singular_table_name %> = <%= class_name %>.find_by_email(params[:email])
 
-    if @<%= singular_table_name %>.try(:authenticate, params[:password])
+    if @<%= singular_table_name %> && @<%= singular_table_name %>.authenticate(params[:password])
       session = @<%= singular_table_name %>.sessions.create!(session_params)
       cookies.signed.permanent[:session_token] = { value: session.id, httponly: true }
 

data/lib/generators/authentication/templates/models/model.rb.tt

@@ -11,12 +11,12 @@ class <%= class_name %> < ApplicationRecord
     self.email = email.downcase.strip
   end
 
-  after_create_commit do
-    IdentityMailer.with(<%= singular_table_name %>: self).email_verify_confirmation.deliver_later
+  before_validation if: :email_changed? do
+    self.verified = false
   end
 
-  after_update_commit if: :email_previously_changed? do
-    update_columns verified: false
+  after_create_commit do
+    IdentityMailer.with(<%= singular_table_name %>: self).email_verify_confirmation.deliver_later
   end
 
   after_update_commit if: :email_previously_changed? do

data/lib/generators/authentication/templates/test_unit/controllers/api/email_verifications_controller_test.rb.tt

@@ -18,12 +18,12 @@ class EmailVerificationsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should verify email" do
-    patch email_verification_url, params: { token: @sid, email: @<%= singular_table_name %>.email }, headers: { "Authorization" => "Bearer #{@token}" }
+    get edit_email_verification_url, params: { token: @sid, email: @<%= singular_table_name %>.email }, headers: { "Authorization" => "Bearer #{@token}" }
     assert_response :no_content
   end
 
   test "should not verify email with expired token" do
-    patch email_verification_url, params: { token: @sid_exp, email: @<%= singular_table_name %>.email }, headers: { "Authorization" => "Bearer #{@token}" }
+    get edit_email_verification_url, params: { token: @sid_exp, email: @<%= singular_table_name %>.email }, headers: { "Authorization" => "Bearer #{@token}" }
 
     assert_response :bad_request
     assert_equal "That email verification link is invalid", response.parsed_body["error"]
@@ -32,14 +32,13 @@ class EmailVerificationsControllerTest < ActionDispatch::IntegrationTest
   test "should not verify email with previous token" do
     @<%= singular_table_name %>.update! email: "other_email@hey.com"
 
-    patch email_verification_url, params: { token: @sid, email: @<%= singular_table_name %>.email_previously_was }, headers: { "Authorization" => "Bearer #{@token}" }
+    get edit_email_verification_url, params: { token: @sid, email: @<%= singular_table_name %>.email_previously_was }, headers: { "Authorization" => "Bearer #{@token}" }
 
     assert_response :bad_request
     assert_equal "That email verification link is invalid", response.parsed_body["error"]
   end
 
   def sign_in_as(<%= singular_table_name %>)
-    post(sign_in_url, params: { email: <%= singular_table_name %>.email, password: "secret123" })
-    [<%= singular_table_name %>, response.headers["X-Session-Token"]]
+    post(sign_in_url, params: { email: <%= singular_table_name %>.email, password: "secret123" }); [<%= singular_table_name %>, response.headers["X-Session-Token"]]
   end
 end

data/lib/generators/authentication/templates/test_unit/controllers/api/emails_controller_test.rb.tt

@@ -18,7 +18,6 @@ class EmailsControllerTest < ActionDispatch::IntegrationTest
   end
 
   def sign_in_as(<%= singular_table_name %>)
-    post(sign_in_url, params: { email: <%= singular_table_name %>.email, password: "secret123" })
-    [<%= singular_table_name %>, response.headers["X-Session-Token"]]
+    post(sign_in_url, params: { email: <%= singular_table_name %>.email, password: "secret123" }); [<%= singular_table_name %>, response.headers["X-Session-Token"]]
   end
 end

data/lib/generators/authentication/templates/test_unit/controllers/api/passwords_controller_test.rb.tt

@@ -18,7 +18,6 @@ class PasswordsControllerTest < ActionDispatch::IntegrationTest
   end
 
   def sign_in_as(<%= singular_table_name %>)
-    post(sign_in_url, params: { email: <%= singular_table_name %>.email, password: "secret123" })
-    [<%= singular_table_name %>, response.headers["X-Session-Token"]]
+    post(sign_in_url, params: { email: <%= singular_table_name %>.email, password: "secret123" }); [<%= singular_table_name %>, response.headers["X-Session-Token"]]
   end
 end

data/lib/generators/authentication/templates/test_unit/controllers/api/registrations_controller_test.rb.tt

@@ -20,7 +20,6 @@ class RegistrationsControllerTest < ActionDispatch::IntegrationTest
   end
 
   def sign_in_as(<%= singular_table_name %>)
-    post(sign_in_url, params: { email: <%= singular_table_name %>.email, password: "secret123" })
-    [<%= singular_table_name %>, response.headers["X-Session-Token"]]
+    post(sign_in_url, params: { email: <%= singular_table_name %>.email, password: "secret123" }); [<%= singular_table_name %>, response.headers["X-Session-Token"]]
   end
 end

data/lib/generators/authentication/templates/test_unit/controllers/api/sessions_controller_test.rb.tt

@@ -33,7 +33,6 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
   end
 
   def sign_in_as(<%= singular_table_name %>)
-    post(sign_in_url, params: { email: <%= singular_table_name %>.email, password: "secret123" })
-    [<%= singular_table_name %>, response.headers["X-Session-Token"]]
+    post(sign_in_url, params: { email: <%= singular_table_name %>.email, password: "secret123" }); [<%= singular_table_name %>, response.headers["X-Session-Token"]]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authentication-zero
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.8
 platform: ruby
 authors:
 - Nixon
@@ -76,7 +76,6 @@ files:
 - lib/generators/authentication/templates/test_unit/controllers/html/registrations_controller_test.rb.tt
 - lib/generators/authentication/templates/test_unit/controllers/html/sessions_controller_test.rb.tt
 - lib/generators/authentication/templates/test_unit/fixtures.yml.tt
-- lib/generators/authentication/templates/test_unit/sessions.yml.tt
 - lib/generators/authentication/templates/test_unit/system/emails_test.rb.tt
 - lib/generators/authentication/templates/test_unit/system/password_resets_test.rb.tt
 - lib/generators/authentication/templates/test_unit/system/passwords_test.rb.tt

data/lib/generators/authentication/templates/test_unit/sessions.yml.tt

@@ -1,6 +0,0 @@
-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-lazaro_nixon_ios:
-  <%= singular_table_name %>: lazaro_nixon
-  user_agent: Device iOS
-  ip_address: 127.0.0.1