From 0484b82fe3f6eab4cdbf21390b15ff8529ea3acc Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 7 Oct 2024 08:33:39 +0200 Subject: [PATCH] Fix downloading private/internal video --- client/src/app/shared/shared-main/video/video.service.ts | 5 ++++- .../download/video-generate-download.component.ts | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client/src/app/shared/shared-main/video/video.service.ts b/client/src/app/shared/shared-main/video/video.service.ts index 455a0c780..388953386 100644 --- a/client/src/app/shared/shared-main/video/video.service.ts +++ b/client/src/app/shared/shared-main/video/video.service.ts @@ -382,14 +382,17 @@ export class VideoService { generateDownloadUrl (options: { video: Video files: VideoFile[] + videoFileToken?: string }) { - const { video, files } = options + const { video, files, videoFileToken } = options if (files.length === 0) throw new Error('Cannot generate download URL without files') let url = `${VideoService.BASE_VIDEO_DOWNLOAD_URL}/${video.uuid}?` url += files.map(f => 'videoFileIds=' + f.id).join('&') + if (videoFileToken) url += `&videoFileToken=${videoFileToken}` + return url } diff --git a/client/src/app/shared/shared-video-miniature/download/video-generate-download.component.ts b/client/src/app/shared/shared-video-miniature/download/video-generate-download.component.ts index 52bb04552..6cbe96cc4 100644 --- a/client/src/app/shared/shared-video-miniature/download/video-generate-download.component.ts +++ b/client/src/app/shared/shared-video-miniature/download/video-generate-download.component.ts @@ -104,7 +104,7 @@ export class VideoGenerateDownloadComponent implements OnInit { files.push(this.findAudioFileOnly()) } - return this.videoService.generateDownloadUrl({ video: this.video, files }) + return this.videoService.generateDownloadUrl({ video: this.video, videoFileToken: this.videoFileToken, files }) } // ---------------------------------------------------------------------------