aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-06-29 14:22:13 +0200
committerChocobozzz <me@florianbigard.com>2023-06-29 14:22:13 +0200
commit8ef866071f8109719e68647141d4c9e138438585 (patch)
tree3ae43b056273aebd3aca601ef7499e1d92f79740 /client/src
parent9cd06903f4e83b67bde8bd558374c75127a86c39 (diff)
downloadPeerTube-8ef866071f8109719e68647141d4c9e138438585.tar.gz
PeerTube-8ef866071f8109719e68647141d4c9e138438585.tar.zst
PeerTube-8ef866071f8109719e68647141d4c9e138438585.zip
Fix fetching storyboard of password protected video
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.ts2
-rw-r--r--client/src/app/shared/shared-main/video/video.service.ts6
2 files changed, 5 insertions, 3 deletions
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index 43744789d..54e0649ba 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -287,7 +287,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
287 forkJoin([ 287 forkJoin([
288 videoAndLiveObs, 288 videoAndLiveObs,
289 this.videoCaptionService.listCaptions(videoId, videoPassword), 289 this.videoCaptionService.listCaptions(videoId, videoPassword),
290 this.videoService.getStoryboards(videoId), 290 this.videoService.getStoryboards(videoId, videoPassword),
291 this.userService.getAnonymousOrLoggedUser() 291 this.userService.getAnonymousOrLoggedUser()
292 ]).subscribe({ 292 ]).subscribe({
293 next: ([ { video, live, videoFileToken }, captionsResult, storyboards, loggedInOrAnonymousUser ]) => { 293 next: ([ { video, live, videoFileToken }, captionsResult, storyboards, loggedInOrAnonymousUser ]) => {
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 c2e3d7511..4e8b84dfc 100644
--- a/client/src/app/shared/shared-main/video/video.service.ts
+++ b/client/src/app/shared/shared-main/video/video.service.ts
@@ -347,9 +347,11 @@ export class VideoService {
347 347
348 // --------------------------------------------------------------------------- 348 // ---------------------------------------------------------------------------
349 349
350 getStoryboards (videoId: string | number) { 350 getStoryboards (videoId: string | number, videoPassword: string) {
351 const headers = VideoPasswordService.buildVideoPasswordHeader(videoPassword)
352
351 return this.authHttp 353 return this.authHttp
352 .get<{ storyboards: Storyboard[] }>(VideoService.BASE_VIDEO_URL + '/' + videoId + '/storyboards') 354 .get<{ storyboards: Storyboard[] }>(VideoService.BASE_VIDEO_URL + '/' + videoId + '/storyboards', { headers })
353 .pipe( 355 .pipe(
354 map(({ storyboards }) => storyboards), 356 map(({ storyboards }) => storyboards),
355 catchError(err => { 357 catchError(err => {