ARI: Support channel variables in originate

This adds back in support for specifying channel variables during an
originate without compromising the ability to specify query parameters
in the JSON body. This was accomplished by generating the body-parsing
code in a separate function instead of being integrated with the URI
query parameter parsing code such that it could be called by paths with
body parameters. This is transparent to the user of the API and
prevents manual duplication of code or data structures.

(closes issue ASTERISK-23051)
Review: https://reviewboard.asterisk.org/r/3122/
Reported by: Matt Jordan
........

Merged revisions 406003 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@406006 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 3 insertions, 38 deletions

diff --git a/rest-api-templates/param_parsing.mustache b/rest-api-templates/param_parsing.mustache
index 9d2073869..2dde4b33f 100644
--- a/rest-api-templates/param_parsing.mustache
+++ b/rest-api-templates/param_parsing.mustache
@@ -104,45 +104,10 @@
 	args.{{c_name}} = ast_json_ref(body);
 {{/body_parameter}}
 {{^body_parameter}}
-	/* Parse query parameters out of it */
-{{#query_parameters}}
-	field = ast_json_object_get(body, "{{name}}");
-	if (field) {
-{{^allow_multiple}}
-		args.{{c_name}} = {{json_convert}}(field);
-{{/allow_multiple}}
-{{#allow_multiple}}
-		/* If they were silly enough to both pass in a query param and a
-		 * JSON body, free up the query value.
-		 */
-		ast_free(args.{{c_name}});
-		if (ast_json_typeof(field) == AST_JSON_ARRAY) {
-			/* Multiple param passed as array */
-			size_t i;
-			args.{{c_name}}_count = ast_json_array_size(field);
-			args.{{c_name}} = ast_malloc(sizeof(*args.{{c_name}}) * args.{{c_name}}_count);
-
-			if (!args.{{c_name}}) {
-				ast_ari_response_alloc_failed(response);
-				goto fin;
-			}
-
-			for (i = 0; i < args.{{c_name}}_count; ++i) {
-				args.{{c_name}}[i] = {{json_convert}}(ast_json_array_get(field, i));
-			}
-		} else {
-			/* Multiple param passed as single value */
-			args.{{c_name}}_count = 1;
-			args.{{c_name}} = ast_malloc(sizeof(*args.{{c_name}}) * args.{{c_name}}_count);
-			if (!args.{{c_name}}) {
-				ast_ari_response_alloc_failed(response);
-				goto fin;
-			}
-			args.{{c_name}}[0] = {{json_convert}}(field);
-		}
-{{/allow_multiple}}
+	if (ast_ari_{{c_name}}_{{c_nickname}}_parse_body(body, &args)) {
+		ast_ari_response_alloc_failed(response);
+		goto fin;
 	}
-{{/query_parameters}}
 {{/body_parameter}}
 {{/parse_body}}
 {{/is_websocket}}