devise-tokens 1.0.1 → 1.0.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/devise_tokens/concerns/set_user_by_token.rb +14 -13
- data/app/models/{devise_token_auth → devise_tokens}/concerns/active_record_support.rb +0 -0
- data/app/models/{devise_token_auth → devise_tokens}/concerns/mongoid_support.rb +0 -0
- data/app/models/{devise_token_auth → devise_tokens}/concerns/tokens_serialization.rb +0 -0
- data/app/models/{devise_token_auth → devise_tokens}/concerns/user.rb +1 -5
- data/app/models/{devise_token_auth → devise_tokens}/concerns/user_omniauth_callbacks.rb +0 -0
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0163056c9a45d48f02f31110a7f0d8e973e9ed262aad382a9f11e74aee0d6fa7
|
4
|
+
data.tar.gz: 40f185983e1778712e4ab63a896e67a2b4ab8b8224ee42a33507c08c10f4d93a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1bde0d160656227f4c86f7024717318943a902dc486f8a03f50405dddd7f55720bab4c168cd35d5864209310805997a38723222e8e166c9f492d7e0e52f0d019
|
7
|
+
data.tar.gz: e1e21585ceb60361cc0c499b44ef4052c9e4ec8f6b2c057c101508360868e2fa13556d1f8169c46a20964459fb2cb259728ec4d23c02aa0aa9dcae5c14346130
|
@@ -28,19 +28,20 @@ module DeviseTokens::Concerns::SetUserByToken
|
|
28
28
|
# no default user defined
|
29
29
|
return unless rc
|
30
30
|
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
31
|
+
if request.headers["Authorization"].present?
|
32
|
+
|
33
|
+
req_headers = request.headers["Authorization"].split(",")
|
34
|
+
|
35
|
+
# parse header for values necessary for authentication
|
36
|
+
uid = req_headers[0]
|
37
|
+
@token = DeviseTokenAuth::TokenFactory.new unless @token
|
38
|
+
@token.token = req_headers[1]
|
39
|
+
@token.client = req_headers[2]
|
40
|
+
|
41
|
+
# client isn't required, set to 'default' if absent
|
42
|
+
@token.client ||= 'default'
|
43
|
+
|
44
|
+
end
|
44
45
|
|
45
46
|
# check for an existing user, authenticated via warden/devise, if enabled
|
46
47
|
if DeviseTokens.enable_standard_devise_support
|
File without changes
|
File without changes
|
File without changes
|
@@ -166,11 +166,7 @@ module DeviseTokens::Concerns::User
|
|
166
166
|
expiry = tokens[client]['expiry'] || tokens[client][:expiry]
|
167
167
|
|
168
168
|
{
|
169
|
-
|
170
|
-
DeviseTokens.headers_names[:"token-type"] => 'Bearer',
|
171
|
-
DeviseTokens.headers_names[:"client"] => client,
|
172
|
-
DeviseTokens.headers_names[:"expiry"] => expiry.to_s,
|
173
|
-
DeviseTokens.headers_names[:"uid"] => uid
|
169
|
+
"Authorization" => "#{uid},#{token},#{client}"
|
174
170
|
}
|
175
171
|
end
|
176
172
|
|
File without changes
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: devise-tokens
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Niklas Karoly
|
@@ -170,11 +170,11 @@ files:
|
|
170
170
|
- app/controllers/devise_tokens/sessions_controller.rb
|
171
171
|
- app/controllers/devise_tokens/token_validations_controller.rb
|
172
172
|
- app/controllers/devise_tokens/unlocks_controller.rb
|
173
|
-
- app/models/
|
174
|
-
- app/models/
|
175
|
-
- app/models/
|
176
|
-
- app/models/
|
177
|
-
- app/models/
|
173
|
+
- app/models/devise_tokens/concerns/active_record_support.rb
|
174
|
+
- app/models/devise_tokens/concerns/mongoid_support.rb
|
175
|
+
- app/models/devise_tokens/concerns/tokens_serialization.rb
|
176
|
+
- app/models/devise_tokens/concerns/user.rb
|
177
|
+
- app/models/devise_tokens/concerns/user_omniauth_callbacks.rb
|
178
178
|
- app/validators/devise_token_auth_email_validator.rb
|
179
179
|
- app/views/devise/mailer/confirmation_instructions.html.erb
|
180
180
|
- app/views/devise/mailer/reset_password_instructions.html.erb
|