Skip to content

multipart/form-data content-type boundary and form #207

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

multipart/form-data content-type boundary and form #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c299b8
Form Content-Type being overridable
pouyanh Dec 3, 2017
83b5303
Support for multipart/form-data requests
pouyanh Dec 4, 2017
3d5bc02
Pass swagger object all through convertType
pouyanh Mar 4, 2018
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
2 changes: 1 addition & 1 deletion lib/codegen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ var getViewForSwagger2 = function(opts, type){
} else if(parameter.in === 'formData'){
parameter.isFormParameter = true;
}
parameter.tsType = ts.convertType(parameter);
parameter.tsType = ts.convertType(parameter, swagger);
parameter.cardinality = parameter.required ? '' : '?';
method.parameters.push(parameter);
});
Expand Down
8 changes: 4 additions & 4 deletions lib/typescript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function convertType(swaggerType, swagger) {
var typespec = { description: swaggerType.description, isEnum: false };

if (swaggerType.hasOwnProperty('schema')) {
return convertType(swaggerType.schema);
return convertType(swaggerType.schema, swagger);
} else if (_.isString(swaggerType.$ref)) {
typespec.tsType = 'ref';
typespec.target = swaggerType.$ref.substring(swaggerType.$ref.lastIndexOf('/') + 1);
Expand All @@ -32,7 +32,7 @@ function convertType(swaggerType, swagger) {
typespec.tsType = 'boolean';
} else if (swaggerType.type === 'array') {
typespec.tsType = 'array';
typespec.elementType = convertType(swaggerType.items);
typespec.elementType = convertType(swaggerType.items, swagger);
} else /*if (swaggerType.type === 'object')*/ { //remaining types are created as objects
if (swaggerType.minItems >= 0 && swaggerType.hasOwnProperty('title') && !swaggerType.$ref) {
typespec.tsType = 'any';
Expand All @@ -52,14 +52,14 @@ function convertType(swaggerType, swagger) {
}
});
} else {
var property = convertType(ref);
var property = convertType(ref, swagger);
Array.prototype.push.apply(typespec.properties, property.properties);
}
});
}

_.forEach(swaggerType.properties, function (propertyType, propertyName) {
var property = convertType(propertyType);
var property = convertType(propertyType, swagger);
property.name = propertyName;

property.optional = true;
Expand Down
18 changes: 15 additions & 3 deletions templates/angular-class.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,21 @@ angular.module('{{&moduleName}}', [])
headers: headers
};
if(Object.keys(form).length > 0) {
options.data = form;
options.headers['Content-Type'] = 'application/x-www-form-urlencoded';
options.transformRequest = {{&className}}.transformRequest;
if (undefined === options.headers['Content-Type']) {
options.data = form;
options.headers['Content-Type'] = 'application/x-www-form-urlencoded';
options.transformRequest = {{&className}}.transformRequest;
} else if ((Array.isArray(options.headers['Content-Type']) && options.headers['Content-Type'].indexOf('multipart/form-data') > -1)
|| 'string' === (typeof options.headers['Content-Type']) && 'multipart/form-data' === options.headers['Content-Type']) {
var formData = new FormData();
for (var key in form) {
formData.append(key, form[key]);
}

options.data = formData;
options.headers['Content-Type'] = undefined;
options.transformRequest = angular.identity;
}
}
$http(options)
.then(function(data, status, headers, config){
Expand Down