✔ File Name ~

bifeldy · Jan 21, 2024 · af15289 · af15289
1 parent 5d97b1d
commit af15289
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/dist/main-site/server/main.js b/dist/main-site/server/main.js
diff --git a/projects/main-site/src/api/controllers/attachment.controller.ts b/projects/main-site/src/api/controllers/attachment.controller.ts
@@ -270,7 +270,13 @@ export class AttachmentController {
         } catch (e) {
           this.gs.log('[DDL-ERROR] 💽', e, 'error');
         }
-        const ddl =  await this.aws.getDdl(resSaveAttachment.aws_s3, user, expiredSeconds);
+        const ddl =  await this.aws.getDdl(
+          resSaveAttachment.aws_s3,
+          user,
+          expiredSeconds,
+          resSaveAttachment.orig,
+          resSaveAttachment.mime
+        );
         res.redirect(301, ddl.toString());
       } else {
         const files = readdirSync(`${environment.uploadFolder}`, { withFileTypes: true });

diff --git a/projects/main-site/src/api/controllers/ddl-file.controller.ts b/projects/main-site/src/api/controllers/ddl-file.controller.ts
@@ -74,7 +74,12 @@ export class DdlGenerateController {
       } catch (e) {
         this.gs.log('[DDL-ERROR] 💽', e, 'error');
       }
-      const ddl =  await this.aws.getDdl(resSaveAttachment.aws_s3, user, expiredSeconds);
+      const ddl =  await this.aws.getDdl(
+        resSaveAttachment.aws_s3,
+        user, expiredSeconds,
+        resSaveAttachment.orig,
+        resSaveAttachment.mime
+      );
       res.status(HttpStatus.OK).json(classToPlain({
         info: `😅 200 - DDL File API :: Generate URL 🤣`,
         result: resSaveAttachment,

diff --git a/projects/main-site/src/api/services/amazon-web.service.ts b/projects/main-site/src/api/services/amazon-web.service.ts
@@ -33,7 +33,7 @@ export class AmazonWebService {
     });
   }
 
-  async getDdl(fileName: string, user: UserModel, expiredSeconds = CONSTANTS.timeDdlS3): Promise<URL> {
+  async getDdl(fileName: string, user: UserModel, expiredSeconds = CONSTANTS.timeDdlS3, customFileName = null, customMimeType = null): Promise<URL> {
     if (fileName.startsWith('http://')) {
       fileName = fileName.slice(7, fileName.length);
     } else if (fileName.startsWith('https://')) {
@@ -48,11 +48,18 @@ export class AmazonWebService {
     if (fileName.startsWith(directLink2)) {
       fileName = fileName.slice(directLink2.length, fileName.length);
     }
-    const ddl = await this.s3().getSignedUrlPromise('getObject', {
+    const optParam: any = {
       Bucket: bucketName,
       Key: fileName,
       Expires: expiredSeconds
-    });
+    };
+    if (customFileName) {
+      optParam.ResponseContentDisposition = `attachment; filename ="${customFileName}"`;
+    }
+    if (customMimeType) {
+      optParam.ResponseContentType = customMimeType;
+    }
+    const ddl = await this.s3().getSignedUrlPromise('getObject', optParam);
     const uri = new URL(ddl);
     const url = new URL(`https://${bucketName}/${fileName}`);
     const sp = ['AWSAccessKeyId', 'Expires', 'Signature'];