OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix fetching storyboard of password protected video

pull/5870/head
Chocobozzz 2023-06-29 14:22:13 +02:00
parent 9cd06903f4
commit 8ef866071f
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/+videos/+video-watch/video-watch.component.ts
View File

@ -287,7 +287,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
forkJoin([ forkJoin([
videoAndLiveObs, videoAndLiveObs,
this.videoCaptionService.listCaptions(videoId, videoPassword), this.videoCaptionService.listCaptions(videoId, videoPassword),
this.videoService.getStoryboards(videoId), this.videoService.getStoryboards(videoId, videoPassword),
this.userService.getAnonymousOrLoggedUser() this.userService.getAnonymousOrLoggedUser()
]).subscribe({ ]).subscribe({
next: ([ { video, live, videoFileToken }, captionsResult, storyboards, loggedInOrAnonymousUser ]) => { next: ([ { video, live, videoFileToken }, captionsResult, storyboards, loggedInOrAnonymousUser ]) => {

6
client/src/app/shared/shared-main/video/video.service.ts
View File

@ -347,9 +347,11 @@ export class VideoService {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
getStoryboards (videoId: string | number) { getStoryboards (videoId: string | number, videoPassword: string) {
const headers = VideoPasswordService.buildVideoPasswordHeader(videoPassword)
return this.authHttp return this.authHttp
.get<{ storyboards: Storyboard[] }>(VideoService.BASE_VIDEO_URL + '/' + videoId + '/storyboards') .get<{ storyboards: Storyboard[] }>(VideoService.BASE_VIDEO_URL + '/' + videoId + '/storyboards', { headers })
.pipe( .pipe(
map(({ storyboards }) => storyboards), map(({ storyboards }) => storyboards),
catchError(err => { catchError(err => {