better_record 0.19.7 → 0.19.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62792e04996a2191b9866be5241f9a08bbc2ad6e24bb89b4d2b0bb50bea3fc96
-  data.tar.gz: b1f4099c1f8c9990e4034fbff54d17f39cd84392086b765fec48a96d911db5d6
+  metadata.gz: 956aea60633965176bc575df66518770e44bafd61987ede883c229bd996c6c5f
+  data.tar.gz: 7286d23036a229279c301e5be069228199933a56b2cc402f55485834bb40eb68
 SHA512:
-  metadata.gz: f38a835fdcfc28464a3d87239e9209da30b08ed04c49f345dcb2b8e1aa38b8a8fcb44bd7076a77312325d84bce73beba64917d62f0c47970f0225be2f184367d
-  data.tar.gz: efb41881dcc477469d1fa2bc6d58d62cb7b8f24fc72d6119457c7da92cd3534742128347d659bafd3cb35c383f967508df1dbf99056bd0f40087e9690bdad70b
+  metadata.gz: 44b06e4cbe2081a7b5e15045f8df997e955a75ae0067021bb8acff521c6a2c33f237e0ec19ddd075f5307a8f992f8dd1c865df5b36f11b8575fbcb82011ff3fa
+  data.tar.gz: 16fbcb362698a74a215b2f2fbbb55093843aca64f691054fcc92fab306d40ae3c8db0c0e16437bffe6c1e4f1c1a4d302783a41426df0044bfa6a5d92e42619db

data/lib/better_record/jwt.rb

@@ -73,16 +73,20 @@ module BetterRecord
           if logged_in?
             begin
               data = current_user_session_data
-              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])
-                  self.current_token = create_jwt(user, data) if data[:created_at].to_i < 1.hour.ago.to_i
-                  set_user(user)
+              if data[:device_id] == requesting_device_id
+                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])
+                    self.current_token = create_jwt(user, data) if data[:created_at].to_i < 1.hour.ago.to_i
+                    set_user(user)
+                  else
+                    throw 'User Not Found'
+                  end
                 else
-                  throw 'User Not Found'
+                  throw 'Token Expired'
                 end
               else
-                throw 'Token Expired'
+                throw 'Device Does Not Match'
               end
             rescue
               p $!.message

data/lib/better_record/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.19.7
+  version: 0.19.8
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails