fix: Uploading issues (#9)

bjerkio · Mar 23, 2021 · 0a7808e · 0a7808e
1 parent 497c2cf
commit 0a7808e
Show file tree

Hide file tree

Showing 9 changed files with 167 additions and 245 deletions.
diff --git a/src/generated/apis/CreditNotesApi.ts b/src/generated/apis/CreditNotesApi.ts
@@ -37,6 +37,7 @@ import {
     SendCreditNoteRequestFromJSON,
     SendCreditNoteRequestToJSON,
 } from '../models';
+import { createReadStream } from 'fs';
 
 export interface AddAttachmentToCreditNoteDraftRequest {
     companySlug: string;
@@ -146,40 +147,32 @@ export class CreditNotesApi extends runtime.BaseAPI {
             }
         }
 
-        const consumes: runtime.Consume[] = [
-            { contentType: 'multipart/form-data' },
-        ];
-        // @ts-ignore: canConsumeForm may be unused
-        const canConsumeForm = runtime.canConsumeForm(consumes);
+        const formParams = new FormData();
 
-        let formParams: { append(param: string, value: any): any };
-        let useForm = false;
-        // use FormData to transmit files using content-type "multipart/form-data"
-        useForm = canConsumeForm;
-        if (useForm) {
-            formParams = new FormData();
-        } else {
-            formParams = new URLSearchParams();
-        }
+        const {
+          filename,
+          file,
+        } = requestParameters;
 
-        if (requestParameters.filename !== undefined) {
-            formParams.append('filename', requestParameters.filename as any);
-        }
+        formParams.append('filename', filename as any);
+
+        if (typeof file === 'string') {
+          const stream = createReadStream(file);
+          formParams.append('file', stream, filename);
+        } else {
+          formParams.append('file', file, filename);
+        } 
 
         if (requestParameters.comment !== undefined) {
             formParams.append('comment', requestParameters.comment as any);
         }
 
-        if (requestParameters.file !== undefined) {
-            formParams.append('file', requestParameters.file as any);
-        }
-
         const response = await this.request({
             path: `/companies/{companySlug}/creditNotes/drafts/{draftId}/attachments`.replace(`{${"companySlug"}}`, encodeURIComponent(String(requestParameters.companySlug))).replace(`{${"draftId"}}`, encodeURIComponent(String(requestParameters.draftId))),
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: formParams,
+            formBody: formParams,
         });
 
         return new runtime.VoidApiResponse(response);

diff --git a/src/generated/apis/InboxApi.ts b/src/generated/apis/InboxApi.ts
@@ -19,6 +19,7 @@ import {
     InboxResultFromJSON,
     InboxResultToJSON,
 } from '../models';
+import { createReadStream } from 'fs';
 
 export interface CreateInboxDocumentRequest {
     companySlug: string;
@@ -68,44 +69,33 @@ export class InboxApi extends runtime.BaseAPI {
             }
         }
 
-        const consumes: runtime.Consume[] = [
-            { contentType: 'multipart/form-data' },
-        ];
-        // @ts-ignore: canConsumeForm may be unused
-        const canConsumeForm = runtime.canConsumeForm(consumes);
-
-        let formParams: { append(param: string, value: any): any };
-        let useForm = false;
-        // use FormData to transmit files using content-type "multipart/form-data"
-        useForm = canConsumeForm;
-        if (useForm) {
-            formParams = new FormData();
+        const formParams = new FormData();
+
+        const { filename, file } = requestParameters;
+
+        formParams.append('filename', filename as any);
+
+        if (typeof file === 'string') {
+          const stream = createReadStream(file);
+          formParams.append('file', stream, filename);
         } else {
-            formParams = new URLSearchParams();
-        }
+          formParams.append('file', file, filename);
+        } 
 
         if (requestParameters.name !== undefined) {
             formParams.append('name', requestParameters.name as any);
         }
 
-        if (requestParameters.filename !== undefined) {
-            formParams.append('filename', requestParameters.filename as any);
-        }
-
         if (requestParameters.description !== undefined) {
             formParams.append('description', requestParameters.description as any);
         }
 
-        if (requestParameters.file !== undefined) {
-            formParams.append('file', requestParameters.file as any);
-        }
-
         const response = await this.request({
             path: `/companies/{companySlug}/inbox`.replace(`{${"companySlug"}}`, encodeURIComponent(String(requestParameters.companySlug))),
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: formParams,
+            formBody: formParams,
         });
 
         return new runtime.VoidApiResponse(response);

diff --git a/src/generated/apis/InvoicesApi.ts b/src/generated/apis/InvoicesApi.ts
@@ -37,6 +37,7 @@ import {
     UpdateInvoiceRequestFromJSON,
     UpdateInvoiceRequestToJSON,
 } from '../models';
+import { createReadStream } from 'fs';
 
 export interface AddAttachmentToInvoiceRequest {
     companySlug: string;
@@ -164,36 +165,25 @@ export class InvoicesApi extends runtime.BaseAPI {
             }
         }
 
-        const consumes: runtime.Consume[] = [
-            { contentType: 'multipart/form-data' },
-        ];
-        // @ts-ignore: canConsumeForm may be unused
-        const canConsumeForm = runtime.canConsumeForm(consumes);
+        const formParams = new FormData();
 
-        let formParams: { append(param: string, value: any): any };
-        let useForm = false;
-        // use FormData to transmit files using content-type "multipart/form-data"
-        useForm = canConsumeForm;
-        if (useForm) {
-            formParams = new FormData();
-        } else {
-            formParams = new URLSearchParams();
-        }
+        const { filename, file } = requestParameters;
 
-        if (requestParameters.filename !== undefined) {
-            formParams.append('filename', requestParameters.filename as any);
-        }
-
-        if (requestParameters.file !== undefined) {
-            formParams.append('file', requestParameters.file as any);
-        }
+        formParams.append('filename', filename as any);
 
+        if (typeof file === 'string') {
+          const stream = createReadStream(file);
+          formParams.append('file', stream, filename);
+        } else {
+          formParams.append('file', file, filename);
+        } 
+
         const response = await this.request({
             path: `/companies/{companySlug}/invoices/{invoiceId}/attachments`.replace(`{${"companySlug"}}`, encodeURIComponent(String(requestParameters.companySlug))).replace(`{${"invoiceId"}}`, encodeURIComponent(String(requestParameters.invoiceId))),
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: formParams,
+            formBody: formParams,
         });
 
         return new runtime.VoidApiResponse(response);
@@ -231,40 +221,29 @@ export class InvoicesApi extends runtime.BaseAPI {
             }
         }
 
