usps-jwt_auth 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e46b14c6f88047e2a91d8b3dee98dc62b77453e8df259af908673471215eaf61
-  data.tar.gz: 758b74fc5fe973143b1bf23cb73df23c27fbf97953e51a244cdb5fda41dc6140
+  metadata.gz: a7b812b3bd3cd3dbaf68b5e3d0659c91ac872a9852dbd2e9da849a6f74676cdf
+  data.tar.gz: 5d033a22ad91830bf7971ef4a3239febe1a5bafb733100b4ea086741c3778eed
 SHA512:
-  metadata.gz: 64525963c48bbc9485cf639e0d09473288df601d3b6b85c3d7077cda7da694395d7d5070de76f3de5c5fc27498d42b8cead943ce670f5f39b3582c8fcc7d8e5f
-  data.tar.gz: 6b345b3c1f03158242261cea4e01d95939a3c87e0f4af77efb0b4c129b55ddc284d4d0c7a10d5e45a75e6f6d0ccaca4e9b81d9e8b40135aec81b92a6728fa311
+  metadata.gz: 2f21bdd0c4436166fd1556b33087dfa669f818d355b807424c1bc6e62f1ce68807a9521e92f4fda2306c9552e837fc120f8543f4dcfef1891e71958d5fa21518
+  data.tar.gz: 3f33edaba5c9c85e508c6c6d0b94f753939e9a37a224024a42eea189114ed14b6509b518e2559439f6b7f271dc61fba01ad3108d51de5f1cfa622e6d7a5d7b5f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps-jwt_auth (0.2.7)
+    usps-jwt_auth (0.3.0)
       activesupport (~> 8.0)
       colorize (~> 1.1)
       fileutils (~> 1.7)

data/lib/usps/jwt_auth/concern.rb

@@ -5,6 +5,7 @@ module Usps
     # Controller helpers for handling JWT authentication
     #
     module Concern
+      # Gem rspec skips this block
       if defined?(ActiveSupport::Concern)
         extend ActiveSupport::Concern
 
@@ -41,7 +42,7 @@ module Usps
       ###############
 
       def current_user_from_jwt
-        reset_session if params[:logout].present?
+        reset_session if params.key?(:logout)
         return if set_new_jwt
 
         load_current_user if fetch_jwt.present?
@@ -70,8 +71,9 @@ module Usps
         return if params[:jwt].blank?
 
         store_jwt(params[:jwt])
-        redirect_to(params[:path] || root_path) # Breaks the login loop
-        nil
+        ensure_valid_jwt_has_valid_member!
+
+        redirect_to(params[:path] || root_path)
       end
 
       def store_jwt(token)
@@ -110,6 +112,15 @@ module Usps
         redirect_to(url, allow_other_host: true)
       end
 
+      def ensure_valid_jwt_has_valid_member!
+        fetch_jwt
+        jwt_user
+      rescue ActiveRecord::RecordNotFound
+        clear_jwt
+        @current_user = nil
+        raise IncorrectLogin, 'Valid login without valid member record'
+      end
+
       def stub_jwt!
         raise 'Cannot stub JWT outside of test environment!' unless JwtAuth.config.environment.test?
 

data/lib/usps/jwt_auth/incorrect_login.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Usps
+  module JwtAuth
+    class IncorrectLogin < StandardError; end
+  end
+end

data/lib/usps/jwt_auth/version.rb

@@ -2,6 +2,6 @@
 
 module Usps
   module JwtAuth
-    VERSION = '0.2.7'
+    VERSION = '0.3.0'
   end
 end

data/lib/usps/jwt_auth.rb

@@ -35,6 +35,7 @@ require_relative 'jwt_auth/version'
 require_relative 'jwt_auth/config'
 require_relative 'jwt_auth/encode'
 require_relative 'jwt_auth/decode'
+require_relative 'jwt_auth/incorrect_login'
 require_relative 'jwt_auth/concern'
 
 # :nocov:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usps-jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Julian Fiander
@@ -86,6 +86,7 @@ files:
 - lib/usps/jwt_auth/config.rb
 - lib/usps/jwt_auth/decode.rb
 - lib/usps/jwt_auth/encode.rb
+- lib/usps/jwt_auth/incorrect_login.rb
 - lib/usps/jwt_auth/railtie.rb
 - lib/usps/jwt_auth/version.rb
 - sig/usps_jwt/auth.rbs