authentication-zero 2.16.4 → 2.16.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32a85d186a97bb53ee18ac30be1acdd6eb64716c7ed30fd0cfe4d52afca0d990
-  data.tar.gz: b155fd90fe8df3d548cd6cfa5c2b3cbf7bea30ffa23db6c3381a68b1b1d0c3ed
+  metadata.gz: d512c515587bc57bb47c2f89b27eea08f96a74c440bb0d404756613fa0cdbec5
+  data.tar.gz: 7b9781caa350fe751d9b2799d186b73a563bc4d108051b9a9491b09a45bb6e9e
 SHA512:
-  metadata.gz: 5c0d67ddd39e6698f383ec398d32e3f7884776adb42a9d2724498007458760e9558310fab74609c151ce6eae633d83a55be366f978d457efe5ae433118a236e5
-  data.tar.gz: b710950c1407acdf4a689a7e5858aafd344248f8f5917af5207db04b4d24828499fd4f1a61d54a7463b69b3866aeed499b900eff86e28072c613c871c6c97e24
+  metadata.gz: 4e0c90d112f6187a644841f3e394c9435eb9e9b9faf96109b29b16a96443ffeda5f3f375d8ba9b987742288807dab06e79a156f5b0a70d1794d81242a4f44c25
+  data.tar.gz: 8b79ad8fcc211053fe15ffcabac6ffd7033c7d1d093d715bf5cb6ceffbf595718f7f85d14b94e90d8170bb78c676a6890e4c0a76b3707034252073c580af6fac

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## Authentication Zero 2.16.6 ##
+
+* Remove passwordless from api template
+* Remove sudoable, I want to make things simple for new users,
+  and it will became even simpler with the new rails 7.1 "password challenge api"
+
+## Authentication Zero 2.16.5 ##
+
+* Revoke all password reset tokens (security enhancement)
+* Sign in without password (new feature)
+
 ## Authentication Zero 2.16.4 (February 11, 2023) ##
 
 * Increase attemps for lockable sign-in

data/Gemfile.lock

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

data/README.md

@@ -27,11 +27,11 @@ Since Authentication Zero generates this code into your application instead of b
 - Checks if a password has been found in any data breach (--pwned)
 - Authentication by cookie
 - Authentication by token (--api)
+- Passwordless authentication (--passwordless)
 - Two factor authentication (--two-factor)
 - Social Login with OmniAuth (--omniauthable)
 - Verify email using a link with token
 - Verify email using a six random digits code for api (--code-verifiable)
-- Ask password before sensitive data changes, aka: sudo (--sudoable)
 - Reset the user password and send reset instructions
 - Reset the user password only from verified emails
 - Lock mechanism for resetting password and sign-in (--lockable)
@@ -41,17 +41,17 @@ Since Authentication Zero generates this code into your application instead of b
 - Activity log (--trackable)
 - Log out
 
-## Security and best practices
+## Generated code
 
