diff options
author | kontrollanten <6680299+kontrollanten@users.noreply.github.com> | 2021-12-13 15:29:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-13 15:29:13 +0100 |
commit | a37e9e74ff07b057370d1ed6c0b391a02be8a6d2 (patch) | |
tree | 30d59e12518149a309bbd10bee1485f8be523c75 /shared | |
parent | 11e520b50d791a0dd48cbb2d0fc681b25eb7cd53 (diff) | |
download | PeerTube-a37e9e74ff07b057370d1ed6c0b391a02be8a6d2.tar.gz PeerTube-a37e9e74ff07b057370d1ed6c0b391a02be8a6d2.tar.zst PeerTube-a37e9e74ff07b057370d1ed6c0b391a02be8a6d2.zip |
Give moderators access to edit channels (#4608)
* give admins access to edit all channels
closes #4598
* test(channels): +admin update another users channel
* Fix tests
* fix(server): delete another users channel
Since the channel owner isn't necessary the auth user we need to check
the right account whether it's the last video or not.
* REMOVE_ANY_VIDEO_CHANNEL > MANAGE_ANY_VIDEO_CHANNEL
Merge REMOVE_ANY_VIDEO_CHANNEL and MANY_VIDEO_CHANNELS to
MANAGE_ANY_VIDEO_CHANNEL.
* user-right: moderator can't manage admins channel
* client: MyVideoChannelCreateComponent > VideoChannelCreateComponent
* client: MyVideoChannelEdit > VideoChannelEdit
* Revert "user-right: moderator can't manage admins channel"
This reverts commit 2c627c154e2bfe6af2e0f45efb27faf4117572f3.
* server: clean dupl validator functionality
* fix ensureUserCanManageChannel usage
It's not async anymore.
* server: merge channel validator middleares
ensureAuthUserOwnsChannelValidator & ensureUserCanManageChannel gets
merged into one middleware.
* client(VideoChannelEdit): redirect to prev route
* fix(VideoChannels): handle anon users
* client: new routes for create/update channel
* Refactor channel validators
Co-authored-by: Chocobozzz <me@florianbigard.com>
Diffstat (limited to 'shared')
-rw-r--r-- | shared/core-utils/users/user-role.ts | 2 | ||||
-rw-r--r-- | shared/extra-utils/users/users-command.ts | 3 | ||||
-rw-r--r-- | shared/models/users/user-right.enum.ts | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/shared/core-utils/users/user-role.ts b/shared/core-utils/users/user-role.ts index 81cba1dad..cc757d779 100644 --- a/shared/core-utils/users/user-role.ts +++ b/shared/core-utils/users/user-role.ts | |||
@@ -14,8 +14,8 @@ const userRoleRights: { [ id in UserRole ]: UserRight[] } = { | |||
14 | [UserRole.MODERATOR]: [ | 14 | [UserRole.MODERATOR]: [ |
15 | UserRight.MANAGE_VIDEO_BLACKLIST, | 15 | UserRight.MANAGE_VIDEO_BLACKLIST, |
16 | UserRight.MANAGE_ABUSES, | 16 | UserRight.MANAGE_ABUSES, |
17 | UserRight.MANAGE_ANY_VIDEO_CHANNEL, | ||
17 | UserRight.REMOVE_ANY_VIDEO, | 18 | UserRight.REMOVE_ANY_VIDEO, |
18 | UserRight.REMOVE_ANY_VIDEO_CHANNEL, | ||
19 | UserRight.REMOVE_ANY_VIDEO_PLAYLIST, | 19 | UserRight.REMOVE_ANY_VIDEO_PLAYLIST, |
20 | UserRight.REMOVE_ANY_VIDEO_COMMENT, | 20 | UserRight.REMOVE_ANY_VIDEO_COMMENT, |
21 | UserRight.UPDATE_ANY_VIDEO, | 21 | UserRight.UPDATE_ANY_VIDEO, |
diff --git a/shared/extra-utils/users/users-command.ts b/shared/extra-utils/users/users-command.ts index 2a10e4fc8..90c5f2183 100644 --- a/shared/extra-utils/users/users-command.ts +++ b/shared/extra-utils/users/users-command.ts | |||
@@ -202,7 +202,8 @@ export class UsersCommand extends AbstractCommand { | |||
202 | return { | 202 | return { |
203 | token, | 203 | token, |
204 | userId: user.id, | 204 | userId: user.id, |
205 | userChannelId: me.videoChannels[0].id | 205 | userChannelId: me.videoChannels[0].id, |
206 | userChannelName: me.videoChannels[0].name | ||
206 | } | 207 | } |
207 | } | 208 | } |
208 | 209 | ||
diff --git a/shared/models/users/user-right.enum.ts b/shared/models/users/user-right.enum.ts index 6415ca6f2..668535f4e 100644 --- a/shared/models/users/user-right.enum.ts +++ b/shared/models/users/user-right.enum.ts | |||
@@ -22,9 +22,9 @@ export const enum UserRight { | |||
22 | MANAGE_SERVERS_BLOCKLIST, | 22 | MANAGE_SERVERS_BLOCKLIST, |
23 | 23 | ||
24 | MANAGE_VIDEO_BLACKLIST, | 24 | MANAGE_VIDEO_BLACKLIST, |
25 | MANAGE_ANY_VIDEO_CHANNEL, | ||
25 | 26 | ||
26 | REMOVE_ANY_VIDEO, | 27 | REMOVE_ANY_VIDEO, |
27 | REMOVE_ANY_VIDEO_CHANNEL, | ||
28 | REMOVE_ANY_VIDEO_PLAYLIST, | 28 | REMOVE_ANY_VIDEO_PLAYLIST, |
29 | REMOVE_ANY_VIDEO_COMMENT, | 29 | REMOVE_ANY_VIDEO_COMMENT, |
30 | 30 | ||