yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-03 01:39:37 +02:00
Code Issues Releases Wiki Activity

Add ability to set password from embed API

Browse source
This commit is contained in:
Chocobozzz 2023-11-23 08:14:54 +01:00
parent 4c07200d64
commit b13460a10a
No known key found for this signature in database
GPG key ID: 583A612D890159BE
8 changed files with 127 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

60
client/src/standalone/videos/embed.ts
View file

@ -53,6 +53,8 @@ export class PeerTubeEmbed {
private alreadyPlayed = false
private videoPassword: string
private videoPasswordFromAPI: string
private onVideoPasswordFromAPIResolver: (value: string) => void
private requiresPassword: boolean
constructor (videoWrapperId: string) {
@ -142,17 +144,33 @@ export class PeerTubeEmbed {
}
private initializeApi () {
if (this.playerOptionsBuilder.hasAPIEnabled()) {
if (this.api) {
this.api.reInit()
return
}
if (!this.playerOptionsBuilder.hasAPIEnabled()) return
if (this.api) return
this.api = new PeerTubeEmbedApi(this)
this.api.initialize()
this.api = new PeerTubeEmbedApi(this)
this.api.initialize()
}
// ---------------------------------------------------------------------------
setVideoPasswordByAPI (password: string) {
logger.info('Setting password from API')
this.videoPasswordFromAPI = password
if (this.onVideoPasswordFromAPIResolver) {
this.onVideoPasswordFromAPIResolver(password)
}
}
private getPasswordByAPI () {
if (this.videoPasswordFromAPI) return Promise.resolve(this.videoPasswordFromAPI)
return new Promise<string>(res => {
this.onVideoPasswordFromAPIResolver = res
})
}
// ---------------------------------------------------------------------------
async playNextPlaylistVideo () {
@ -191,6 +209,9 @@ export class PeerTubeEmbed {
}) {
const { uuid, forceAutoplay } = options
this.playerOptionsBuilder.loadCommonParams()
this.initializeApi()
try {
const {
videoResponse,
@ -218,7 +239,7 @@ export class PeerTubeEmbed {
const videoInfoPromise = videoResponse.json()
.then(async (videoInfo: VideoDetails) => {
this.playerOptionsBuilder.loadParams(this.config, videoInfo)
this.playerOptionsBuilder.loadVideoParams(this.config, videoInfo)
const live = videoInfo.isLive
? await this.videoFetcher.loadLive(videoInfo)
@ -287,7 +308,8 @@ export class PeerTubeEmbed {
(window as any)['videojsPlayer'] = this.player
this.buildCSS()
this.initializeApi()
if (this.api) this.api.initWithVideo()
}
this.alreadyInitialized = true
@ -360,10 +382,30 @@ export class PeerTubeEmbed {
if (incorrectPassword === null) return false
this.requiresPassword = true
if (this.playerOptionsBuilder.mustWaitPasswordFromEmbedAPI()) {
logger.info('Waiting for password from Embed API')
const videoPasswordFromAPI = await this.getPasswordByAPI()
if (videoPasswordFromAPI && this.videoPassword !== videoPasswordFromAPI) {
logger.info('Using video password from API')
this.videoPassword = videoPasswordFromAPI
return true
}
logger.error('Password from embed API is not valid')
return false
}
this.videoPassword = await this.playerHTML.askVideoPassword({
incorrectPassword,
translations: await this.translationsPromise
})
return true
}