[Typescript-Jquery] Fix file upload (swagger-api#6262)

* Fix a bug with the file upload that was not working * Prevent unnecessary append to the FormData
Pittiplatsch · Aug 9, 2017 · 00b46e8 · 00b46e8
1 parent e94ba4c
commit 00b46e8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/modules/swagger-codegen/src/main/resources/typescript-jquery/api.mustache b/modules/swagger-codegen/src/main/resources/typescript-jquery/api.mustache
@@ -103,7 +103,9 @@ export class {{classname}} {
 {{#formParams}}
 {{#isFile}}
         reqHasFile = true;
+        formParams = {{paramName}};
 {{/isFile}}
+{{^isFile}}
         {{#isListContainer}}
         if ({{paramName}}) {
         {{#isCollectionFormatMulti}}
@@ -121,7 +123,7 @@ export class {{classname}} {
             formParams.append('{{baseName}}', <any>{{paramName}});
         }
         {{/isListContainer}}
-
+{{/isFile}}
 {{/formParams}}
 {{#headerParams}}
         {{#isListContainer}}

diff --git a/samples/client/petstore/typescript-jquery/default/api/PetApi.ts b/samples/client/petstore/typescript-jquery/default/api/PetApi.ts
@@ -433,11 +433,9 @@ export class PetApi {
         if (name !== null && name !== undefined) {
             formParams.append('name', <any>name);
         }
-
         if (status !== null && status !== undefined) {
             formParams.append('status', <any>status);
         }
-
         // to determine the Content-Type header
         let consumes: string[] = [
             'application/x-www-form-urlencoded'
@@ -515,12 +513,8 @@ export class PetApi {
         if (additionalMetadata !== null && additionalMetadata !== undefined) {
             formParams.append('additionalMetadata', <any>additionalMetadata);
         }
-
         reqHasFile = true;
-        if (file !== null && file !== undefined) {
-            formParams.append('file', <any>file);
-        }
-
+        formParams = file;
         // to determine the Content-Type header
         let consumes: string[] = [
             'multipart/form-data'

diff --git a/samples/client/petstore/typescript-jquery/npm/api/PetApi.ts b/samples/client/petstore/typescript-jquery/npm/api/PetApi.ts
@@ -433,11 +433,9 @@ export class PetApi {
         if (name !== null && name !== undefined) {
             formParams.append('name', <any>name);
         }
-
         if (status !== null && status !== undefined) {
             formParams.append('status', <any>status);
         }
-
         // to determine the Content-Type header
         let consumes: string[] = [
             'application/x-www-form-urlencoded'
@@ -515,12 +513,8 @@ export class PetApi {
         if (additionalMetadata !== null && additionalMetadata !== undefined) {
             formParams.append('additionalMetadata', <any>additionalMetadata);
         }
-
         reqHasFile = true;
-        if (file !== null && file !== undefined) {
-            formParams.append('file', <any>file);
-        }
-
+        formParams = file;
         // to determine the Content-Type header
         let consumes: string[] = [
             'multipart/form-data'