@bash-app/bash-common 1.12.0 → 1.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",
@@ -24,9 +24,9 @@
     "typescript": "^5.2.2"
   },
   "peerDependencies": {
-    "tsx": "^4.10.3",
     "dayjs": "^1.11.10",
-    "react-tailwindcss-datepicker": "^1.6.6"
+    "react-tailwindcss-datepicker": "^1.6.6",
+    "tsx": "^4.10.3"
   },
   "devDependencies": {
     "@prisma/client": "^5.13.0",

package/src/utils/awsS3Utils.ts

@@ -4,7 +4,24 @@ import {DeleteObjectCommandOutput} from "@aws-sdk/client-s3/dist-types/commands"
 
 
 export class AwsS3Utils {
-  static async uploadFile(file: Blob, preSignedUrl: string | undefined, mimetype: string): Promise<boolean> {
+  static async uploadBase64String(base64Str: string, assetKey: string): Promise<string | undefined> {
+    const bufferData = Buffer.from(base64Str, 'base64');
+    const blobData = new Blob([bufferData]);
+    return AwsS3Utils.uploadFile(blobData, assetKey, 'text/plain');
+  }
+
+  static async uploadFile(file: Blob, assetKey: string, mimetype: string): Promise<string | undefined> {
+    const preSignedUrl = await AwsS3Utils.createPreSignedUrl(assetKey, mimetype);
+    const assetUrl = AwsS3Utils.createUrlFromAssetKey(assetKey);
+    const uploadSuccessful = await AwsS3Utils.uploadFileViaPreSignedUrl(file, preSignedUrl, mimetype);
+    if (uploadSuccessful) {
+      return assetUrl;
+    }
+  }
+
+  static async uploadFileViaPreSignedUrl(file: Blob,
+                                         preSignedUrl: string | undefined,
+                                         mimetype: string): Promise<boolean> {
     try {
       if (!file) {
         throw new Error('The file data buffer was undefined; no data to upload.');
@@ -16,7 +33,7 @@ export class AwsS3Utils {
       const res = await fetch(preSignedUrl, {
         method: 'PUT',
         headers: {
-          'Content-Type': mimetype,
+          'Content-Type': mimetype
         },
         body: file
       });
@@ -56,7 +73,7 @@ export class AwsS3Utils {
       ContentType: mimetype
     });
     return getSignedUrl(client, command, {
-      expiresIn: 3600
+      expiresIn: 3600,
     });
   }