aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-05-28 09:50:27 +0200
committerChocobozzz <me@florianbigard.com>2019-05-28 09:50:27 +0200
commit964298de4e112df0e126aad755c6b077442a2821 (patch)
tree99a77835b7db55bf89b670d7739084b3e31365c8 /server
parentff0bce13592da002a836caedf8daebcdd035260c (diff)
downloadPeerTube-964298de4e112df0e126aad755c6b077442a2821.tar.gz
PeerTube-964298de4e112df0e126aad755c6b077442a2821.tar.zst
PeerTube-964298de4e112df0e126aad755c6b077442a2821.zip
Fix playlist get for classic users
Diffstat (limited to 'server')
-rw-r--r--server/middlewares/validators/videos/video-playlists.ts3
-rw-r--r--server/tests/api/videos/video-playlists.ts15
2 files changed, 16 insertions, 2 deletions
diff --git a/server/middlewares/validators/videos/video-playlists.ts b/server/middlewares/validators/videos/video-playlists.ts
index 2c3f7e542..f68eeeeb3 100644
--- a/server/middlewares/validators/videos/video-playlists.ts
+++ b/server/middlewares/validators/videos/video-playlists.ts
@@ -140,9 +140,10 @@ const videoPlaylistsGetValidator = [
140 await authenticatePromiseIfNeeded(req, res) 140 await authenticatePromiseIfNeeded(req, res)
141 141
142 const user = res.locals.oauth ? res.locals.oauth.token.User : null 142 const user = res.locals.oauth ? res.locals.oauth.token.User : null
143
143 if ( 144 if (
144 !user || 145 !user ||
145 (videoPlaylist.OwnerAccount.userId !== user.id && !user.hasRight(UserRight.UPDATE_ANY_VIDEO_PLAYLIST)) 146 (videoPlaylist.OwnerAccount.id !== user.Account.id && !user.hasRight(UserRight.UPDATE_ANY_VIDEO_PLAYLIST))
146 ) { 147 ) {
147 return res.status(403) 148 return res.status(403)
148 .json({ error: 'Cannot get this private video playlist.' }) 149 .json({ error: 'Cannot get this private video playlist.' })
diff --git a/server/tests/api/videos/video-playlists.ts b/server/tests/api/videos/video-playlists.ts
index e4d817ff8..fd5e4c4be 100644
--- a/server/tests/api/videos/video-playlists.ts
+++ b/server/tests/api/videos/video-playlists.ts
@@ -36,7 +36,8 @@ import {
36 uploadVideo, 36 uploadVideo,
37 uploadVideoAndGetId, 37 uploadVideoAndGetId,
38 userLogin, 38 userLogin,
39 waitJobs 39 waitJobs,
40 generateUserAccessToken
40} from '../../../../shared/extra-utils' 41} from '../../../../shared/extra-utils'
41import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model' 42import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model'
42import { VideoPlaylist } from '../../../../shared/models/videos/playlist/video-playlist.model' 43import { VideoPlaylist } from '../../../../shared/models/videos/playlist/video-playlist.model'
@@ -138,6 +139,18 @@ describe('Test video playlists', function () {
138 } 139 }
139 }) 140 })
140 141
142 it('Should get private playlist for a classic user', async function () {
143 const token = await generateUserAccessToken(servers[0], 'toto')
144
145 const res = await getAccountPlaylistsListWithToken(servers[0].url, token, 'toto', 0, 5)
146
147 expect(res.body.total).to.equal(1)
148 expect(res.body.data).to.have.lengthOf(1)
149
150 const playlistId = res.body.data[0].id
151 await getPlaylistVideos(servers[0].url, token, playlistId, 0, 5)
152 })
153
141 it('Should create a playlist on server 1 and have the playlist on server 2 and 3', async function () { 154 it('Should create a playlist on server 1 and have the playlist on server 2 and 3', async function () {
142 this.timeout(30000) 155 this.timeout(30000)
143 156