From 1e2d745001e3919a169b8cdf0758d890e04558f4 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 7 Mar 2022 09:57:03 +0000
Subject: [PATCH] Fix relative usage of S3 upload API calls

---
 packages/frontend-core/src/api/attachments.js | 105 +++++++++---------
 1 file changed, 55 insertions(+), 50 deletions(-)

diff --git a/packages/frontend-core/src/api/attachments.js b/packages/frontend-core/src/api/attachments.js
index 2077c4f7ef..e2eb348f9d 100644
--- a/packages/frontend-core/src/api/attachments.js
+++ b/packages/frontend-core/src/api/attachments.js
@@ -1,61 +1,66 @@
-export const buildAttachmentEndpoints = API => ({
-  /**
-   * Uploads an attachment to the server.
-   * @param data the attachment to upload
-   * @param tableId the table ID to upload to
-   */
-  uploadAttachment: async ({ data, tableId }) => {
-    return await API.post({
-      url: `/api/attachments/${tableId}/upload`,
-      body: data,
-      json: false,
-    })
-  },
-
-  /**
-   * Uploads an attachment to the server as a builder user from the builder.
-   * @param data the data to upload
-   */
-  uploadBuilderAttachment: async data => {
-    return await API.post({
-      url: "/api/attachments/process",
-      body: data,
-      json: false,
-    })
-  },
-
+export const buildAttachmentEndpoints = API => {
   /**
    * Generates a signed URL to upload a file to an external datasource.
    * @param datasourceId the ID of the datasource to upload to
    * @param bucket the name of the bucket to upload to
    * @param key the name of the file to upload to
    */
-  getSignedDatasourceURL: async ({ datasourceId, bucket, key }) => {
+  const getSignedDatasourceURL = async ({ datasourceId, bucket, key }) => {
     return await API.post({
       url: `/api/attachments/${datasourceId}/url`,
       body: { bucket, key },
     })
-  },
+  }
 
-  /**
-   * Uploads a file to an external datasource.
-   * @param datasourceId the ID of the datasource to upload to
-   * @param bucket the name of the bucket to upload to
-   * @param key the name of the file to upload to
-   * @param data the file to upload
-   */
-  externalUpload: async ({ datasourceId, bucket, key, data }) => {
-    const { signedUrl, publicUrl } = await API.getSignedDatasourceURL({
-      datasourceId,
-      bucket,
-      key,
-    })
-    await API.put({
-      url: signedUrl,
-      body: data,
-      json: false,
-      external: true,
-    })
-    return { publicUrl }
-  },
-})
+  return {
+    getSignedDatasourceURL,
+
+    /**
+     * Uploads an attachment to the server.
+     * @param data the attachment to upload
+     * @param tableId the table ID to upload to
+     */
+    uploadAttachment: async ({ data, tableId }) => {
+      return await API.post({
+        url: `/api/attachments/${tableId}/upload`,
+        body: data,
+        json: false,
+      })
+    },
+
+    /**
+     * Uploads an attachment to the server as a builder user from the builder.
+     * @param data the data to upload
+     */
+    uploadBuilderAttachment: async data => {
+      return await API.post({
+        url: "/api/attachments/process",
+        body: data,
+        json: false,
+      })
+    },
+
+    /**
+     * Uploads a file to an external datasource.
+     * @param datasourceId the ID of the datasource to upload to
+     * @param bucket the name of the bucket to upload to
+     * @param key the name of the file to upload to
+     * @param data the file to upload
+     */
+    externalUpload: async ({ datasourceId, bucket, key, data }) => {
+      console.log(API)
+      const { signedUrl, publicUrl } = await getSignedDatasourceURL({
+        datasourceId,
+        bucket,
+        key,
+      })
+      await API.put({
+        url: signedUrl,
+        body: data,
+        json: false,
+        external: true,
+      })
+      return { publicUrl }
+    },
+  }
+}