swissmakers_gmbh/swiss-datashare
12
0
Fork 0
mirror of https://github.com/swissmakers/swiss-datashare.git synced 2026-04-11 10:27:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: convert async function to sync function

Browse Source
This commit is contained in:
Elias Schneider
2022-12-02 14:43:52 +01:00
parent b649d8bf8e
commit 1dbfe0bbc9
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/email/email.service.ts
View File

@@ -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({

9
backend/src/file/file.service.ts
View File

@@ -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"),

4
backend/test/system/newman-system-tests.json
View File

@@ -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"