quo_vadis 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 917bfcbbeeda70ae1e5ccad5a77d7fdcf2a7cdff1b82b18491d50c9c69412015
-  data.tar.gz: 6249be4270c18b0060db76000d80f638e090c724f9dd508e9334abd144296b90
+  metadata.gz: 49fe683373a68bb0b0dad55449c2501db61d8a270458d82816cc98d48dc3e8a7
+  data.tar.gz: d0105c2814b6b81330e215f644bc86df9a2fc38953e00a765e6b4c13e411cb23
 SHA512:
-  metadata.gz: df72693e06c363389530c601d75d30f74e0897178657a0b76a1dee76e29eee2cbd009b29d1361ddc5c462292bcad518053f92efc7a8f13eafd4ec4ec0fb09907
-  data.tar.gz: fc9541cf32483ef03f2263ba9745b971f69a2baa867221e7189d1690d32552d84f0d6ff8f6844c9e046226741a0533674039a3e2be88e4931c3940835623b1ee
+  metadata.gz: 881a22e6d2d2b6a54cc609f57c37ece92d4f6a74ae35dafce2cd057dd98822324d02a6fdfe68f496c85189a241ff3d282fea7adf48746ea4805cfddd18af9580
+  data.tar.gz: b960cd5f39665341e1caaedaa13aaa0f05f08006afe704897d5fb2c87c8ac3078a1e18f851ba45739b9778faa2f03066655b4e53ea0f3be5a55647b5fd319a4c

data/CHANGELOG.md

@@ -4,6 +4,12 @@
 ## HEAD
 
 
+## 2.4.0 (13 May 2026)
+
+* Enable post-login redirect to be specified in login URL param.
+* Separate confirmation check from login check.
+
+
 ## 2.3.1 (8 May 2026)
 
 * Remove upper bound on rqrcode version.

data/README.md

@@ -251,7 +251,8 @@ If you do not include a `remember` checkbox, the user will be logged in for `Quo
 
 After authenticating the user will be redirected to the first of these that exists:
 
-- the page they tried to view before they were redirected to the login page;
+- the page specified in the `return` URL parameter when requesting the login page;
+- the page (requiring authentication) they tried to view before they were redirected to the login page;
 - a route named `after_login`, if any;
 - your root route.
 

data/app/controllers/quo_vadis/sessions_controller.rb

@@ -14,6 +14,9 @@ module QuoVadis
 
 
     def new
+      if (ret = params.delete(:return))
+        session[:qv_bookmark] = ret
+      end
     end
 
 

data/lib/quo_vadis/controller.rb

@@ -15,6 +15,10 @@ module QuoVadis
 
       base.before_action { CurrentRequestDetails.request = request }
 
+      base.before_action { |controller|
+        controller.qv.require_confirmation unless controller.class == QuoVadis::ConfirmationsController
+      }
+
       base.helper_method :authenticated_model, :logged_in?
 
       # Remember the last activity time so we can timeout idle sessions.
@@ -31,14 +35,7 @@ module QuoVadis
 
 
     def require_password_authentication
-      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
-      end
+      return if logged_in?
       session[:qv_bookmark] = request.original_fullpath
       redirect_to quo_vadis.login_path, notice: QuoVadis.translate('flash.require_authentication')
     end
@@ -156,6 +153,16 @@ module QuoVadis
         old_session.each { |k,v| rails_session[k] = v }
       end
 
+      def require_confirmation
+        return if ! QuoVadis.accounts_require_confirmation
+        return if ! controller.logged_in?
+        return if controller.authenticated_model.qv_account.confirmed?
+
+        request_confirmation controller.authenticated_model
+        rails_session[:qv_bookmark] = controller.request.original_fullpath
+        controller.redirect_to controller.quo_vadis.confirm_path
+      end
+
       def request_confirmation(model)
         rails_session[:account_pending_confirmation] = model.qv_account.id
 

data/lib/quo_vadis/version.rb

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

data/test/integration/password_login_test.rb

@@ -42,6 +42,18 @@ class PasswordLoginTest < IntegrationTest
   end
 
 
+  test 'successful login redirect page can be overridden' do
+    get quo_vadis.login_path(return: "/articles")
+    refute_nil session[:qv_bookmark]
+
+    User.create! name: 'bob', email: 'bob@example.com', password: '123456789abc'
+    post quo_vadis.login_path(email: 'bob@example.com', password: '123456789abc')
+
+    assert_redirected_to articles_path
+    assert_nil session[:qv_bookmark]
+  end
+
+
   test 'failed login' do
     User.create! name: 'bob', email: 'bob@example.com', password: '123456789abc'
     post quo_vadis.login_path(email: 'bob@example.com', password: 'wrong')

metadata

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