From aada3558f34ca0a368efe61f293f4ff9d9cff5c6 Mon Sep 17 00:00:00 2001 From: Joshua Azemoh Date: Fri, 1 Nov 2019 13:18:29 +0100 Subject: [PATCH] Rename auth variables --- app/controllers/scim_rails/application_controller.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/scim_rails/application_controller.rb b/app/controllers/scim_rails/application_controller.rb index a0a438b..2c2d09b 100644 --- a/app/controllers/scim_rails/application_controller.rb +++ b/app/controllers/scim_rails/application_controller.rb @@ -9,10 +9,10 @@ module ScimRails private def authorize_request - send(authentication_strategy) do |username, password| + send(authentication_strategy) do |searchable_attribute, authentication_attribute| authorization = AuthorizeApiRequest.new( - searchable_attribute: username, - authentication_attribute: password + searchable_attribute: searchable_attribute, + authentication_attribute: authentication_attribute ) @company = authorization.company end @@ -28,11 +28,11 @@ module ScimRails end def authenticate_with_oauth_bearer - token = request.headers["Authorization"].split(" ").last - payload = ScimRails::Encoder.decode(token).with_indifferent_access + authentication_attribute = request.headers["Authorization"].split(" ").last + payload = ScimRails::Encoder.decode(authentication_attribute).with_indifferent_access searchable_attribute = payload[ScimRails.config.basic_auth_model_searchable_attribute] - yield searchable_attribute, token + yield searchable_attribute, authentication_attribute end end end -- libgit2 0.21.0