Resolves #169: include non-struct json body as _body argument to re…

…sources
atuttle · Jan 21, 2014 · c26fae8 · c26fae8
1 parent 199f52d
commit c26fae8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/core/api.cfc b/core/api.cfc
@@ -541,10 +541,15 @@
 					<cfset throwError(msg="Input JSON is not well formed: #requestObj.body#") />
 				</cfif>
 				<cfset local.tmp = deserializeJSON(requestObj.body) />
-				<cfif structKeyExists(local.tmp, "data")>
-					<cfset requestObj.bodyArgs = local.tmp.data />
+				<cfif not isStruct(local.tmp)>
+					<cfset requestObj.bodyArgs = {} />
+					<cfset requestObj.bodyArgs['_body'] = local.tmp />
 				<cfelse>
-					<cfset requestObj.bodyArgs = local.tmp />
+					<cfif structKeyExists(local.tmp, "data")>
+						<cfset requestObj.bodyArgs = local.tmp.data />
+					<cfelse>
+						<cfset requestObj.bodyArgs = local.tmp />
+					</cfif>
 				</cfif>
 				<cfset requestObj.queryString = cgi.query_string />
 			<cfelseif findNoCase("multipart/form-data", requestObj.contentType)>

diff --git a/tests/tests/TestCore.cfc b/tests/tests/TestCore.cfc
@@ -535,6 +535,16 @@
 			assertTrue(local.result.responseHeader["Access-Control-Allow-Headers"] contains "pigeon");
 			assertTrue(local.result.responseHeader["Access-Control-Allow-Headers"] contains "man-bear-pig");
 		}
+
+		function non_struct_json_body_sent_to_resource_as_underscore_body(){
+			//see: https://github.com/atuttle/Taffy/issues/169
+			local.result = apiCall("post", "/echo/5", "[1,2,3]");
+			debug(local.result);
+			local.response = deserializeJSON(local.result.fileContent);
+			assertTrue(structKeyExists(local.response, "_body"));
+			assertTrue(isArray(local.response._body));
+			assertTrue(arrayLen(local.response._body) == 3);
+		}
 	</cfscript>