code review changes

Author: dev-saad07

src/upload/index.ts

@@ -40,21 +40,23 @@ export const upload = (
   }
 
   var formData = new FormData();
-  let i: keyof typeof uploadOptions;
-  for (i in uploadOptions) {
-    const param = uploadOptions[i];
-    if (typeof param !== "undefined") {
-      if (typeof param === "string" || typeof param === "boolean")  {
-        formData.append(i, String(param));
-      } 
-      else if(Array.isArray(param)) {
-        formData.append(i, JSON.stringify(param));
-      }
-      else if(typeof param === "object" && !(param instanceof File || param instanceof Blob)) {
-        formData.append(i, JSON.stringify(param));
+  let key: keyof typeof uploadOptions;
+  for (key in uploadOptions) {
+    if (key) {
+      if (key == "file" && typeof uploadOptions.file != "string") {
+        formData.append('file', uploadOptions.file, String(uploadOptions.fileName));
+      } else if (key == "tags" && Array.isArray(uploadOptions.tags)) {
+        formData.append('tags', uploadOptions.tags.join(","));
+      } else if (key == "responseFields" && Array.isArray(uploadOptions.responseFields)) {
+        formData.append('responseFields', uploadOptions.responseFields.join(","));
+      } else if (key == "extensions" && Array.isArray(uploadOptions.extensions)) {
+        formData.append('extensions', JSON.stringify(uploadOptions.extensions));
+      } else if (key === "customMetadata" && typeof uploadOptions.customMetadata === "object" &&
+        !Array.isArray(uploadOptions.customMetadata) && uploadOptions.customMetadata !== null) {
+        formData.append('customMetadata', JSON.stringify(uploadOptions.customMetadata));
       }
       else {
-        formData.append(i, param);
+        formData.append(key, String(uploadOptions[key]));
       }
     }
   }

src/utils/request.ts

@@ -39,8 +39,7 @@ const addResponseHeadersAndBody = (body: any, xhr: XMLHttpRequest):IKResponse<Up
 }
 
 export const request = (uploadFileXHR: XMLHttpRequest,formData: FormData, options: ImageKitOptions & { authenticationEndpoint: string }, callback?: (err: Error | null, response: UploadResponse | null) => void) => {
-    var signatureXHR = new XMLHttpRequest();
-    generateSignatureToken(signatureXHR, options, (err, signaturObj) => {
+    generateSignatureToken(options, (err, signaturObj) => {
         if (err) {
             return respond(true, err, callback)
         } else {
@@ -59,7 +58,8 @@ export const request = (uploadFileXHR: XMLHttpRequest,formData: FormData, option
     return uploadFileXHR;
 }
 
-export const generateSignatureToken = (xhr:XMLHttpRequest, options: ImageKitOptions & { authenticationEndpoint: string }, callback: (err: Error | null, response: SignatureResponse | null) => void) => {
+export const generateSignatureToken = (options: ImageKitOptions & { authenticationEndpoint: string }, callback: (err: Error | null, response: SignatureResponse | null) => void) => {
+    var xhr = new XMLHttpRequest();
     xhr.timeout = 60000;
     xhr.open('GET', options.authenticationEndpoint);
     xhr.ontimeout = function (e) {

test/upload.js

@@ -418,7 +418,7 @@ describe("File upload", function () {
         expect(arg.get('expire')).to.be.equal("123");
         expect(arg.get('signature')).to.be.equal("test_signature");
         expect(arg.get('publicKey')).to.be.equal('test_public_key');
-        expect(arg.get('tags')).to.be.equal(undefined);
+        expect(arg.get('tags')).to.be.equal('undefined');
         expect(arg.get('isPrivateFile')).to.be.equal(undefined);
         expect(arg.get('useUniqueFileName')).to.be.equal(undefined);
         expect(arg.get('customCoordinates')).to.be.equal(undefined);
@@ -445,7 +445,7 @@ describe("File upload", function () {
 
         var arg = server.requests[0].requestBody;
 
-        expect(JSON.parse(arg.get('file')).data.length).to.be.eq(buffer.length);
+        expect(arg.get('file').size).to.be.eq(buffer.length);
         expect(arg.get('fileName')).to.be.equal("test_file_name");
         expect(arg.get('token')).to.be.equal("test_token");
         expect(arg.get('expire')).to.be.equal("123");