signinable 2.0.14 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc7b621a02378580ca3b73fc2aac5ac2f9c1ced9610b77838123f1dc57e92668
-  data.tar.gz: '084a96afe76ed55e06c34620bdbdddbb6b73e1aa30f1d6331dba2b46a1ad5bad'
+  metadata.gz: 523362dea01356b6cbdaf4b31dfcd466d4a27d45d968e754fa2d553794e1afd2
+  data.tar.gz: d129d2e715ee9376fd6aa4de5904ffbb617518c46136d2d4801bb01b034a2fd6
 SHA512:
-  metadata.gz: 6435f28e2241b31814a54409b5b1485936002ff921284e86d3bc11702ac2cb1221266dc555f67f17806161119175d57336daff7a68d25f912b8cd499018e26de
-  data.tar.gz: 26249c4f48c58e08327a430783aaebed81fd9207bcaec3fefbca1ce7ac223d0a7d329ce0205e16c82d25faea2b7a9bae54f4c8babe44d0c78e28becec3819fb2
+  metadata.gz: 5d53f8b61728737d073ee40251b0fda57275032df9bfd8a32a9e79c69702551955d781d9fcb16b49a617de244137beb6efa776a357f09c127a67a1da033ccd5c
+  data.tar.gz: ea5ded123711f4be9d5587f2177bbe3dd48b8c1a3be4665a6e8fe37aff4c33576b0235dbf1cb64e7b3ab4509c62f63c1402fe003ccfd98f2b16fdd1210511a58

data/db/migrate/20220814152804_change_signinable_id_to_string.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+migration_kls = Rails::VERSION::MAJOR > 4 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class ChangeSigninableIdToString < migration_kls
+  def self.up
+    change_column :signins, :signinable_id, :string, null: false
+  end
+
+  def self.down
+    change_column :signins, :signinable_id, :integer, null: false
+  end
+end

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)
@@ -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.14'
+  VERSION = '2.0.17'
 end