-        const consumes: runtime.Consume[] = [
-            { contentType: 'multipart/form-data' },
-        ];
-        // @ts-ignore: canConsumeForm may be unused
-        const canConsumeForm = runtime.canConsumeForm(consumes);
+        const formParams = new FormData();
 
-        let formParams: { append(param: string, value: any): any };
-        let useForm = false;
-        // use FormData to transmit files using content-type "multipart/form-data"
-        useForm = canConsumeForm;
-        if (useForm) {
-            formParams = new FormData();
-        } else {
-            formParams = new URLSearchParams();
-        }
+        const { filename, file } = requestParameters;
 
-        if (requestParameters.filename !== undefined) {
-            formParams.append('filename', requestParameters.filename as any);
-        }
+        formParams.append('filename', filename as any);
+
+        if (typeof file === 'string') {
+          const stream = createReadStream(file);
+          formParams.append('file', stream, filename);
+        } else {
+          formParams.append('file', file, filename);
+        } 
 
         if (requestParameters.comment !== undefined) {
             formParams.append('comment', requestParameters.comment as any);
         }
 
-        if (requestParameters.file !== undefined) {
-            formParams.append('file', requestParameters.file as any);
-        }
-
         const response = await this.request({
             path: `/companies/{companySlug}/invoices/drafts/{draftId}/attachments`.replace(`{${"companySlug"}}`, encodeURIComponent(String(requestParameters.companySlug))).replace(`{${"draftId"}}`, encodeURIComponent(String(requestParameters.draftId))),
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: formParams,
+            formBody: formParams,
         });
 
         return new runtime.VoidApiResponse(response);

