better_record 0.19.4 → 0.19.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0633a14373cccb30674e55d090a3f7530c6be80f23e4884e38ac2a09f94d6d49
-  data.tar.gz: f11953ac897dfc56cdb3d2f95b094a5f61ef17c724d86df12c0446f75b625894
+  metadata.gz: 26cad53cfde14b9a15655f5b2c641477041184411718a347eb8bb212a2d6a4c0
+  data.tar.gz: 4c3edf06a7d9b0203d270bebdb7ae174a225cf512f426055b1edf49d8a132792
 SHA512:
-  metadata.gz: 81c92498fc3982a43e54ac93d0723c3ca05d3069c4c9525831b99fd6b10ddf75c7c97c13d2787e0491103c030c4394ad3fe8765190275131cd5dab0a2586720d
-  data.tar.gz: a4ddec5b642bf43dd6d1ce26ad4e2ef7433a58ccb729de2836e92e26b309a1c786329129ff7fa99824f2599ffdc4f602f3af388ccd63df8415580f2046c46c96
+  metadata.gz: eb090203431b0bdfb99ca5ed000a04439688556b44352452e50fa125b8b1c18a4c262428cb88f79f72d9686bd80883c5d048fbb7aadf1e85741dc3db9adb10a6
+  data.tar.gz: faa6084402e2064fe7b8ae3e53657184e194653751a1aa21df5adc7b07840dfb66ed2147d7fed6cc01bc2f033e6df8d07d647ce463a2bbc263ed3454f79c79ef

data/lib/better_record.rb

@@ -77,10 +77,10 @@ module BetterRecord
   self.certificate_session_user_method = (ENV.fetch('BR_CERTIFICATE_SESSION_USER_METHOD') { :user }).to_sym
   self.certificate_header = (ENV.fetch('BR_CERTIFICATE_HEADER') { :HTTP_X_SSL_CERT }).to_sym
   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_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.token_decryption_method = (ENV.fetch('BR_TOKEN_DECRYPTION_METHOD') { :to_s }).to_sym
-  self.token_encryption_method = (ENV.fetch('BR_TOKEN_ENCRYPTION_METHOD') { :to_s }).to_sym
+  self.token_decryption_method = (ENV.fetch('BR_TOKEN_DECRYPTION_METHOD') { false })&.to_sym
+  self.token_encryption_method = (ENV.fetch('BR_TOKEN_ENCRYPTION_METHOD') { false })&.to_sym
   self.token_send_as_arg = Boolean.strict_parse(ENV.fetch('BR_TOKEN_AS_ARG') { false })
 end
 

data/lib/better_record/jwt.rb

@@ -129,13 +129,15 @@ module BetterRecord
         end
 
         def br_get_clean_cert(certificate)
-          certificate_cleaning_send_as_arg ?
-            self.__send__(certificate_cleaning_method, certificate) :
-            certificate.
-              __send__(
-                certificate_cleaning_method,
-                *(certificate_cleaning_method_args)
-              )
+          ensure_is_real_value(
+            certificate_cleaning_send_as_arg ?
+              self.__send__(certificate_cleaning_method, certificate) :
+              (
+                certificate_cleaning_method.present? ?
+                  certificate.__send__(certificate_cleaning_method) :
+                  certificate
+              ).presence
+          )
         end
 
         def current_user
@@ -144,6 +146,8 @@ module BetterRecord
 
         def current_user_session_data
           logged_in? ? JWT.decode(current_token).deep_symbolize_keys : {}
+        rescue
+          {}
         end
 
         def has_correct_origin?
@@ -174,7 +178,7 @@ module BetterRecord
         def current_token
           if use_bearer_token
             @current_token ||= authenticate_with_http_token do |token, **options|
-              decrypt_token(token, options)
+              decrypt_token(token, options).presence
             end
           else
             @current_token ||= session[:current_user]
@@ -204,15 +208,27 @@ module BetterRecord
         end
 
         def decrypt_token(t, **options)
-          token_send_as_arg ?
-            __send__(token_decryption_method, t, options) :
-            t.__send__(token_decryption_method)
+          ensure_is_real_value(
+            token_send_as_arg ?
+              __send__(token_decryption_method, t, options) :
+              (
+                token_decryption_method.present? ?
+                  t.__send__(token_decryption_method) :
+                  t
+              ).presence
+          )
         end
 
         def encrypt_token
-          token_send_as_arg ?
-            __send__(token_encryption_method, current_token) :
-            current_token.__send__(token_encryption_method)
+          ensure_is_real_value(
+            token_send_as_arg ?
+              __send__(token_encryption_method, current_token) :
+              (
+                token_encryption_method.present? ?
+                  current_token.__send__(token_encryption_method) :
+                  current_token
+              ).presence
+          )
         end
 
 
@@ -225,6 +241,12 @@ module BetterRecord
           header_hash[:HTTP_CLIENT_IP] ||
           request.remote_ip
         end
+
+        def ensure_is_real_value(value)
+          (Boolean.parse(value) && (value != "nil")) ?
+            value :
+            nil
+        end
     end
   end
 end

data/lib/better_record/version.rb

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

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

@@ -99,7 +99,7 @@ module BetterRecord
 
     # self.certificate_is_hashed = true
 
-    # self.certificate_cleaning_method = :to_s
+    # self.certificate_cleaning_method = :clean_certificate
 
     # self.certificate_cleaning_send_as_arg = []
 

metadata

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