signinable 2.0.15 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5874be18901fc2c73dc44f49b54e847a9837b3d735ba4bb5c5cb285df08ee811
-  data.tar.gz: b87d026e0221c8684ae4fc1576743fd2cd782fa3a145dbdc814c3ea6d332733b
+  metadata.gz: 98c939505c7a77333b6244200b4e2f1e6337cd00ab721773db89333910d4b0b4
+  data.tar.gz: 32917bd4f4f2671a9727f17c8b57b83f852fbd7b5c7259e6abe3f72b69669896
 SHA512:
-  metadata.gz: 237c7de3fef5bc654629f346468beb3df87a3b707988858233d56d224c874be405ef7b4bc32d94e0ec3a48248aaeaae55fe7107d595832497a0d0fd849549d45
-  data.tar.gz: ec0357a307c90c515770f5de1be6457da1cb021fc0bd2dd9fba0a373cd065a32d2236807f58c2a9e68039d6bf2bd19cabb91987e6d1c1b660188cfde94fc7909
+  metadata.gz: 4728c3a79d4d85443e8d92a51a156409bb616a4be5782ad236ffe8c5006a8a60bd777655c38559dc390fffc2fc447aef0cedd08c2beeb4d142731e238337f326
+  data.tar.gz: 1f0ae333d9cd6d4b53338a50b0a16fd2ec592ff7f5dfc87d400958eeddf33a51b8f6386172ecb2754291d811925637ac548968373030bfee09005107499cc06e

data/lib/signinable/model_additions.rb

@@ -75,6 +75,12 @@ module Signinable
         signin.signinable
       end
 
+      def refresh_token_from_jwt(jwt)
+        JWT.decode(jwt, jwt_secret, true, { verify_expiration: false, algorithm: 'HS256' })[0]['refresh_token']
+      rescue JWT::DecodeError
+        nil
+      end
+
       private
 
       cattr_writer :refresh_exp
@@ -89,12 +95,6 @@ module Signinable
         nil
       end
 
-      def refresh_token_from_jwt(jwt)
-        JWT.decode(jwt, jwt_secret, true, { verify_expiration: false, algorithm: 'HS256' })[0]['refresh_token']
-      rescue JWT::DecodeError
-        nil
-      end
-
       def signin_permitted?(signin, restrictions_to_check, skip_restrictions)
         restriction_fields = signin_restriction_fields(signin, skip_restrictions)
 
@@ -133,10 +133,14 @@ module Signinable
       self.jwt = self.class.generate_jwt(signin.token, signin.signinable_id)
     end
 
-    def signout(token, ip, user_agent, skip_restrictions: [])
+    def signout(jwt, ip, user_agent, skip_restrictions: [])
+      token = self.class.refresh_token_from_jwt(jwt)
+      return unless token
+
       signin = Signin.find_by_token(token)
 
       return unless signin
+      return if signin.expired?
       return unless self.class.check_signin_permission(
         signin,
         { ip: ip, user_agent: user_agent },

data/lib/signinable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Signinable
-  VERSION = '2.0.15'
+  VERSION = '2.0.16'
 end