update provider and uid in response header and body to propagate auth…

… data
tmjfitch · Feb 13, 2018 · c443dbb · c443dbb
1 parent 3e46396
commit c443dbb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/app/controllers/devise_token_auth/concerns/set_user_by_token.rb b/app/controllers/devise_token_auth/concerns/set_user_by_token.rb
@@ -53,6 +53,9 @@ def set_user_by_token(mapping=nil)
     @token     ||= request.headers[access_token_name] || params[access_token_name]
     @client_id ||= request.headers[client_name] || params[client_name]
 
+    @provider = provider
+    @provider_id = uid
+
     # client_id isn't required, set to 'default' if absent
     @client_id ||= 'default'
 

diff --git a/app/controllers/devise_token_auth/token_validations_controller.rb b/app/controllers/devise_token_auth/token_validations_controller.rb
@@ -16,9 +16,17 @@ def validate_token
     protected
 
     def render_validate_token_success
+      data = @resource.token_validation_response
+
+      uid_name = DeviseTokenAuth.headers_names[:'uid']
+      provider_name = DeviseTokenAuth.headers_names[:'provider']
+      data['uid'] = request.headers[uid_name] || params[uid_name]
+      data['provider'] = request.headers[provider_name] || params[provider_name]
+      data = resource_data(resource_json: data)
+
       render json: {
         success: true,
-        data: resource_data(resource_json: @resource.token_validation_response)
+        data: data
       }
     end