authentication-zero 2.2.7 → 2.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 065a0e9195053ad906f495477bc12ffb7a299481f7ce1837389fe7123700b083
-  data.tar.gz: df7baaa9cc9ca5100664ab40884a4c6df62c7e92dc4497e050deb1ad2e91dea2
+  metadata.gz: b36f33fad8ac0fd532efd29f0db68dc51bcac45a8fff39d53f914d7d3f4381e6
+  data.tar.gz: f44735476b0095bd9f4c5dd9db09c16b9e8bc7edf636d32372da2a974bfe249b
 SHA512:
-  metadata.gz: b8506400f8d08c8bfdd0ecf43d25524deb75f23da5ea40dcfd8e9f8b983eded76219f4de68c0d8a31acbb58600992f1c1c6bd4f3da8e110c7985d276cfb7fa04
-  data.tar.gz: bfb7f162e36c9e31fef121998dd8b00aefe298b265a2fa781326a6090be2f788824f7d9fe9066909f80fb8a28f2385b807efbbfa68f71dc192e9d09ebefcf47c
+  metadata.gz: 1fb6d2a12d39475fa1ced3b188230426ad18fc67bef7c6f560e1744bc73b17e45b676bf8b68c79129474004fbe9e47150c4fd82b36cdd78555772df03f398d8b
+  data.tar.gz: 0d1b0553b77a69ee1a67546c9d2e749abf47481cc2cf7355eda039777ade3ad14d95531ea640b694d698ccac7f7603fdf1d70faf2e1efac2ab59c79b90613e09

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    authentication-zero (2.2.7)
+    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.7"
+  VERSION = "2.2.8"
 end

data/lib/generators/authentication/authentication_generator.rb

@@ -96,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,12 +1,12 @@
 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
-    @<%= singular_table_name %>.update! verified: true
+  def create
+    IdentityMailer.with(<%= singular_table_name %>: Current.<%= singular_table_name %>).email_verify_confirmation.deliver_later
   end
 
   private

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/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

@@ -1,5 +1,5 @@
 class EmailVerificationsController < ApplicationController
-  before_action :set_<%= singular_table_name %>, only: %i[ edit update ]
+  before_action :set_<%= singular_table_name %>, only: :edit
 
   def edit
     @<%= singular_table_name %>.update! verified: true

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/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/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.7
+  version: 2.2.8
 platform: ruby
 authors:
 - Nixon