quo_vadis 2.2.6 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 793c8183dd6e61c69255ca9e13a9726949591cbc4e3dda9890fb213848819dea
-  data.tar.gz: a01e34b058359d91dac594c617a2c55550f16f2e607a9b254f2087eab9eadc10
+  metadata.gz: 99defadc14bc4d695dccfad2f131ea6817ae931b1af1a65cc2418a5c3dbe1444
+  data.tar.gz: 2585f246fe58c479cee88852a155aa66d1ae4ff3f18f9c353216529a096a1f75
 SHA512:
-  metadata.gz: b5c29de9d14f2d2d14e4fcefa04379b0135c5720b27df6d3762c30503e121cb811f1e0248a76d589580931f953367c04f810d286df15204abe2c52b2df1c82cb
-  data.tar.gz: 9afd5eb09d2b91db1a5c3023e2c2b4fccd545231b39188fa95acebab677549dc642a657797b8c2e59b83b00595ce21083ffeadf0be2f4c17aa09e64496a9a672
+  metadata.gz: 04a76b0961a32febb4860656ba4a45faaeec652c3174450393583c3667af51950b55f8c9995b123ee135396c442da607512541d8dd01c6cedbfb279f736085aa
+  data.tar.gz: e38c400e9a0151691616e522218954d76347fec42cfa479d240166d8bdae95c75cd00d7e56cb4a92c8ec7da7a53b45b6847b1b942df3043f7ddc49bed1ecef56

data/CHANGELOG.md

@@ -4,6 +4,13 @@
 ## HEAD
 
 
+## 2.3.0 (18 November 2025)
+
+* Upon confirmation redirect to original path.
+* Remove concept of after_signup route.
+* Enable OTP to be given in i18n mailer subject.
+
+
 ## 2.2.6 (17 November 2025)
 
 * Make permitting of password updates explicit.

data/README.md

