From 2d40c22727fb097261643a9ee018458609800e46 Mon Sep 17 00:00:00 2001 From: Spencer Alan Date: Sun, 18 Nov 2018 15:46:42 -0500 Subject: [PATCH] rename json_response --- app/controllers/concerns/scim_rails/exception_handler.rb | 8 ++++---- app/controllers/concerns/scim_rails/response.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/concerns/scim_rails/exception_handler.rb b/app/controllers/concerns/scim_rails/exception_handler.rb index 502df89..5661288 100644 --- a/app/controllers/concerns/scim_rails/exception_handler.rb +++ b/app/controllers/concerns/scim_rails/exception_handler.rb @@ -10,19 +10,19 @@ module ScimRails included do rescue_from ScimRails::ExceptionHandler::InvalidCredentials do - scim_response({ message: "Invalid credentials" }, :unauthorized) + json_response({ message: "Invalid credentials" }, :unauthorized) end rescue_from ScimRails::ExceptionHandler::MissingCredentials do - scim_response({ message: "Missing credentials" }, :unauthorized) + json_response({ message: "Missing credentials" }, :unauthorized) end rescue_from ActiveRecord::RecordNotFound do |e| - scim_response({ message: e.message }, :not_found) + json_response({ message: e.message }, :not_found) end rescue_from ActiveRecord::RecordInvalid do |e| - scim_response({ message: e.message }, :unprocessable_entity) + json_response({ message: e.message }, :unprocessable_entity) end end end diff --git a/app/controllers/concerns/scim_rails/response.rb b/app/controllers/concerns/scim_rails/response.rb index 58f9529..a9683eb 100644 --- a/app/controllers/concerns/scim_rails/response.rb +++ b/app/controllers/concerns/scim_rails/response.rb @@ -1,6 +1,6 @@ module ScimRails module Response - def scim_response(object, status = :ok) + def json_response(object, status = :ok) render(json: object, status: status) end end -- libgit2 0.21.0