From 804fbabd2c502975a7d8c36d1414ce1bfa092c38 Mon Sep 17 00:00:00 2001 From: "carolinas@knowbe4.com" Date: Tue, 14 Jan 2025 13:53:19 -0300 Subject: [PATCH 1/3] adding conditional for the request_method_from_hidden_method_field method --- lib/jets/controller/request/compat/params.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jets/controller/request/compat/params.rb b/lib/jets/controller/request/compat/params.rb index 950e4e81c..e5b4a8d37 100644 --- a/lib/jets/controller/request/compat/params.rb +++ b/lib/jets/controller/request/compat/params.rb @@ -101,7 +101,7 @@ def get_request_parameters # jets specific def request_method_from_hidden_method_field - get_request_parameters["_method"].to_s.upcase if get_request_parameters["_method"] + get_request_parameters['_method'].to_s.upcase if get_request_parameters.try(:key?, '_method') end private From 23d085e00bc43ddfa6d4c5da2d20d06f62114606 Mon Sep 17 00:00:00 2001 From: "carolinas@knowbe4.com" Date: Tue, 14 Jan 2025 14:26:25 -0300 Subject: [PATCH 2/3] proper return when json is an Array --- lib/jets/controller/request/compat/params.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/jets/controller/request/compat/params.rb b/lib/jets/controller/request/compat/params.rb index e5b4a8d37..8c03d2abb 100644 --- a/lib/jets/controller/request/compat/params.rb +++ b/lib/jets/controller/request/compat/params.rb @@ -123,7 +123,8 @@ def multipart_options(data, boundary = "AaB03x") end def parse_json(text) - JSON.parse(text) + json = JSON.parse(text) + json.is_a?(Hash) ? json : { _json: json } rescue JSON::ParserError nil end From f84825d12e9871155337aeebb580a8d7d4a6c54e Mon Sep 17 00:00:00 2001 From: "carolinas@knowbe4.com" Date: Tue, 14 Jan 2025 15:19:56 -0300 Subject: [PATCH 3/3] removing uneccesary changes --- lib/jets/controller/request/compat/params.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jets/controller/request/compat/params.rb b/lib/jets/controller/request/compat/params.rb index 8c03d2abb..13bc869b0 100644 --- a/lib/jets/controller/request/compat/params.rb +++ b/lib/jets/controller/request/compat/params.rb @@ -101,7 +101,7 @@ def get_request_parameters # jets specific def request_method_from_hidden_method_field - get_request_parameters['_method'].to_s.upcase if get_request_parameters.try(:key?, '_method') + get_request_parameters["_method"].to_s.upcase if get_request_parameters["_method"] end private