prx_auth-rails 5.0.1 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78518e6f1ac8806d8b51a50834bfe59208bb778ff277e1685572268b30a41647
-  data.tar.gz: a855a3b4967db5f7bdfbca77d555d4d06e6cc482fd3caa85e6285b280ac441c4
+  metadata.gz: 593c20d8991992610c9a7e73cf0ffe4062ba0f94d26cdf36861183e5f5fc911d
+  data.tar.gz: 75d29effb6538795f0f1ca09a23081a2f8931e6230aa9b570b3abc12b2c3b9c6
 SHA512:
-  metadata.gz: 9d6d5ce5d77f09e51092482773890e9b27826e2dab76d4912cccb123ec361c1f4acee0a2076c553deb94cc7981ea89e8a7546ea4e561aa18621986c638102802
-  data.tar.gz: 59c1622e39c4ba7ad666bc8948ca68f495b87083a4f240068666688579ca6945187ad9d099297b872bf9d9e41d4f2d89c82691088c81ed4668e9e2f4e9de510e
+  metadata.gz: 62cadaa6c14ec9950eb4564625bec317ea7181456884176afbd18315cb64b0736b34102302b3c228077b55ac7027857fcfb40e5be352e0adb500cd1a46d9ae71
+  data.tar.gz: 3105d11533f4260c785c57aa16cf34939926de93728c13975d678eae2917bb9c648c77344a5934cffd537578fd318d05914ebf5ce9ad0d0a7ee63b488507c96d

data/app/controllers/prx_auth/rails/sessions_controller.rb

@@ -2,7 +2,7 @@
 
 module PrxAuth::Rails
   class SessionsController < ApplicationController
-    skip_before_action :set_after_sign_in_path, :authenticate!, raise: false
+    skip_before_action :authenticate!, raise: false
 
     before_action :set_nonce!, only: [:new, :show]
 
@@ -70,6 +70,7 @@ module PrxAuth::Rails
       sign_out_user
       session[WILDCARD_SESSION_KEY] = wildcard
 
+      set_after_sign_in_path(request.referer.presence || "/")
       redirect_to new_sessions_path
     end
 

data/lib/prx_auth/rails/ext/controller.rb

@@ -18,7 +18,7 @@ module PrxAuth
       PRX_REFRESH_BACK_KEY = "prx.auth.back".freeze
 
       included do
-        before_action :set_after_sign_in_path, :authenticate!
+        before_action :authenticate!
       end
 
       def prx_auth_token
@@ -30,8 +30,8 @@ module PrxAuth
         nil
       end
 
-      def set_after_sign_in_path
-        session[PRX_REFRESH_BACK_KEY] = request.fullpath
+      def set_after_sign_in_path(path = nil)
+        session[PRX_REFRESH_BACK_KEY] = path || request.fullpath
       end
 
       def prx_jwt
@@ -44,6 +44,7 @@ module PrxAuth
 
       def authenticate!
         if !current_user
+          set_after_sign_in_path
           redirect_to new_sessions_path
         elsif !current_user_access?
           redirect_to access_error_sessions_path

data/lib/prx_auth/rails/routes.rb

@@ -0,0 +1,16 @@
+module ActionDispatch
+  module Routing
+    class Mapper
+      def prx_auth_routes(path: "auth")
+        scope module: "prx_auth/rails", path: path do
+          resource "sessions", except: %w[edit update] do
+            get "access_error", to: "sessions#access_error"
+            get "auth_error", to: "sessions#auth_error"
+            get "logout", to: "sessions#logout"
+            get "refresh", to: "sessions#refresh"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/prx_auth/rails/version.rb

@@ -2,6 +2,6 @@
 
 module PrxAuth
   module Rails
-    VERSION = "5.0.1"
+    VERSION = "5.1.1"
   end
 end

data/lib/prx_auth/rails.rb

@@ -2,6 +2,7 @@ require "prx_auth/rails/version"
 require "prx_auth/rails/configuration"
 require "prx_auth/rails/railtie" if defined?(Rails)
 require "prx_auth/rails/engine" if defined?(Rails)
+require "prx_auth/rails/routes" if defined?(Rails)
 
 module PrxAuth
   module Rails
@@ -27,7 +28,7 @@ module PrxAuth
         host = configuration.id_host
         path = configuration.cert_path
         protocol =
-          if host.include?("localhost") || host.include?("127.0.0.1")
+          if host&.include?("localhost") || host&.include?("127.0.0.1")
             "http"
           else
             "https"

data/test/dummy/config/routes.rb

@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
+  prx_auth_routes
   get "index", to: "application#index"
   put "index", to: "application#index"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: prx_auth-rails
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.1
 platform: ruby
 authors:
 - Chris Rhoden
 bindir: bin
 cert_chain: []
-date: 2025-04-08 00:00:00.000000000 Z
+date: 2025-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -212,7 +212,6 @@ files:
 - app/views/prx_auth/rails/sessions/auth_error.html.erb
 - app/views/prx_auth/rails/sessions/show.html.erb
 - config/initializers/assets.rb
-- config/routes.rb
 - lib/prx_auth/rails.rb
 - lib/prx_auth/rails/configuration.rb
 - lib/prx_auth/rails/engine.rb
@@ -220,6 +219,7 @@ files:
 - lib/prx_auth/rails/ext/controller/account_info.rb
 - lib/prx_auth/rails/ext/controller/user_info.rb
 - lib/prx_auth/rails/railtie.rb
+- lib/prx_auth/rails/routes.rb
 - lib/prx_auth/rails/token.rb
 - lib/prx_auth/rails/version.rb
 - prx_auth-rails.gemspec

data/config/routes.rb

@@ -1,10 +0,0 @@
-Rails.application.routes.draw do
-  scope module: "prx_auth/rails", path: "auth" do
-    resource "sessions", except: %w[edit update] do
-      get "access_error", to: "sessions#access_error"
-      get "auth_error", to: "sessions#auth_error"
-      get "logout", to: "sessions#logout"
-      get "refresh", to: "sessions#refresh"
-    end
-  end
-end