diff --git a/src/generated/apis/JournalEntriesApi.ts b/src/generated/apis/JournalEntriesApi.ts
@@ -25,6 +25,7 @@ import {
     JournalEntryFromJSON,
     JournalEntryToJSON,
 } from '../models';
+import { createReadStream } from 'fs';
 
 export interface AddAttachmentToJournalEntryRequest {
     companySlug: string;
@@ -89,36 +90,25 @@ export class JournalEntriesApi extends runtime.BaseAPI {
             }
         }
 
-        const consumes: runtime.Consume[] = [
-            { contentType: 'multipart/form-data' },
-        ];
-        // @ts-ignore: canConsumeForm may be unused
-        const canConsumeForm = runtime.canConsumeForm(consumes);
-
-        let formParams: { append(param: string, value: any): any };
-        let useForm = false;
-        // use FormData to transmit files using content-type "multipart/form-data"
-        useForm = canConsumeForm;
-        if (useForm) {
-            formParams = new FormData();
-        } else {
-            formParams = new URLSearchParams();
-        }
+        const formParams = new FormData();
 
-        if (requestParameters.filename !== undefined) {
-            formParams.append('filename', requestParameters.filename as any);
-        }
+        const { filename, file } = requestParameters;
 
-        if (requestParameters.file !== undefined) {
-            formParams.append('file', requestParameters.file as any);
-        }
+        formParams.append('filename', filename as any);
+
+        if (typeof file === 'string') {
+          const stream = createReadStream(file);
+          formParams.append('file', stream, filename);
+        } else {
+          formParams.append('file', file, filename);
+        } 
 
         const response = await this.request({
             path: `/companies/{companySlug}/journalEntries/{journalEntryId}/attachments`.replace(`{${"companySlug"}}`, encodeURIComponent(String(requestParameters.companySlug))).replace(`{${"journalEntryId"}}`, encodeURIComponent(String(requestParameters.journalEntryId))),
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: formParams,
+            formBody: formParams,
         });
 
         return new runtime.VoidApiResponse(response);

diff --git a/src/generated/apis/OffersApi.ts b/src/generated/apis/OffersApi.ts
@@ -28,6 +28,7 @@ import {
     OfferFromJSON,
     OfferToJSON,
 } from '../models';
+import { createReadStream } from 'fs';
 
 export interface AddAttachmentToOfferDraftRequest {
     companySlug: string;
@@ -115,40 +116,29 @@ export class OffersApi extends runtime.BaseAPI {
             }
         }
 
-        const consumes: runtime.Consume[] = [
-            { contentType: 'multipart/form-data' },
-        ];
-        // @ts-ignore: canConsumeForm may be unused
-        const canConsumeForm = runtime.canConsumeForm(consumes);
+        const formParams = new FormData();
 
-        let formParams: { append(param: string, value: any): any };
-        let useForm = false;
-        // use FormData to transmit files using content-type "multipart/form-data"
-        useForm = canConsumeForm;
-        if (useForm) {
-            formParams = new FormData();
-        } else {
-            formParams = new URLSearchParams();
-        }
+        const { filename, file } = requestParameters;
+
+        formParams.append('filename', filename as any);
 
-        if (requestParameters.filename !== undefined) {
-            formParams.append('filename', requestParameters.filename as any);
+        if (typeof file === 'string') {
+          const stream = createReadStream(file);
+          formParams.append('file', stream, filename);
+        } else {
+          formParams.append('file', file, filename);
         }
 
         if (requestParameters.comment !== undefined) {
             formParams.append('comment', requestParameters.comment as any);
         }
 
-        if (requestParameters.file !== undefined) {
-            formParams.append('file', requestParameters.file as any);
-        }
-
         const response = await this.request({
             path: `/companies/{companySlug}/offers/drafts/{draftId}/attachments`.replace(`{${"companySlug"}}`, encodeURIComponent(String(requestParameters.companySlug))).replace(`{${"draftId"}}`, encodeURIComponent(String(requestParameters.draftId))),
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: formParams,
+            formBody: formParams,
         });
 
         return new runtime.VoidApiResponse(response);