@@ -197,15 +197,15 @@ Your new user sign-up form ([example](https://github.com/airblade/quo_vadis/blob
 
 In your controller, use the [`#login`](#loginmodel-browser_session--true-metadata-) method to log in your new user.  The optional second argument specifies for how long the user should be logged in, and any metadata you supply is logged in the audit log.
 
-After logging in the user, redirect them wherever you like.  You can use `qv.path_after_signup` which resolves to the first of these routes that exists: `:after_signup`, `:after_login`, the root route.
+After logging in the user, redirect them wherever you like as normal.
 
 ```ruby
 class UsersController < ApplicationController
   def create
     @user = User.new user_params
     if @user.save
-      login @user
-      redirect_to qv.path_after_signup
+      login @user  # <-- add this
+      redirect_to dashboard_path
     else
       # ...
     end
@@ -219,21 +219,15 @@ class UsersController < ApplicationController
 end
 ```
 
-```ruby
-# config/routes.rb
-get '/dashboard', as: 'after_login'
-```
-
-
 ### Sign up with account confirmation
 
 Follow the steps above for sign-up.
 
-After you have logged in the user and redirected them (to any page which requires being logged in), QuoVadis detects that they need to confirm their account.  QuoVadis emails them a 6-digit confirmation code and redirects them to the confirmation page where they can enter that code.
+After you have logged in the user and redirected them, QuoVadis detects that they need to confirm their account.  QuoVadis emails them a 6-digit confirmation code and redirects them to the confirmation page where they can enter that code.
 
 The confirmation code is valid for `QuoVadis.account_confirmation_otp_lifetime`.
 
-Once the user has confirmed their account, they will be redirected to `qv.path_after_signup` which resolves to the first of these routes that exists: `:after_signup`, `:after_login`, the root route.  Add whichever works best for you.
+Once the user has confirmed their account, they will be redirected to the page they requested before they were redirected to the confirmation page.
 
 You need to write the email view ([example](https://github.com/airblade/quo_vadis/blob/master/app/views/quo_vadis/mailer/account_confirmation.text.erb)).  It must be in `app/views/quo_vadis/mailer/account_confirmation.{text,html}.erb` and output the `@otp` variable.  See the [Configuration](#configuration) section for how to set QuoVadis's emails' from addresses, headers, etc.
 
@@ -555,7 +549,7 @@ get '/profile',           to: 'profiles#show',   as: 'after_password_change'
 
 ### I18n
 
-All QuoVadis' flash messages are set via [i18n](https://github.com/airblade/quo_vadis/blob/master/config/locales/quo_vadis.en.yml).
+All QuoVadis' text (flash messages, mail subjects, and log messages) is set via [i18n](https://github.com/airblade/quo_vadis/blob/master/config/locales/quo_vadis.en.yml).
 
 You can override any of the messages with your own locale file at `config/locales/quo_vadis.en.yml`.
 

data/app/controllers/quo_vadis/confirmations_controller.rb

@@ -7,7 +7,7 @@ module QuoVadis
       @account = find_pending_account_from_session
 
       unless @account
-        redirect_to qv.path_after_signup, alert: QuoVadis.translate('flash.confirmation.unknown')
+        redirect_to qv.path_after_authentication, alert: QuoVadis.translate('flash.confirmation.unknown')
       end
     end
 
@@ -16,7 +16,7 @@ module QuoVadis
       @account = find_pending_account_from_session
 
       unless @account
-        redirect_to qv.path_after_signup, alert: QuoVadis.translate('flash.confirmation.unknown')
+        redirect_to qv.path_after_authentication, alert: QuoVadis.translate('flash.confirmation.unknown')
         return
       end
 
@@ -39,7 +39,7 @@ module QuoVadis
       session.delete :account_pending_confirmation
       session.delete :account_confirmation_expires_at
 
-      redirect_to qv.path_after_signup, notice: QuoVadis.translate('flash.confirmation.confirmed')
+      redirect_to qv.path_after_authentication, notice: QuoVadis.translate('flash.confirmation.confirmed')
     end
 
 
@@ -47,7 +47,7 @@ module QuoVadis
       @account = find_pending_account_from_session
 
       unless @account
-        redirect_to qv.path_after_signup, alert: QuoVadis.translate('flash.confirmation.unknown')
+        redirect_to qv.path_after_authentication, alert: QuoVadis.translate('flash.confirmation.unknown')
       end
 
       qv.request_confirmation @account.model

data/app/mailers/quo_vadis/mailer.rb

@@ -5,12 +5,12 @@ module QuoVadis
 
     def reset_password
       @otp = params[:otp]
-      _mail params[:email], QuoVadis.translate('mailer.password_reset.subject')
+      _mail params[:email], QuoVadis.translate('mailer.password_reset.subject', otp: params[:otp])
     end
 
     def account_confirmation
       @otp = params[:otp]
-      _mail params[:email], QuoVadis.translate('mailer.confirmation.subject')
+      _mail params[:email], QuoVadis.translate('mailer.confirmation.subject', otp: params[:otp])
     end
 
     def email_change_notification

data/config/locales/quo_vadis.en.yml

@@ -35,9 +35,9 @@ en:
         invalidated: You have invalidated your 2FA credentials and recovery codes.
     mailer:
       password_reset:
-        subject: Change your password
+        subject: Your password reset code is %{otp}
       confirmation:
-        subject: Please confirm your account
+        subject: Your account confirmation code is %{otp}
       notification:
         email_change: Your email address has been changed
         identifier_change: Your %{identifier} has been changed

data/lib/quo_vadis/controller.rb

@@ -34,6 +34,7 @@ module QuoVadis
       if logged_in?
         if QuoVadis.accounts_require_confirmation && !authenticated_model.qv_account.confirmed?
           qv.request_confirmation authenticated_model
+          session[:qv_bookmark] = request.original_fullpath
           redirect_to quo_vadis.confirm_path
         end
         return
@@ -217,13 +218,6 @@ module QuoVadis
         Log.create account: account, action: action, ip: request.remote_ip, metadata: metadata
       end
 
-      def path_after_signup
-        return main_app.after_signup_path if main_app.respond_to?(:after_signup_path)
-        return main_app.after_login_path  if main_app.respond_to?(:after_login_path)
-        return main_app.root_path         if main_app.respond_to?(:root_path)
-        raise RuntimeError, 'Missing routes: after_signup_path, after_login_path, root_path; define at least one of them.'
-      end
-
       def path_after_authentication
         if (bookmark = rails_session[:qv_bookmark])
           rails_session.delete :qv_bookmark

data/lib/quo_vadis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module QuoVadis
-  VERSION = '2.2.6'
+  VERSION = '2.3.0'
 end

data/test/dummy/app/controllers/sign_ups_controller.rb

@@ -24,11 +24,6 @@ class SignUpsController < ApplicationController
     @user = User.find params[:id]
   end
 
-  def confirmed
-    # Here we could send an email.
-    redirect_to after_login_path
-  end
-
   private
 
   def user_params

data/test/dummy/config/routes.rb

@@ -1,6 +1,5 @@
 Rails.application.routes.draw do
   resources :users
-  get '/sign_ups/confirmed', to: 'sign_ups#confirmed', as: 'after_signup'
   resources :sign_ups
   resources :articles do
     collection do

data/test/integration/account_confirmation_test.rb

@@ -30,8 +30,6 @@ class AccountConfirmationTest < IntegrationTest
     post quo_vadis.confirm_path(otp: code)
 
     # verify logged in
-    assert_redirected_to '/sign_ups/confirmed'
-    follow_redirect!
     assert_redirected_to '/articles/secret'
     assert_equal 'Thanks for confirming your account.', flash[:notice]
     assert QuoVadis::Account.last.confirmed?
@@ -64,7 +62,7 @@ class AccountConfirmationTest < IntegrationTest
 
     post quo_vadis.confirm_path(otp: code)
     assert_equal 'You have already confirmed your account.', flash[:alert]
-    assert_redirected_to '/sign_ups/confirmed'
+    assert_redirected_to '/articles/secret'
   end
 
 

data/test/mailers/mailer_test.rb

@@ -21,7 +21,7 @@ class MailerTest < ActionMailer::TestCase
 
     assert_equal ['foo@example.com'], email.to
     assert_equal ['bar@example.com'], email.from
-    assert_equal 'Change your password', email.subject
+    assert_equal 'Your password reset code is 314159', email.subject
     assert_equal read_fixture('reset_password.text').join, email.body.to_s
   end
 
@@ -38,7 +38,7 @@ class MailerTest < ActionMailer::TestCase
 
     assert_equal ['foo@example.com'], email.to
     assert_equal ['bar@example.com'], email.from
-    assert_equal 'Please confirm your account', email.subject
+    assert_equal 'Your account confirmation code is 271828', email.subject
     assert_equal read_fixture('account_confirmation.text').join, email.body.to_s
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quo_vadis
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.3.0
 platform: ruby
 authors:
 - Andy Stewart