activity logs and change S3 piblic access to signed urls

src/controllers/invoice/invoice.controller.ts

@@ -67,7 +67,7 @@ export const createInvoice = async (req: Request, res: Response) => {
           term: aiServiceData.terms,
           pw_work_order_id: aiServiceData.workOrderID,
           filename: file.originalname,
-          pdf_url: (await uploadResults[index]).Location,
+          pdf_url: (await uploadResults[index]).url,
           uploaded_by: 1, // TODO : replace with logged in user when user module is implemented
         };
 
@@ -364,7 +364,7 @@ export const updateInvoiceData = async (invoiceId: number, updatedInvoiceData: a
 
   for (const key in updatedInvoiceData) {
     if (originalInvoiceData[key] !== updatedInvoiceData[key]) {
-      await logInvoiceAction({ invoice_id: invoiceId, user_id: userId, activity_type: 'update', field_name: key, old_value: originalInvoiceData[key] as string, new_value: updatedInvoiceData[key] });
+      await logInvoiceAction({ invoice_id: invoiceId, user_id: userId, activity_type: 'update', field_name: key, old_value: originalInvoiceData[key] as string, new_value: updatedInvoiceData[key] as string });
     }
   }
 
@@ -416,9 +416,6 @@ export const updateInvoice = async (req: Request, res: Response): Promise<Respon
   }
 };
 
-
-
-
 // Delete an invoice
 export const deleteInvoice = async (req: Request, res: Response): Promise<Response> => {
   try {

src/middlewares/multer.ts

@@ -1,5 +1,6 @@
 import multer from 'multer';
 import AWS from 'aws-sdk';
+import { GenerateDownloadUrlParams, GenerateSignedUrlParams } from 'shared/interfaces/s3.interface';
 
 export const s3 = new AWS.S3({
     accessKeyId: process.env.AWS_ACCESS_KEY_ID,
@@ -12,3 +13,46 @@ const storage = multer.memoryStorage();
 const upload = multer({ storage });
 
 export const multipleUpload = upload.array('files');
+
+export const generateSignedUrl = async ({
+  bucketName,
+  objectKey,
+  expiration = 3600,
+  contentType = 'application/octet-stream',
+}: GenerateSignedUrlParams): Promise<string> => {
+  const params = {
+    Bucket: bucketName,
+    Key: objectKey,
+    Expires: expiration, 
+    ContentType: contentType,
+  };
+
+  try {
+    const url = await s3.getSignedUrlPromise('putObject', params);
+    
+    return url;
+  } catch (err) {
+    console.error('Error generating signed URL', err);
+    throw err;
+  }
+};
+
+export const generateDownloadUrl = async ({
+  bucketName,
+  objectKey,
+  expiration = 60 * 60 * 24 * 365 * 10 // URL EXPIRY is set to 10 years for now, TODO: change the logic in frontend to get file download url run time
+}: GenerateDownloadUrlParams): Promise<string> => {
+  const params = {
+    Bucket: bucketName,
+    Key: objectKey,
+    Expires: expiration,
+  };
+
+  try {
+    const url = await s3.getSignedUrlPromise('getObject', params);
+    return url;
+  } catch (err) {
+    console.error('Error generating signed URL', err);
+    throw err;
+  }
+};

src/shared/interfaces/s3.interface.ts

@@ -0,0 +1,11 @@
+export interface GenerateSignedUrlParams {
+    bucketName: string;
+    objectKey: string;
+    expiration?: number;
+    contentType?: string;
+}
+export interface GenerateDownloadUrlParams {
+    bucketName: string;
+    objectKey: string;
+    expiration?: number;
+}

src/shared/services/invoice.service.ts

@@ -1,17 +1,44 @@
-import { s3 } from '../../middlewares/multer';
+import { s3, generateSignedUrl, generateDownloadUrl } from '../../middlewares/multer';
 
-export const uploadInvoice = (files: Express.Multer.File[]) => {
-    const uploadPromises = files.map(file => {
-        const params = {
-            Bucket: process.env.AWS_S3_BUCKET_NAME || '',
-            Key: Date.now().toString() + '-' + file.originalname,
-            Body: file.buffer,
-            ContentType: 'application/pdf',
-            ContentDisposition: 'inline'
-        };
+export const uploadInvoice = async (files: Express.Multer.File[]) => {
+  const uploadPromises = files.map(async (file) => {
+    const objectKey = Date.now().toString() + '-' + file.originalname;
+    const bucketName = process.env.AWS_S3_BUCKET_NAME || '';
 
-        return s3.upload(params).promise();
+    try {
+      const signedUrl = await generateSignedUrl({
+        bucketName,
+        objectKey,
+        contentType: file.mimetype,
+      });
+
+      // Use fetch to upload the file using the signed URL
+      const response = await fetch(signedUrl, {
+        method: 'PUT',
+        headers: {
+          'Content-Type': file.mimetype,
+        },
+        body: file.buffer,
+      });
+
+      if (!response.ok) {
+        throw new Error('File upload failed');
+      }
+    
+    // Generate download URL
+    const downloadUrl = await generateDownloadUrl({
+      bucketName: process.env.AWS_S3_BUCKET_NAME || '',
+      objectKey,
     });
 
-    return uploadPromises;
+    return { file: file.originalname, url: downloadUrl };
+    
+    } catch (err) {
+      console.error('Error uploading file', err);
+      throw err;
+    }
+  });
+
+  return uploadPromises;
+  // return Promise.all(uploadPromises);
 };