better_record 0.19.9 → 0.19.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a82ab9a0b7251e5453fda13c220f47c25c4387835960931c3a1ce6d4d7f37019
-  data.tar.gz: c925e59766032c935f284c34edf672b495950552a6ecd6c313e12b770cea7bbe
+  metadata.gz: 565899148bf26aa0a6bcc5a859a8ad7bddd663236795d912b86500f1dd23c098
+  data.tar.gz: 646c14fb0e1b3223438c6f9544de291ae1112e01b358212bc8ffc1ff25455892
 SHA512:
-  metadata.gz: b0c858d1cafd1976ec686a44f1243954776c6437fda8a99f62c19b59e2a85886d78ba73dfbade7a077eae241e68e8fb2a702c452153518d15efee0614c31b1ea
-  data.tar.gz: 397fcea02ef26a4408b1e0f9bb2e4784992f2987f50dadcb418a4535755444bc52d8b50381d0e8a0f2afdfcc694261b935ccbdc5a1f2a2171c79108a6a4c2813
+  metadata.gz: 8bbda81459dbbb205d48c18120fd9322d0bee1ae3add696bad443c37bcfb5f95190605527dd203542ab6a4d4b50f3e416a2b260fdd4e9e230f98ab0d9d1d76bf
+  data.tar.gz: e90f178d07d262529cfe54dae781e7bb1de5d22cf7addda16f2ad7619e472cb4cba57e442ccf9341d2701db401718a6ed46d16035bdb308049e2338a02f3fd0c

data/lib/better_record.rb

@@ -24,6 +24,7 @@ module BetterRecord
     :session_column,
     :session_data,
     :session_authenticate_method,
+    :disallow_sessions,
     :certificate_session_class,
     :certificate_session_column,
     :certificate_session_user_method,
@@ -79,6 +80,7 @@ module BetterRecord
   self.certificate_is_hashed = Boolean.strict_parse(ENV.fetch('BR_CERTIFICATE_IS_HASHED') { false })
   self.certificate_cleaning_method = (ENV.fetch('BR_CERTIFICATE_CLEANING_METHOD') { :clean_certificate })&.to_sym
   self.certificate_cleaning_send_as_arg = Boolean.strict_parse(ENV.fetch('BR_CERTIFICATE_CLEANING_AS_ARG') { false })
+  self.disallow_sessions = Boolean.strict_parse(ENV.fetch('BR_DISALLOW_SESSIONS') { false })
   self.token_decryption_method = (ENV.fetch('BR_TOKEN_DECRYPTION_METHOD') { '' }).presence&.to_sym
   self.token_encryption_method = (ENV.fetch('BR_TOKEN_ENCRYPTION_METHOD') { '' }).presence&.to_sym
   self.token_send_as_arg = Boolean.strict_parse(ENV.fetch('BR_TOKEN_AS_ARG') { false })

data/lib/better_record/jwt.rb

@@ -73,7 +73,7 @@ module BetterRecord
           if logged_in?
             begin
               data = current_user_session_data
-              if data[:device_id] == requesting_device_id
+              if (data[:token_device_id] == requesting_device_id) || session[:current_user]
                 if  !data[:created_at] ||
                     (data[:created_at].to_i > 14.days.ago.to_i)
                   if user = session_class.find_by(session_column => data[:user_id])
@@ -106,7 +106,7 @@ module BetterRecord
           data = session_data ? session_data.call(user) : {
             user_id: user.__send__(session_column),
             created_at: Time.now.to_i,
-            device_id: requesting_device_id
+            token_device_id: requesting_device_id
           }
           BetterRecord::JWT.encode(data.merge(additional_headers.except(*data.keys)))
         end
@@ -184,22 +184,26 @@ module BetterRecord
             @current_token ||= authenticate_with_http_token do |token, **options|
               decrypt_token(token, options).presence
             end
-          else
-            @current_token ||= session[:current_user]
           end
+
+          @current_token ||= session[:current_user] unless BetterRecord.disallow_sessions
         end
 
         def current_token=(value)
           @current_token = value
+
           if use_bearer_token
             set_auth_header
-          else
+          end
+
+          unless BetterRecord.disallow_sessions
             if value.blank?
               session.delete(:current_user)
             else
               session[:current_user] = value
             end
           end
+
           @current_token
         end
 

data/lib/better_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BetterRecord
-  VERSION = '0.19.9'
+  VERSION = '0.19.10'
 end

data/lib/generators/better_record/setup/templates/initializer.rb

@@ -108,6 +108,8 @@ module BetterRecord
     # self.token_encryption_method = :to_s
 
     # self.token_decryption_method = :to_s
+
+    # self.disallow_sessions = false
   # end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.19.9
+  version: 0.19.10
 platform: ruby
 authors:
 - Sampson Crowley