devise_token_auth 0.1.37.beta2 → 0.1.37.beta3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of devise_token_auth might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/controllers/devise_token_auth/concerns/set_user_by_token.rb +2 -4
- data/app/controllers/devise_token_auth/omniauth_callbacks_controller.rb +5 -5
- data/app/views/devise_token_auth/omniauth_external_window.html.erb +1 -1
- data/lib/devise_token_auth/url.rb +1 -1
- data/lib/devise_token_auth/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ffa6f5208f809271811e8f10ad47f507a6be3ac3
|
|
4
|
+
data.tar.gz: 43213799e05d5e563942857af0c3cbfa2f615c9d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 51e5c2023671a2de2a8c02c516e0520e1f6f3024c49db891855c6fd76df4cf0525baa560229d7e23ead186457a1ebc5d02dd9ab223312ce7e5b7017f1ec5bb63
|
|
7
|
+
data.tar.gz: 0dd625a07cf22e41c990a1c1bbb7b00ef9572ead21eb7ac7067acb1c90de3e0c376e2a44ee6db74996c64bb706fe159df41074ee4a97763794c813b463928e91
|
|
@@ -32,7 +32,7 @@ module DeviseTokenAuth::Concerns::SetUserByToken
|
|
|
32
32
|
@client_id ||= 'default'
|
|
33
33
|
|
|
34
34
|
# check for an existing user, authenticated via warden/devise
|
|
35
|
-
devise_warden_user =
|
|
35
|
+
devise_warden_user = warden.user(rc.to_s.underscore.to_sym)
|
|
36
36
|
if devise_warden_user && devise_warden_user.tokens[@client_id].nil?
|
|
37
37
|
@used_auth_by_token = false
|
|
38
38
|
@resource = devise_warden_user
|
|
@@ -54,7 +54,7 @@ module DeviseTokenAuth::Concerns::SetUserByToken
|
|
|
54
54
|
user = uid && rc.find_by_uid(uid)
|
|
55
55
|
|
|
56
56
|
if user && user.valid_token?(@token, @client_id)
|
|
57
|
-
sign_in(:user, user, store: false, bypass:
|
|
57
|
+
sign_in(:user, user, store: false, bypass: false)
|
|
58
58
|
return @resource = user
|
|
59
59
|
else
|
|
60
60
|
# zero all values previously set values
|
|
@@ -106,8 +106,6 @@ module DeviseTokenAuth::Concerns::SetUserByToken
|
|
|
106
106
|
|
|
107
107
|
end
|
|
108
108
|
|
|
109
|
-
sign_out(@resource)
|
|
110
|
-
|
|
111
109
|
end
|
|
112
110
|
|
|
113
111
|
def resource_class(m=nil)
|
|
@@ -71,7 +71,7 @@ module DeviseTokenAuth
|
|
|
71
71
|
end
|
|
72
72
|
end
|
|
73
73
|
@_omniauth_params
|
|
74
|
-
|
|
74
|
+
|
|
75
75
|
end
|
|
76
76
|
|
|
77
77
|
# break out provider attribute assignment for easy method extension
|
|
@@ -206,12 +206,12 @@ module DeviseTokenAuth
|
|
|
206
206
|
elsif auth_origin_url # default to same-window implementation, which forwards back to auth_origin_url
|
|
207
207
|
|
|
208
208
|
# build and redirect to destination url
|
|
209
|
-
redirect_to DeviseTokenAuth::Url.generate(auth_origin_url, data)
|
|
209
|
+
redirect_to DeviseTokenAuth::Url.generate(auth_origin_url, data.merge(blank: true))
|
|
210
210
|
else
|
|
211
|
-
|
|
211
|
+
|
|
212
212
|
# there SHOULD always be an auth_origin_url, but if someone does something silly
|
|
213
213
|
# like coming straight to this url or refreshing the page at the wrong time, there may not be one.
|
|
214
|
-
# In that case, just render in plain text the error message if there is one or otherwise
|
|
214
|
+
# In that case, just render in plain text the error message if there is one or otherwise
|
|
215
215
|
# a generic message.
|
|
216
216
|
fallback_render data[:error] || 'An error occurred'
|
|
217
217
|
end
|
|
@@ -225,7 +225,7 @@ module DeviseTokenAuth
|
|
|
225
225
|
<body>
|
|
226
226
|
#{text}
|
|
227
227
|
</body>
|
|
228
|
-
</html>|
|
|
228
|
+
</html>|
|
|
229
229
|
end
|
|
230
230
|
|
|
231
231
|
def get_resource_from_auth_hash
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: devise_token_auth
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.37.
|
|
4
|
+
version: 0.1.37.beta3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Lynn Hurley
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-10-
|
|
11
|
+
date: 2015-10-27 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|