From 0e56c30ab2e92121c979dcb3054f2a09ac143383 Mon Sep 17 00:00:00 2001
From: Matthew Kienow <matthew_kienow@rapid7.com>
Date: Mon, 31 Dec 2018 15:43:16 -0500
Subject: [PATCH] Use data object wrapper for JSON response

---
 lib/msf/core/web_services/servlet/login_servlet.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/msf/core/web_services/servlet/login_servlet.rb b/lib/msf/core/web_services/servlet/login_servlet.rb
index 1a84015c21..450c543796 100644
--- a/lib/msf/core/web_services/servlet/login_servlet.rb
+++ b/lib/msf/core/web_services/servlet/login_servlet.rb
@@ -25,7 +25,7 @@ module LoginServlet
         sanitized_params = sanitize_params(params, env['rack.request.query_hash'])
         data = get_db.logins(sanitized_params)
         data = data.first if is_single_object?(data, sanitized_params)
-        set_json_response(data)
+        set_json_data_response(response: data)
       rescue => e
         print_error_and_create_response(error: e, message: 'There was an error retrieving logins:', code: 500)
       end
@@ -38,8 +38,8 @@ module LoginServlet
         opts = parse_json_request(request, false)
         opts[:core][:workspace] = get_db.workspaces(id: opts[:workspace_id]).first
         opts[:core] = get_db.creds(opts[:core]).first
-        response = get_db.create_credential_login(opts)
-        set_json_response(response)
+        data = get_db.create_credential_login(opts)
+        set_json_data_response(response: data)
       rescue => e
         print_error_and_create_response(error: e, message: 'There was an error creating the login:', code: 500)
       end
@@ -53,7 +53,7 @@ module LoginServlet
         tmp_params = sanitize_params(params)
         opts[:id] = tmp_params[:id] if tmp_params[:id]
         data = get_db.update_login(opts)
-        set_json_response(data)
+        set_json_data_response(response: data)
       rescue => e
         print_error_and_create_response(error: e, message: 'There was an error updating the login:', code: 500)
       end
@@ -65,7 +65,7 @@ module LoginServlet
       begin
         opts = parse_json_request(request, false)
         data = get_db.delete_logins(opts)
-        set_json_response(data)
+        set_json_data_response(response: data)
       rescue => e
         print_error_and_create_response(error: e, message: 'There was an error deleting the logins:', code: 500)
       end