From 1dbfe0bbc9821bbee02220484c87cf9fe12fd033 Mon Sep 17 00:00:00 2001 From: Elias Schneider Date: Fri, 2 Dec 2022 14:43:52 +0100 Subject: [PATCH] fix: convert async function to sync function --- backend/src/email/email.service.ts | 2 +- backend/src/file/file.service.ts | 9 +++++---- backend/test/system/newman-system-tests.json | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/backend/src/email/email.service.ts b/backend/src/email/email.service.ts index 4c56fc6..2d979c1 100644 --- a/backend/src/email/email.service.ts +++ b/backend/src/email/email.service.ts @@ -22,7 +22,7 @@ export class EmailService { if (!this.config.get("emailRecepientsEnabled")) throw new InternalServerErrorException("Email service disabled"); - const shareUrl = `${this.config.get("APP_URL")}/share/${shareId}`; + const shareUrl = `${this.config.get("appUrl")}/share/${shareId}`; await transporter.sendMail({ diff --git a/backend/src/file/file.service.ts b/backend/src/file/file.service.ts index cf662c3..33efaf3 100644 --- a/backend/src/file/file.service.ts +++ b/backend/src/file/file.service.ts @@ -78,14 +78,15 @@ export class FileService { return fs.createReadStream(`./data/uploads/shares/${shareId}/archive.zip`); } - async getFileDownloadUrl(shareId: string, fileId: string) { + getFileDownloadUrl(shareId: string, fileId: string) { const downloadToken = this.generateFileDownloadToken(shareId, fileId); + return `${this.config.get( - "APP_URL" + "appUrl" )}/api/shares/${shareId}/files/${fileId}?token=${downloadToken}`; } - async generateFileDownloadToken(shareId: string, fileId: string) { + generateFileDownloadToken(shareId: string, fileId: string) { if (fileId == "zip") fileId = undefined; return this.jwtService.sign( @@ -100,7 +101,7 @@ export class FileService { ); } - async verifyFileDownloadToken(shareId: string, token: string) { + verifyFileDownloadToken(shareId: string, token: string) { try { const claims = this.jwtService.verify(token, { secret: this.config.get("jwtSecret"), diff --git a/backend/test/system/newman-system-tests.json b/backend/test/system/newman-system-tests.json index d76abef..68b9a14 100644 --- a/backend/test/system/newman-system-tests.json +++ b/backend/test/system/newman-system-tests.json @@ -36,7 +36,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"firstName\" : \"System\",\n \"lastName\" : \"Test\",\n \"email\": \"system@test.org\",\n \"password\": \"J2y8unpJUcJDRv\"\n}", + "raw": "{\n \"email\": \"system@test.org\",\n \"username\": \"system.test\",\n \"password\": \"J2y8unpJUcJDRv\"\n}", "options": { "raw": { "language": "json" @@ -97,7 +97,7 @@ ], "body": { "mode": "raw", - "raw": "{\n \"firstName\" : \"System\",\n \"lastName\" : \"Test2\",\n \"email\": \"system2@test.org\",\n \"password\": \"N44HcHgeuAvfCT\"\n}", + "raw": "{\n \"email\": \"system2@test.org\",\n \"username\": \"system.test2\",\n \"password\": \"N44HcHgeuAvfCT\"\n}", "options": { "raw": { "language": "json"