usps-jwt_auth 1.0.0.pre.rc.1 → 1.0.0.pre.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 848bc0fc3b35ca707a3a7666a718615411f66e6c6700ab6f0caca23cf2bc8862
-  data.tar.gz: efbd63572b9f486a1240c38d10ccb1aa054ae2ddd82ca5837c78bb41b479b7ea
+  metadata.gz: 71ef9d51e59a0dea30294ac18846b64c4bc9bbf60023d497d6eac38fbcfda5d1
+  data.tar.gz: dae70a2acb6d3a363ed3f597986dc05336a3707f81ebd06fc2b859eb51c34aad
 SHA512:
-  metadata.gz: 601620bea4da5310b31744283d4bb2a4a6d9b6f19f6d981a1d864f740b9e00d70f72e984dfaef234ce53e32ab30a8563540eee5fe73c546ac7d9864e3bba97be
-  data.tar.gz: e9d31e6bc397f6b577cba0b30e334c718eca12d9e68f0f050241b3bdcfe35d27db0c2cf6f9c315a57e13534235a01131530a6142a423a884b738966ec2f35ea8
+  metadata.gz: baca203a5bffd8bfcec36f9308c8bafb34420756290a61adad7e74b6e5652bec2d5a3b1e439407598ed9f24f69a9d835b641a343e344f560290793df12a5da9f
+  data.tar.gz: da388afd9815b8d535ff9f57a6d7cf61f48849e4538360e84e390e523fff88fa2aed340a82f43a154ea486449a167feaed335ef919a0f0cc39a262eb15d8c111

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps-jwt_auth (1.0.0.pre.rc.1)
+    usps-jwt_auth (1.0.0.pre.rc.2)
       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?
@@ -67,11 +68,13 @@ module Usps
       end
 
       def set_new_jwt
-        return if params[:jwt].blank?
+        return if params[:jwt].blank? || @set_new_jwt
 
         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)
+        @set_new_jwt = true
       end
 
       def store_jwt(token)
@@ -101,6 +104,8 @@ module Usps
       end
 
       def redirect_to_login
+        return if @set_new_jwt
+
         url = 'https://www.usps.org/jwt'
         local = "#{url}?local&port=#{ENV.fetch('PORT', '3000')}"
         production = "#{url}?application=#{JwtAuth.config.audience}"
@@ -110,6 +115,16 @@ module Usps
         redirect_to(url, allow_other_host: true)
       end
 
+      def ensure_valid_jwt_has_valid_member!
+        fetch_jwt
+        jwt_user
+      rescue ActiveRecord::RecordNotFound
+        reset_session
+        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 = '1.0.0-rc.1'
+    VERSION = '1.0.0-rc.2'
   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: 1.0.0.pre.rc.1
+  version: 1.0.0.pre.rc.2
 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