signinable 2.0.13 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e090b91cbbcbbfe860ca07984e3a19a965cc96bf2909f4e469e5d0ed48794dbe
-  data.tar.gz: c84bacb35618b62991ab60c984ec8f8c9786d783c3dd3dc8dc6a9ea76ed4881e
+  metadata.gz: 98c939505c7a77333b6244200b4e2f1e6337cd00ab721773db89333910d4b0b4
+  data.tar.gz: 32917bd4f4f2671a9727f17c8b57b83f852fbd7b5c7259e6abe3f72b69669896
 SHA512:
-  metadata.gz: 3e96a9511dd6560c05ddfdc03b94d71ea83720e982526412a59a8e4a0461d475a4fb970ceb680636f23f144cb2273a811a0014897bf77597eeff7c7652d7e962
-  data.tar.gz: 2dcc381256505cebdeb990ac0340200c3134c8e1337f1bbe41082e233d35187ecdc4e30aebf71d316ea99da7de861649415514d9043eaf958df59b630c38d439
+  metadata.gz: 4728c3a79d4d85443e8d92a51a156409bb616a4be5782ad236ffe8c5006a8a60bd777655c38559dc390fffc2fc447aef0cedd08c2beeb4d142731e238337f326
+  data.tar.gz: 1f0ae333d9cd6d4b53338a50b0a16fd2ec592ff7f5dfc87d400958eeddf33a51b8f6386172ecb2754291d811925637ac548968373030bfee09005107499cc06e

data/lib/signinable/model_additions.rb

@@ -16,7 +16,7 @@ module Signinable
       cattr_reader :jwt_exp
 
       def signinable(options = {})
-        self.refresh_exp = options.fetch(:expiration, DEFAULT_REFRESH_EXP)
+        self.refresh_exp = options.fetch(:refresh_exp, DEFAULT_REFRESH_EXP)
         self.simultaneous_signings = options.fetch(:simultaneous, true)
         self.signin_restrictions = options[:restrictions]
         self.jwt_secret = options.fetch(:jwt_secret)
@@ -31,7 +31,11 @@ module Signinable
         jwt_payload = extract_jwt_payload(jwt)
         return refresh_jwt(jwt, ip, user_agent, skip_restrictions: skip_restrictions) unless jwt_payload
 
-        find_by(primary_key => jwt_payload['signinable_id'])
+        signinable = find_by(primary_key => jwt_payload['signinable_id'])
+        return nil unless signinable
+
+        signinable.jwt = jwt
+        signinable
       end
 
       def check_signin_permission(signin, restrictions_to_check, skip_restrictions)
@@ -71,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
@@ -85,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)
 
@@ -129,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.13'
+  VERSION = '2.0.16'
 end