refactor(useS3Object): Resolve key at upload function

becem-gharbi · Sep 28, 2023 · 9d63e9c · 9d63e9c
1 parent b638e14
commit 9d63e9c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/playground/app.vue b/playground/app.vue
@@ -19,7 +19,7 @@ const url = ref(
 async function handleChange(files: File[]) {
   url.value = await upload(files[0], {
     url: url.value,
-    key: "my_folder/my_file"
+  //  key: "my_folder/my_file"
   });
 }
 </script>
diff --git a/src/runtime/composables/useS3Object.ts b/src/runtime/composables/useS3Object.ts
@@ -5,10 +5,9 @@ export default function () {
   const { callHook } = useNuxtApp();
   const config = useRuntimeConfig();
 
-  async function create(file: File, key?: string) {
-    key ||= uuidv4();
-
+  async function create(file: File, key: string) {
     const formData = new FormData();
+
     formData.append("file", file);
 
     const headers = { authorization: "" };
@@ -24,9 +23,7 @@ export default function () {
     return getURL(key);
   }
 
-  async function update(url: string, file: File, newKey?: string) {
-    newKey ||= uuidv4();
-
+  async function update(url: string, file: File, key: string) {
     const headers = { authorization: "" };
 
     await callHook("s3:auth", headers);
@@ -35,7 +32,7 @@ export default function () {
 
     await callHook("s3:auth", headers);
 
-    return create(file, newKey);
+    return create(file, key);
   }
 
   /**
@@ -62,13 +59,15 @@ export default function () {
   async function upload(file: File, opts?: { url?: string; key?: string }) {
     checkType(file.type);
 
+    const _key = opts?.key || uuidv4();
+
     if (opts?.url) {
       if (isValidURL(opts.url)) {
-        return update(opts.url, file, opts.key);
+        return update(opts.url, file, _key);
       }
     }
 
-    return create(file, opts?.key);
+    return create(file, _key);
   }
 
   /**