signinable 2.0.15 → 2.0.16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/signinable/model_additions.rb +11 -7
- data/lib/signinable/version.rb +1 -1
- data/spec/dummy/log/test.log +2350 -0
- data/spec/models/user_spec.rb +11 -5
- data/spec/support/utilities.rb +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 98c939505c7a77333b6244200b4e2f1e6337cd00ab721773db89333910d4b0b4
|
4
|
+
data.tar.gz: 32917bd4f4f2671a9727f17c8b57b83f852fbd7b5c7259e6abe3f72b69669896
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4728c3a79d4d85443e8d92a51a156409bb616a4be5782ad236ffe8c5006a8a60bd777655c38559dc390fffc2fc447aef0cedd08c2beeb4d142731e238337f326
|
7
|
+
data.tar.gz: 1f0ae333d9cd6d4b53338a50b0a16fd2ec592ff7f5dfc87d400958eeddf33a51b8f6386172ecb2754291d811925637ac548968373030bfee09005107499cc06e
|
@@ -75,6 +75,12 @@ module Signinable
|
|
75
75
|
signin.signinable
|
76
76
|
end
|
77
77
|
|
78
|
+
def refresh_token_from_jwt(jwt)
|
79
|
+
JWT.decode(jwt, jwt_secret, true, { verify_expiration: false, algorithm: 'HS256' })[0]['refresh_token']
|
80
|
+
rescue JWT::DecodeError
|
81
|
+
nil
|
82
|
+
end
|
83
|
+
|
78
84
|
private
|
79
85
|
|
80
86
|
cattr_writer :refresh_exp
|
@@ -89,12 +95,6 @@ module Signinable
|
|
89
95
|
nil
|
90
96
|
end
|
91
97
|
|
92
|
-
def refresh_token_from_jwt(jwt)
|
93
|
-
JWT.decode(jwt, jwt_secret, true, { verify_expiration: false, algorithm: 'HS256' })[0]['refresh_token']
|
94
|
-
rescue JWT::DecodeError
|
95
|
-
nil
|
96
|
-
end
|
97
|
-
|
98
98
|
def signin_permitted?(signin, restrictions_to_check, skip_restrictions)
|
99
99
|
restriction_fields = signin_restriction_fields(signin, skip_restrictions)
|
100
100
|
|
@@ -133,10 +133,14 @@ module Signinable
|
|
133
133
|
self.jwt = self.class.generate_jwt(signin.token, signin.signinable_id)
|
134
134
|
end
|
135
135
|
|
136
|
-
def signout(
|
136
|
+
def signout(jwt, ip, user_agent, skip_restrictions: [])
|
137
|
+
token = self.class.refresh_token_from_jwt(jwt)
|
138
|
+
return unless token
|
139
|
+
|
137
140
|
signin = Signin.find_by_token(token)
|
138
141
|
|
139
142
|
return unless signin
|
143
|
+
return if signin.expired?
|
140
144
|
return unless self.class.check_signin_permission(
|
141
145
|
signin,
|
142
146
|
{ ip: ip, user_agent: user_agent },
|
data/lib/signinable/version.rb
CHANGED