Revert to-files changes

Add upload files test

Author: jtsmedley

src/index.js

@@ -271,23 +271,20 @@ class FilebaseClient {
 
   //region File Methods
   async #uploadFiles(formData, options) {
-    options.headers = options.headers || {};
-    options.headers = {
-      ...options.headers,
-    };
-    options.headers["Authorization"] =
+    const uploadHeaders = options.headers || {};
+    uploadHeaders["Authorization"] =
       `Bearer ${this.#getIpfsCredentials(options?.bucket)}`;
-    options.params = options.params || {};
-    options.params["to-files"] = options.params.toFiles || "";
-    options.params["cid-version"] = options.params.cidVersion
-      ? Number(options.params.cidVersion)
+    const uploadParams = options.params || {};
+    uploadParams["preserve-filenames"] = "true";
+    uploadParams["cid-version"] = uploadParams.cidVersion
+      ? Number(uploadParams.cidVersion)
       : 0;
 
     const downloadResponse = await this.#ipfs_client.request({
       method: "POST",
       url: "api/v0/add",
-      headers: options.headers,
-      params: options.params,
+      headers: uploadHeaders,
+      params: uploadParams,
       data: formData,
       validateStatus: function (status) {
         return status === 200;
@@ -531,7 +528,7 @@ class FilebaseClient {
       },
       params: {
         "cid-version": options?.cidVersion || 0,
-        "to-files": name,
+        "directory-name": name,
         "wrap-with-directory": "true",
       },
     });
@@ -554,8 +551,7 @@ class FilebaseClient {
    */
   async uploadFile(name, content, options = {}) {
     const uploadFormData = new FormData();
-    uploadFormData.append("file", content);
-    options["to-files"] = name;
+    uploadFormData.append("file", content, name);
 
     const uploadedFiles = await this.uploadFiles(uploadFormData, options);
     return uploadedFiles[0];
@@ -578,10 +574,7 @@ class FilebaseClient {
    * const uploadedFiles = await client.uploadFiles(uploadForm);
    */
   uploadFiles(content, options = {}) {
-    return this.#uploadFiles(content, {
-      ...options,
-      "to-files": options?.prefix || "",
-    });
+    return this.#uploadFiles(content, options);
   }
   //endregion
 

test/index.spec.cjs

@@ -236,6 +236,23 @@ async function uploadObjects(bucket, key, body) {
   return typeof uploadedObject !== "undefined" && uploadedObject !== false;
 }
 
+async function uploadFiles(bucket, body) {
+  // Initialize FilebaseClient
+  const filebaseClient = new FilebaseClient(CLIENT_KEY, CLIENT_SECRET, {
+    bucket,
+    endpoints: {
+      s3: TEST_S3_ENDPOINT,
+      rpc: TEST_RPC_ENDPOINT,
+      platform: TEST_PLATFORM_ENDPOINT,
+    },
+  });
+
+  // Upload Object
+  await filebaseClient.uploadFiles(body);
+
+  return true;
+}
+
 async function deleteObject(bucket, key) {
   // Initialize FilebaseClient
   const filebaseClient = new FilebaseClient(CLIENT_KEY, CLIENT_SECRET, {
@@ -326,6 +343,41 @@ test("upload object", async () => {
   }
 });
 
+test("upload objects", async () => {
+  // Create Bucket `create-objects-test-pass
+  const uploadTestBucket = `${TEST_PREFIX}-create-objects-test-pass`;
+  await createBucket(uploadTestBucket);
+
+  try {
+    // Upload object `create-object-test`
+    const objectPrefix = `create-objects-test/`;
+    const objectsForm = new FormData();
+    objectsForm.append(
+      "file",
+      new Blob(["upload object 1"]),
+      `${objectPrefix}testObjects/1.txt`,
+    );
+    objectsForm.append(
+      "file",
+      new Blob(["upload object 2"]),
+      `${objectPrefix}testObjects/2.txt`,
+    );
+    objectsForm.append(
+      "file",
+      new Blob(["upload object 3"]),
+      `${objectPrefix}testObjects/3.txt`,
+    );
+    const uploaded = await uploadFiles(uploadTestBucket, objectsForm);
+
+    assert.notEqual(uploaded, false);
+    await deleteObject(uploadTestBucket, `${objectPrefix}testObjects/1.txt`);
+    await deleteObject(uploadTestBucket, `${objectPrefix}testObjects/2.txt`);
+    await deleteObject(uploadTestBucket, `${objectPrefix}testObjects/3.txt`);
+  } finally {
+    await deleteBucket(uploadTestBucket);
+  }
+});
+
 test("upload directory", async () => {
   // Create Bucket `create-object-test-pass
   const uploadDirectoryTestBucket = `${TEST_PREFIX}-create-directory-test-pass`;

test/index.spec.mjs

@@ -236,6 +236,23 @@ async function uploadObjects(bucket, key, body) {
   return typeof uploadedObject !== "undefined" && uploadedObject !== false;
 }
 
+async function uploadFiles(bucket, body) {
+  // Initialize FilebaseClient
+  const filebaseClient = new FilebaseClient(CLIENT_KEY, CLIENT_SECRET, {
+    bucket,
+    endpoints: {
+      s3: TEST_S3_ENDPOINT,
+      rpc: TEST_RPC_ENDPOINT,
+      platform: TEST_PLATFORM_ENDPOINT,
+    },
+  });
+
+  // Upload Object
+  await filebaseClient.uploadFiles(body);
+
+  return true;
+}
+
 async function deleteObject(bucket, key) {
   // Initialize FilebaseClient
   const filebaseClient = new FilebaseClient(CLIENT_KEY, CLIENT_SECRET, {
@@ -326,6 +343,41 @@ test("upload object", async () => {
   }
 });
 
+test("upload objects", async () => {
+  // Create Bucket `create-objects-test-pass
+  const uploadTestBucket = `${TEST_PREFIX}-create-objects-test-pass`;
+  await createBucket(uploadTestBucket);
+
+  try {
+    // Upload object `create-object-test`
+    const objectPrefix = `create-objects-test/`;
+    const objectsForm = new FormData();
+    objectsForm.append(
+      "file",
+      new Blob(["upload object 1"]),
+      `${objectPrefix}testObjects/1.txt`,
+    );
+    objectsForm.append(
+      "file",
+      new Blob(["upload object 2"]),
+      `${objectPrefix}testObjects/2.txt`,
+    );
+    objectsForm.append(
+      "file",
+      new Blob(["upload object 3"]),
+      `${objectPrefix}testObjects/3.txt`,
+    );
+    const uploaded = await uploadFiles(uploadTestBucket, objectsForm);
+
+    assert.notEqual(uploaded, false);
+    await deleteObject(uploadTestBucket, `${objectPrefix}testObjects/1.txt`);
+    await deleteObject(uploadTestBucket, `${objectPrefix}testObjects/2.txt`);
+    await deleteObject(uploadTestBucket, `${objectPrefix}testObjects/3.txt`);
+  } finally {
+    await deleteBucket(uploadTestBucket);
+  }
+});
+
 test("upload directory", async () => {
   // Create Bucket `create-object-test-pass
   const uploadDirectoryTestBucket = `${TEST_PREFIX}-create-directory-test-pass`;