devise-tokens 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dafc9b9c1d7eb65cf8162acc3a06dacbd5151dfbea76da7c801564538bd275f
-  data.tar.gz: b798b1450394f2d804bd59efdd273fce5dad770eecf73d017248329314063d41
+  metadata.gz: 0163056c9a45d48f02f31110a7f0d8e973e9ed262aad382a9f11e74aee0d6fa7
+  data.tar.gz: 40f185983e1778712e4ab63a896e67a2b4ab8b8224ee42a33507c08c10f4d93a
 SHA512:
-  metadata.gz: da07c4adec6ea1aea9f9343f0b508f5125e2922b1c5adff00f2d3a56ffaec3189c4aaa93f6357abd4999a75298bc9227a6a46049a9d0a1e68d4ff0379af89f11
-  data.tar.gz: 6da368d8796a98de5a218a4cf0eaa44b59f0e7466864db2a820b7228f678ec9834b9697cd2c08345018d7110a4d545bccc1fcc0cf190e2f88f0eb25fec07fc39
+  metadata.gz: 1bde0d160656227f4c86f7024717318943a902dc486f8a03f50405dddd7f55720bab4c168cd35d5864209310805997a38723222e8e166c9f492d7e0e52f0d019
+  data.tar.gz: e1e21585ceb60361cc0c499b44ef4052c9e4ec8f6b2c057c101508360868e2fa13556d1f8169c46a20964459fb2cb259728ec4d23c02aa0aa9dcae5c14346130

data/app/controllers/devise_tokens/concerns/set_user_by_token.rb

@@ -28,19 +28,20 @@ module DeviseTokens::Concerns::SetUserByToken
     # no default user defined
     return unless rc
 
-    # gets the headers names, which was set in the initialize file
-    uid_name = DeviseTokens.headers_names[:'uid']
-    access_token_name = DeviseTokens.headers_names[:'access-token']
-    client_name = DeviseTokens.headers_names[:'client']
-
-    # parse header for values necessary for authentication
-    uid              = request.headers[uid_name] || params[uid_name]
-    @token           = DeviseTokens::TokenFactory.new unless @token
-    @token.token     ||= request.headers[access_token_name] || params[access_token_name]
-    @token.client ||= request.headers[client_name] || params[client_name]
-
-    # client isn't required, set to 'default' if absent
-    @token.client ||= 'default'
+    if request.headers["Authorization"].present?
+
+      req_headers = request.headers["Authorization"].split(",")
+
+      # parse header for values necessary for authentication
+      uid = req_headers[0]
+      @token = DeviseTokenAuth::TokenFactory.new unless @token
+      @token.token = req_headers[1]
+      @token.client = req_headers[2]
+
+      # client isn't required, set to 'default' if absent
+      @token.client ||= 'default'
+
+    end
 
     # check for an existing user, authenticated via warden/devise, if enabled
     if DeviseTokens.enable_standard_devise_support

data/app/models/{devise_token_auth → devise_tokens}/concerns/user.rb

@@ -166,11 +166,7 @@ module DeviseTokens::Concerns::User
     expiry = tokens[client]['expiry'] || tokens[client][:expiry]
 
     {
-      DeviseTokens.headers_names[:"access-token"] => token,
-      DeviseTokens.headers_names[:"token-type"]   => 'Bearer',
-      DeviseTokens.headers_names[:"client"]       => client,
-      DeviseTokens.headers_names[:"expiry"]       => expiry.to_s,
-      DeviseTokens.headers_names[:"uid"]          => uid
+      "Authorization" => "#{uid},#{token},#{client}"
     }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-tokens
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Niklas Karoly
@@ -170,11 +170,11 @@ files:
 - app/controllers/devise_tokens/sessions_controller.rb
 - app/controllers/devise_tokens/token_validations_controller.rb
 - app/controllers/devise_tokens/unlocks_controller.rb
-- app/models/devise_token_auth/concerns/active_record_support.rb
-- app/models/devise_token_auth/concerns/mongoid_support.rb
-- app/models/devise_token_auth/concerns/tokens_serialization.rb
-- app/models/devise_token_auth/concerns/user.rb
-- app/models/devise_token_auth/concerns/user_omniauth_callbacks.rb
+- app/models/devise_tokens/concerns/active_record_support.rb
+- app/models/devise_tokens/concerns/mongoid_support.rb
+- app/models/devise_tokens/concerns/tokens_serialization.rb
+- app/models/devise_tokens/concerns/user.rb
+- app/models/devise_tokens/concerns/user_omniauth_callbacks.rb
 - app/validators/devise_token_auth_email_validator.rb
 - app/views/devise/mailer/confirmation_instructions.html.erb
 - app/views/devise/mailer/reset_password_instructions.html.erb