Skip to content

Support media types which use the +json suffix #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ctuckz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support media types which use the +json suffix #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9476fc7
Support media types which use the +json suffix
ctuckz Sep 16, 2017
4fcf74e
Don't try to assume the content-type in request bodies
ctuckz Sep 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions lib/execute/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ var getApiRuntimeInfo = function (swaggerSpec, urlObj, options, update, callback
swaggerSpec.paths[apiPath][pathMethod]["responses"] = {};
swaggerSpec.paths[apiPath][pathMethod]["responses"][response.statusCode] = {};
swaggerSpec.paths[apiPath][pathMethod]["responses"][response.statusCode].description = HTTPStatus[response.statusCode];
if (response.headers['content-type'].indexOf('application/json') > -1 && body != '') {
if ((response.headers['content-type'].indexOf('application/json') > -1 || response.headers['content-type'].indexOf('+json') > -1) && body != '') {
var schemaObj = jsonSchemaGenerator(JSON.parse(body));
delete schemaObj.$schema;
// bug with json scheme generator - work around
Expand Down Expand Up @@ -404,9 +404,15 @@ var getBodyInfo = function (swaggerSpec, urlObj, options, callback) {
var headerKeyValues = {};
for (var i = 0; i < options.headers.length; i++) {
var split = options.headers[i].split(':');
headerKeyValues[split[0].trim()] = split[1].trim();
headerKeyValues[split[0].trim().toLowerCase()] = split[1].trim();
}
if (headerKeyValues['Content-Type'].indexOf('application/json') > -1 || headerKeyValues['content-type'].indexOf('application/json') > -1) {
if (swaggerSpec.paths[apiPath][pathMethod]['consumes'] == null) {
swaggerSpec.paths[apiPath][pathMethod]['consumes'] = new Array();
}
if (swaggerSpec.paths[apiPath][pathMethod]['consumes'].indexOf(headerKeyValues['content-type']) == -1) {
swaggerSpec.paths[apiPath][pathMethod]['consumes'].push(headerKeyValues['content-type']);
}
if (headerKeyValues['content-type'].indexOf('application/json') > -1 || headerKeyValues['content-type'].indexOf('+json') > -1) {
// Found JSON
var schemaObj = jsonSchemaGenerator(JSON.parse(options.data));
delete schemaObj.$schema;
Expand All @@ -419,7 +425,7 @@ var getBodyInfo = function (swaggerSpec, urlObj, options, callback) {
callback(null, true);
});
}
else if (headerKeyValues['Content-Type'] == 'application/x-www-form-urlencoded') {
else if (headerKeyValues['content-type'] == 'application/x-www-form-urlencoded') {
if (options.data.split("&").length > 0) {
var formParams = options.data.split("&");
async.eachSeries(formParams, function iterator(formParam, qcallback) {
Expand Down