-- [has_secure_password](https://api.rubyonrails.org/classes/ActiveModel/SecurePassword/ClassMethods.html#method-i-has_secure_password): Adds methods to set and authenticate against a BCrypt password.
+- [has_secure_password](https://api.rubyonrails.org/classes/ActiveModel/SecurePassword/ClassMethods.html#method-i-has_secure_password): Adds methods to set and authenticate against a bcrypt password.
 - [signed cookies](https://api.rubyonrails.org/classes/ActionDispatch/Cookies.html): Returns a jar that'll automatically generate a signed representation of cookie value and verify it when reading from the cookie again.
 - [httponly cookies](https://api.rubyonrails.org/classes/ActionDispatch/Cookies.html): A cookie with the httponly attribute is inaccessible to the JavaScript, this precaution helps mitigate cross-site scripting (XSS) attacks.
 - [signed_id](https://api.rubyonrails.org/classes/ActiveRecord/SignedId.html): Returns a signed id that is tamper proof, so it's safe to send in an email or otherwise share with the outside world.
-- [Current attributes](https://api.rubyonrails.org/classes/ActiveSupport/CurrentAttributes.html): Abstract super class that provides a thread-isolated attributes singleton, which resets automatically before and after each request.
-- [Action mailer](https://api.rubyonrails.org/classes/ActionMailer/Base.html): Action Mailer allows you to send email from your application using a mailer model and views.
-- [Log filtering](https://guides.rubyonrails.org/action_controller_overview.html#log-filtering): Parameters 'token' and 'password' are marked [FILTERED] in the log.
-- [Functional Tests](https://guides.rubyonrails.org/testing.html#functional-tests-for-your-controllers): In Rails, testing the various actions of a controller is a form of writing functional tests.
-- [System Testing](https://guides.rubyonrails.org/testing.html#system-testing): System tests allow you to test user interactions with your application, running tests in either a real or a headless browser.
+- [current attributes](https://api.rubyonrails.org/classes/ActiveSupport/CurrentAttributes.html): Abstract super class that provides a thread-isolated attributes singleton, which resets automatically before and after each request.
+- [action mailer](https://api.rubyonrails.org/classes/ActionMailer/Base.html): Action Mailer allows you to send email from your application using a mailer model and views.
+- [log filtering](https://guides.rubyonrails.org/action_controller_overview.html#log-filtering): Parameters 'token' and 'password' are marked [FILTERED] in the log.
+- [functional tests](https://guides.rubyonrails.org/testing.html#functional-tests-for-your-controllers): In Rails, testing the various actions of a controller is a form of writing functional tests.
+- [system testing](https://guides.rubyonrails.org/testing.html#system-testing): System tests allow you to test user interactions with your application, running tests in either a real or a headless browser.
 
 ## Development
 

data/lib/authentication_zero/version.rb

@@ -1,3 +1,3 @@
 module AuthenticationZero
-  VERSION = "2.16.4"
+  VERSION = "2.16.6"
 end

data/lib/generators/authentication/authentication_generator.rb

@@ -6,8 +6,8 @@ class AuthenticationGenerator < Rails::Generators::Base
   class_option :api,             type: :boolean, desc: "Generates API authentication"
   class_option :pwned,           type: :boolean, desc: "Add pwned password validation"
   class_option :code_verifiable, type: :boolean, desc: "Add email verification using a code for api"
-  class_option :sudoable,        type: :boolean, desc: "Add password request before sensitive data changes"
   class_option :lockable,        type: :boolean, desc: "Add password reset locking"
+  class_option :passwordless,    type: :boolean, desc: "Add passwordless sign"
   class_option :omniauthable,    type: :boolean, desc: "Add social login support"
   class_option :trackable,       type: :boolean, desc: "Add activity log support"
   class_option :two_factor,      type: :boolean, desc: "Add two factor authentication"
@@ -52,6 +52,7 @@ class AuthenticationGenerator < Rails::Generators::Base
     migration_template "migrations/create_sessions_migration.rb", "#{db_migrate_path}/create_sessions.rb"
     migration_template "migrations/create_email_verification_tokens_migration.rb", "#{db_migrate_path}/create_email_verification_tokens.rb"
     migration_template "migrations/create_password_reset_tokens_migration.rb", "#{db_migrate_path}/create_password_reset_tokens.rb"
+    migration_template "migrations/create_sign_in_tokens_migration.rb", "#{db_migrate_path}/create_sign_in_tokens_migration.rb" if passwordless?
     migration_template "migrations/create_events_migration.rb", "#{db_migrate_path}/create_events.rb" if options.trackable?
   end
 
@@ -60,6 +61,7 @@ class AuthenticationGenerator < Rails::Generators::Base
     template "models/session.rb", "app/models/session.rb"
     template "models/email_verification_token.rb", "app/models/email_verification_token.rb"
     template "models/password_reset_token.rb", "app/models/password_reset_token.rb"
+    template "models/sign_in_token.rb", "app/models/sign_in_token.rb" if passwordless?
     template "models/current.rb", "app/models/current.rb"
     template "models/event.rb", "app/models/event.rb" if options.trackable?
   end
@@ -77,8 +79,8 @@ class AuthenticationGenerator < Rails::Generators::Base
     template  "controllers/#{format_folder}/passwords_controller.rb", "app/controllers/passwords_controller.rb"
     template  "controllers/#{format_folder}/registrations_controller.rb", "app/controllers/registrations_controller.rb"
     template  "controllers/#{format_folder}/home_controller.rb", "app/controllers/home_controller.rb" unless options.api?
-    template  "controllers/#{format_folder}/sessions/sudos_controller.rb", "app/controllers/sessions/sudos_controller.rb" if options.sudoable?
     template  "controllers/#{format_folder}/sessions/omniauth_controller.rb", "app/controllers/sessions/omniauth_controller.rb" if omniauthable?
+    template  "controllers/#{format_folder}/sessions/passwordlesses_controller.rb", "app/controllers/sessions/passwordlesses_controller.rb" if passwordless?
     template  "controllers/#{format_folder}/authentications/events_controller.rb", "app/controllers/authentications/events_controller.rb" if options.trackable?
   end
 
@@ -96,10 +98,10 @@ class AuthenticationGenerator < Rails::Generators::Base
       directory "erb/passwords", "app/views/passwords"
       directory "erb/registrations", "app/views/registrations"
 
-      template  "erb/sessions/index.html.erb", "app/views/sessions/index.html.erb"
-      template  "erb/sessions/new.html.erb", "app/views/sessions/new.html.erb"
+      template "erb/sessions/index.html.erb", "app/views/sessions/index.html.erb"
+      template "erb/sessions/new.html.erb", "app/views/sessions/new.html.erb"
 
-      directory "erb/sessions/sudos", "app/views/sessions/sudos" if options.sudoable?
+      directory "erb/sessions/passwordlesses", "app/views/sessions/passwordlesses" if passwordless?
 
       directory "erb/two_factor_authentication", "app/views/two_factor_authentication" if two_factor?
       directory "erb/authentications/events", "app/views/authentications/events" if options.trackable?
@@ -113,6 +115,10 @@ class AuthenticationGenerator < Rails::Generators::Base
   def add_routes
     route "root 'home#index'" unless options.api?
 
+    if passwordless?
+      route "resource :passwordless, only: [:new, :edit, :create]", namespace: :sessions
+    end
+
     if omniauthable?
       route "post '/auth/:provider/callback', to: 'sessions/omniauth#create'"
       route "get  '/auth/:provider/callback', to: 'sessions/omniauth#create'"
@@ -131,7 +137,6 @@ class AuthenticationGenerator < Rails::Generators::Base
     route "resource :password_reset,     only: [:new, :edit, :create, :update]", namespace: :identity
     route "resource :email_verification, only: [:edit, :create]", namespace: :identity
     route "resource :email,              only: [:edit, :update]", namespace: :identity
-    route "resource :sudo, only: [:new, :create]", namespace: :sessions if options.sudoable?
     route "resource  :password, only: [:edit, :update]"
     route "resources :sessions, only: [:index, :show, :destroy]"
     route "post 'sign_up', to: 'registrations#create'"
@@ -157,6 +162,10 @@ class AuthenticationGenerator < Rails::Generators::Base
       options.omniauthable? && !options.api?
     end
 
+    def passwordless?
+      options.passwordless? && !options.api?
+    end
+
     def two_factor?
       options.two_factor? && !options.api?
     end
@@ -166,6 +175,6 @@ class AuthenticationGenerator < Rails::Generators::Base
     end
 
     def redis?
-      options.lockable? || options.sudoable? || code_verifiable?
+      options.lockable? || code_verifiable?
     end
 end

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

@@ -3,13 +3,6 @@ class ApplicationController < ActionController::API
 
   before_action :set_current_request_details
   before_action :authenticate
-  <%- if options.sudoable? %>
-  def require_sudo
-    unless Current.session.sudo?
-      render json: { error: "Enter your password to continue" }, status: :forbidden
-    end
-  end
-  <%- end -%>
   <%- if options.lockable? %>
   def require_lock(wait: 1.hour, attempts: 10)
     counter = Kredis.counter("require_lock:#{request.remote_ip}:#{params[:controller]}:#{params[:action]}", expires_in: wait)

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

@@ -1,11 +1,10 @@
 class Identity::EmailsController < ApplicationController
-  <%- if options.sudoable? -%>
-  before_action :require_sudo
-  <%- end -%>
   before_action :set_user
 
   def update
-    if @user.update(user_params)
+   if !@user.authenticate(params[:current_password])
+      render json: { error: "The password you entered is incorrect" }, status: :bad_request
+    elsif @user.update(user_params)
       render_show
     else
       render json: @user.errors, status: :unprocessable_entity

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

@@ -1,10 +1,10 @@
 class Identity::PasswordResetsController < ApplicationController
   skip_before_action :authenticate
 
-  before_action :set_user, only: :update
   <%- if options.lockable? -%>
   before_action :require_lock, only: :create
   <%- end -%>
+  before_action :set_user, only: :update
 
   def create
     if @user = User.find_by(email: params[:email], verified: true)
@@ -16,7 +16,7 @@ class Identity::PasswordResetsController < ApplicationController
 
   def update
     if @user.update(user_params)
-      @token.destroy; render json: @user
+      revoke_tokens; render(json: @user)
     else
       render json: @user.errors, status: :unprocessable_entity
     end
@@ -32,4 +32,8 @@ class Identity::PasswordResetsController < ApplicationController
     def user_params
       params.permit(:password, :password_confirmation)
     end
+
+    def revoke_tokens
+      @user.password_reset_tokens.delete_all
+    end
 end

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

@@ -1,17 +1,6 @@
 class ApplicationController < ActionController::Base
   before_action :set_current_request_details
   before_action :authenticate
-  <%- if options.sudoable? %>
-  def require_sudo
-    <%- if omniauthable? -%>
-    unless Current.session.sudo? || Current.session.user.provider.present?
-    <%- else -%>
-    unless Current.session.sudo?
-    <%- end -%>
-      redirect_to new_sessions_sudo_path(proceed_to_url: request.url)
-    end
-  end
-  <%- end -%>
   <%- if options.lockable? %>
   def require_lock(wait: 1.hour, attempts: 10)
     counter = Kredis.counter("require_lock:#{request.remote_ip}:#{params[:controller]}:#{params[:action]}", expires_in: wait)

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

@@ -9,7 +9,7 @@ class Identity::EmailVerificationsController < ApplicationController
   end
 
   def create
-    UserMailer.with(user: Current.user).email_verification.deliver_later
+    send_email_verification
     redirect_to root_path, notice: "We sent a verification email to your email address"
   end
 
@@ -19,4 +19,8 @@ class Identity::EmailVerificationsController < ApplicationController
     rescue
       redirect_to edit_identity_email_path, alert: "That email verification link is invalid"
     end
+
+    def send_email_verification
+      UserMailer.with(user: Current.user).email_verification.deliver_later
+    end
 end

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

@@ -1,14 +1,13 @@
 class Identity::EmailsController < ApplicationController
-  <%- if options.sudoable? -%>
-  before_action :require_sudo
-  <%- end -%>
   before_action :set_user
 
   def edit
   end
 
   def update
-    if @user.update(user_params)
+   if !@user.authenticate(params[:current_password])
+      redirect_to edit_identity_email_path, alert: "The password you entered is incorrect"
+    elsif @user.update(user_params)
       redirect_to_root
     else
       render :edit, status: :unprocessable_entity

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

@@ -1,10 +1,10 @@
 class Identity::PasswordResetsController < ApplicationController
   skip_before_action :authenticate
 
-  before_action :set_user, only: %i[ edit update ]
   <%- if options.lockable? -%>
   before_action :require_lock, only: :create
   <%- end -%>
+  before_action :set_user, only: %i[ edit update ]
 
   def new
   end
@@ -14,7 +14,7 @@ class Identity::PasswordResetsController < ApplicationController
 
   def create
     if @user = User.find_by(email: params[:email], verified: true)
-      UserMailer.with(user: @user).password_reset.deliver_later
+      send_password_reset_email
       redirect_to sign_in_path, notice: "Check your email for reset instructions"
     else
       redirect_to new_identity_password_reset_path, alert: "You can't reset your password until you verify your email"
@@ -23,7 +23,7 @@ class Identity::PasswordResetsController < ApplicationController
 
   def update
     if @user.update(user_params)
-      @token.destroy; redirect_to(sign_in_path, notice: "Your password was reset successfully. Please sign in")
+      revoke_tokens; redirect_to(sign_in_path, notice: "Your password was reset successfully. Please sign in")
     else
       render :edit, status: :unprocessable_entity
     end
@@ -39,4 +39,12 @@ class Identity::PasswordResetsController < ApplicationController
     def user_params
       params.permit(:password, :password_confirmation)
     end
+
+    def send_password_reset_email
+      UserMailer.with(user: @user).password_reset.deliver_later
+    end
+
+    def revoke_tokens
+      @user.password_reset_tokens.delete_all
+    end
 end

data/lib/generators/authentication/templates/controllers/html/sessions/passwordlesses_controller.rb.tt

@@ -0,0 +1,42 @@
+class Sessions::PasswordlessesController < ApplicationController
+  skip_before_action :authenticate
+
+  <%- if options.lockable? -%>
+  before_action :require_lock, only: :create
+  <%- end -%>
+  before_action :set_user, only: :edit
+
+  def new
+  end
+
+  def edit
+    @session = @user.sessions.create!
+    cookies.signed.permanent[:session_token] = { value: @session.id, httponly: true }
+
+    revoke_tokens; redirect_to(root_path, notice: "Signed in successfully")
+  end
+
+  def create
+    if @user = User.find_by(email: params[:email], verified: true)
+      send_passwordless_email
+      redirect_to sign_in_path, notice: "Check your email for sign in instructions"
+    else
+      redirect_to new_sessions_passwordless_path, alert: "You can't sign in until you verify your email"
+    end
+  end
+
+  private
+    def set_user
+      @token = SignInToken.find_signed!(params[:sid]); @user = @token.user
+    rescue
+      redirect_to new_sessions_passwordless_path, alert: "That sign in link is invalid"
+    end
+
+    def send_passwordless_email
+      UserMailer.with(user: @user).passwordless.deliver_later
+    end
+
+    def revoke_tokens
+      @user.sign_in_tokens.delete_all
+    end
+end

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

@@ -21,7 +21,6 @@ class SessionsController < ApplicationController
       <%- if two_factor? -%>
       if user.otp_secret
         signed_id = user.signed_id(purpose: :authentication_challenge, expires_in: 20.minutes)
-
         redirect_to new_two_factor_authentication_challenge_path(token: signed_id)
       else
         @session = user.sessions.create!

data/lib/generators/authentication/templates/controllers/html/two_factor_authentication/totps_controller.rb.tt

@@ -1,7 +1,4 @@
 class TwoFactorAuthentication::TotpsController < ApplicationController
-  <%- if options.sudoable? -%>
-  before_action :require_sudo
-  <%- end -%>
   before_action :set_user
   before_action :set_totp
 
@@ -10,7 +7,9 @@ class TwoFactorAuthentication::TotpsController < ApplicationController
   end
 
   def create
-    if @totp.verify(params[:code], drift_behind: 15)
+    if !@user.authenticate(params[:current_password])
+      redirect_to two_factor_authentication_totp_path, alert: "The password you entered is incorrect"
+    elsif @totp.verify(params[:code], drift_behind: 15)
       @user.update! otp_secret: params[:secret]
       redirect_to root_path, notice: "2FA is enabled on your account"
     else

data/lib/generators/authentication/templates/erb/identity/emails/edit.html.erb.tt

@@ -23,7 +23,12 @@
 
   <div>
     <%%= form.label :email, "New email", style: "display: block" %>
-    <%%= form.email_field :email %>
+    <%%= form.email_field :email, required: true, autofocus: true %>
+  </div>
+
+  <div>
+    <%%= form.label :current_password, style: "display: block" %>
+    <%%= form.password_field :current_password, required: true, autocomplete: "current-password" %>
   </div>
 
   <div>

data/lib/generators/authentication/templates/erb/identity/password_resets/new.html.erb.tt

@@ -5,7 +5,7 @@
 <%%= form_with(url: identity_password_reset_path) do |form| %>
   <div>
     <%%= form.label :email, style: "display: block" %>
-    <%%= form.email_field :email, autofocus: true, required: true %>
+    <%%= form.email_field :email, required: true, autofocus: true %>
   </div>
 
   <div>

data/lib/generators/authentication/templates/erb/registrations/new.html.erb.tt

@@ -15,7 +15,7 @@
 
   <div>
     <%%= form.label :email, style: "display: block" %>
-    <%%= form.email_field :email, autofocus: true, autocomplete: "email" %>
+    <%%= form.email_field :email, required: true, autofocus: true, autocomplete: "email" %>
   </div>
 
   <div>

data/lib/generators/authentication/templates/erb/sessions/new.html.erb.tt

@@ -6,7 +6,7 @@
 <%%= form_with(url: sign_in_path) do |form| %>
   <div>
     <%%= form.label :email, style: "display: block" %>
-    <%%= form.email_field :email, value: params[:email_hint], autofocus: true, required: true, autocomplete: "email" %>
+    <%%= form.email_field :email, value: params[:email_hint], required: true, autofocus: true, autocomplete: "email" %>
   </div>
 
   <div>
@@ -18,6 +18,14 @@
     <%%= form.submit "Sign in" %>
   </div>
 <%% end %>
+
+<br>
+
+<%- if passwordless? %>
+<div>
+  <%%= link_to "Sign in without password", new_sessions_passwordless_path %>
+</div>
+<%- end -%>
 <%- if omniauthable? %>
 <div>
   <%%= button_to "Sign in with OmniAuth", "/auth/developer", "data-turbo" => false %>

data/lib/generators/authentication/templates/erb/sessions/passwordlesses/new.html.erb.tt

@@ -0,0 +1,14 @@
+<p style="color: red"><%%= alert %></p>
+
+<h1>Sign in without password</h1>
+
+<%%= form_with(url: sessions_passwordless_path) do |form| %>
+  <div>
+    <%%= form.label :email, style: "display: block" %>
+    <%%= form.email_field :email, required: true, autofocus: true%>
+  </div>
+
+  <div>
+    <%%= form.submit "Sign in" %>
+  </div>
+<%% end %>

data/lib/generators/authentication/templates/erb/two_factor_authentication/totps/new.html.erb.tt

@@ -19,7 +19,12 @@
 
   <div>
     <%%= form.label :code, "After scanning with your camera, the app will generate a six-digit code. Enter it here:", style: "display: block" %>
-    <%%= form.text_field :code, autofocus: true, required: true, autocomplete: :off %>
+    <%%= form.text_field :code, required: true, autofocus: true, autocomplete: :off %>
+  </div>
+
+  <div>
+    <%%= form.label :current_password, style: "display: block" %>
+    <%%= form.password_field :current_password, required: true, autocomplete: "current-password" %>
   </div>
 
   <div>

data/lib/generators/authentication/templates/erb/user_mailer/passwordless.html.erb.tt

@@ -0,0 +1,9 @@
+<p>Hey there,</p>
+
+<p>You requested a magic sign-in link. Here you go:</p>
+
+<%%= link_to "Sign in without password", edit_sessions_passwordless_url(sid: @signed_id) %>
+
+<hr>
+
+<p>Have questions or need help? Just reply to this email and our support team will help you sort it out.</p>

data/lib/generators/authentication/templates/mailers/user_mailer.rb.tt

@@ -16,4 +16,12 @@ class UserMailer < ApplicationMailer
 
     mail to: @user.email, subject: "Verify your email"
   end
+  <%- if passwordless? %>
+  def passwordless
+    @user = params[:user]
+    @signed_id = @user.sign_in_tokens.create.signed_id(expires_in: 1.day)
+
+    mail to: @user.email, subject: "Your sign in link"
+  end
+  <%- end -%>
 end

data/lib/generators/authentication/templates/migrations/create_sign_in_tokens_migration.rb.tt

@@ -0,0 +1,7 @@
+class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
+  def change
+    create_table :sign_in_tokens do |t|
+      t.references :user, null: false, foreign_key: true
+    end
+  end
+end

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

@@ -1,18 +1,10 @@
 class Session < ApplicationRecord
   belongs_to :user
-  <%- if options.sudoable? %>
-  kredis_flag :sudo, expires_in: 30.minutes
-  <%- end -%>
 
   before_create do
     self.user_agent = Current.user_agent
     self.ip_address = Current.ip_address
   end
-  <%- if options.sudoable? %>
-  after_create_commit do
-    self.sudo.mark
-  end
-  <%- end -%>
 
   after_create_commit do
     SessionMailer.with(session: self).signed_in_notification.deliver_later

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

@@ -0,0 +1,3 @@
+class SignInToken < ApplicationRecord
+  belongs_to :user
+end

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

@@ -3,6 +3,9 @@ class User < ApplicationRecord
 
   has_many :email_verification_tokens, dependent: :destroy
   has_many :password_reset_tokens, dependent: :destroy
+  <%- if passwordless? -%>
+  has_many :sign_in_tokens, dependent: :destroy
+  <%- end -%>
 
   has_many :sessions, dependent: :destroy
   <%- if options.trackable? -%>
@@ -22,7 +25,7 @@ class User < ApplicationRecord
     self.email = email.downcase.strip
   end
 
-  before_validation if: :email_changed?, unless: :new_record? do
+  before_validation if: :email_changed?, on: :update do
     self.verified = false
   end
 
@@ -38,8 +41,8 @@ class User < ApplicationRecord
     events.create! action: "password_changed"
   end
 
-  after_update if: :verified_previously_changed? do
-    events.create! action: "email_verified" if verified?
+  after_update if: [:verified_previously_changed?, :verified?] do
+    events.create! action: "email_verified"
   end
   <%- end -%>
 end

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

@@ -10,7 +10,14 @@ class Identity::EmailsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should update email" do
-    patch identity_email_url, params: { email: "new_email@hey.com" }, headers: default_headers
+    patch identity_email_url, params: { email: "new_email@hey.com", current_password: "Secret1*3*5*" }, headers: default_headers
     assert_response :success
   end
+
+  test "should not update email with wrong current password" do
+    patch identity_email_url, params: { email: "new_email@hey.com", current_password: "SecretWrong1*3" }, headers: default_headers
+
+    assert_response :bad_request
+    assert_equal "The password you entered is incorrect", response.parsed_body["error"]
+  end
 end

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

@@ -11,7 +11,14 @@ class Identity::EmailsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should update email" do
-    patch identity_email_url, params: { email: "new_email@hey.com" }
+    patch identity_email_url, params: { email: "new_email@hey.com", current_password: "Secret1*3*5*" }
     assert_redirected_to root_url
   end
+
+  test "should not update email with wrong current password" do
+    patch identity_email_url, params: { email: "new_email@hey.com", current_password: "SecretWrong1*3" }
+
+    assert_redirected_to edit_identity_email_url
+    assert_equal "The password you entered is incorrect", flash[:alert]
+  end
 end

data/lib/generators/authentication/templates/test_unit/system/identity/emails_test.rb.tt

@@ -9,6 +9,7 @@ class Identity::EmailsTest < ApplicationSystemTestCase
     click_on "Change email address"
 
     fill_in "New email", with: "new_email@hey.com"
+    fill_in "Current password", with: "Secret1*3*5*"
     click_on "Save changes"
 
     assert_text "Your email has been changed"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authentication-zero
 version: !ruby/object:Gem::Version
-  version: 2.16.4
+  version: 2.16.6
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-11 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -44,7 +44,6 @@ files:
 - lib/generators/authentication/templates/controllers/api/identity/password_resets_controller.rb.tt
 - lib/generators/authentication/templates/controllers/api/passwords_controller.rb.tt
 - lib/generators/authentication/templates/controllers/api/registrations_controller.rb.tt
-- lib/generators/authentication/templates/controllers/api/sessions/sudos_controller.rb.tt
 - lib/generators/authentication/templates/controllers/api/sessions_controller.rb.tt
 - lib/generators/authentication/templates/controllers/html/application_controller.rb.tt
 - lib/generators/authentication/templates/controllers/html/authentications/events_controller.rb.tt
@@ -55,7 +54,7 @@ files:
 - lib/generators/authentication/templates/controllers/html/passwords_controller.rb.tt
 - lib/generators/authentication/templates/controllers/html/registrations_controller.rb.tt
 - lib/generators/authentication/templates/controllers/html/sessions/omniauth_controller.rb.tt
-- lib/generators/authentication/templates/controllers/html/sessions/sudos_controller.rb.tt
+- lib/generators/authentication/templates/controllers/html/sessions/passwordlesses_controller.rb.tt
 - lib/generators/authentication/templates/controllers/html/sessions_controller.rb.tt
 - lib/generators/authentication/templates/controllers/html/two_factor_authentication/challenges_controller.rb.tt
 - lib/generators/authentication/templates/controllers/html/two_factor_authentication/totps_controller.rb.tt
@@ -69,23 +68,26 @@ files:
 - lib/generators/authentication/templates/erb/session_mailer/signed_in_notification.html.erb.tt
 - lib/generators/authentication/templates/erb/sessions/index.html.erb.tt
 - lib/generators/authentication/templates/erb/sessions/new.html.erb.tt
-- lib/generators/authentication/templates/erb/sessions/sudos/new.html.erb.tt
+- lib/generators/authentication/templates/erb/sessions/passwordlesses/new.html.erb.tt
 - lib/generators/authentication/templates/erb/two_factor_authentication/challenges/new.html.erb.tt
 - lib/generators/authentication/templates/erb/two_factor_authentication/totps/new.html.erb.tt
 - lib/generators/authentication/templates/erb/user_mailer/email_verification.html.erb.tt
 - lib/generators/authentication/templates/erb/user_mailer/password_reset.html.erb.tt
+- lib/generators/authentication/templates/erb/user_mailer/passwordless.html.erb.tt
 - lib/generators/authentication/templates/mailers/session_mailer.rb.tt
 - lib/generators/authentication/templates/mailers/user_mailer.rb.tt
 - lib/generators/authentication/templates/migrations/create_email_verification_tokens_migration.rb.tt
 - lib/generators/authentication/templates/migrations/create_events_migration.rb.tt
 - lib/generators/authentication/templates/migrations/create_password_reset_tokens_migration.rb.tt
 - lib/generators/authentication/templates/migrations/create_sessions_migration.rb.tt
+- lib/generators/authentication/templates/migrations/create_sign_in_tokens_migration.rb.tt
 - lib/generators/authentication/templates/migrations/create_users_migration.rb.tt
 - lib/generators/authentication/templates/models/current.rb.tt
 - lib/generators/authentication/templates/models/email_verification_token.rb.tt
 - lib/generators/authentication/templates/models/event.rb.tt
 - lib/generators/authentication/templates/models/password_reset_token.rb.tt
 - lib/generators/authentication/templates/models/session.rb.tt
+- lib/generators/authentication/templates/models/sign_in_token.rb.tt
 - lib/generators/authentication/templates/models/user.rb.tt
 - lib/generators/authentication/templates/test_unit/application_system_test_case.rb.tt
 - lib/generators/authentication/templates/test_unit/controllers/api/identity/email_verifications_controller_test.rb.tt

data/lib/generators/authentication/templates/controllers/api/sessions/sudos_controller.rb.tt

@@ -1,11 +0,0 @@
-class Sessions::SudosController < ApplicationController
-  def create
-    session = Current.session
-
-    if session.user.authenticate(params[:password])
-      session.sudo.mark
-    else
-      render json: { error: "The password you entered is incorrect" }, status: :bad_request
-    end
-  end
-end

data/lib/generators/authentication/templates/controllers/html/sessions/sudos_controller.rb.tt

@@ -1,14 +0,0 @@
-class Sessions::SudosController < ApplicationController
-  def new
-  end
-
-  def create
-    session = Current.session
-
-    if session.user.authenticate(params[:password])
-      session.sudo.mark; redirect_to(params[:proceed_to_url])
-    else
-      redirect_to new_sessions_sudo_path(proceed_to_url: params[:proceed_to_url]), alert: "The password you entered is incorrect"
-    end
-  end
-end

data/lib/generators/authentication/templates/erb/sessions/sudos/new.html.erb.tt

@@ -1,28 +0,0 @@
-<p style="color: red"><%%= alert %></p>
-
-<h1>Enter your password to continue</h1>
-
-<%%= form_with(url: sessions_sudo_path) do |form| %>
-
-  <%%= form.hidden_field :proceed_to_url, value: params[:proceed_to_url] %>
-
-  <div>
-    <%%= form.password_field :password, required: true, autofocus: true, autocomplete: "current-password" %>
-  </div>
-
-  <div>
-    <%%= form.submit "Continue" %>
-  </div>
-<%% end %>
-
-<br>
-
-<p>
-  <strong>Why are you asking me to do this?</strong><br>
-  To better protect your account, we'll occasionally ask you to confirm your password before performing sensitive actions.
-</p>
-
-<p>
-  <strong>Forgot your password?</strong><br>
-  We'll help you <%%= link_to "reset it", new_identity_password_reset_path %> so you can continue.
-</p>