other changes

hpi-schul-cloud · Dec 10, 2024 · af26650 · af26650
1 parent 99a4e9d
commit af26650
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/apps/server/src/modules/room-membership/authorization/room-membership.rule.spec.ts b/apps/server/src/modules/room-membership/authorization/room-membership.rule.spec.ts
@@ -116,6 +116,17 @@ describe(RoomMembershipRule.name, () => {
 
 					expect(res).toBe(false);
 				});
+
+				it('should return false for change owner action', () => {
+					const { user, roomMembershipAuthorizable } = setup();
+
+					const res = service.hasPermission(user, roomMembershipAuthorizable, {
+						action: Action.read,
+						requiredPermissions: [Permission.ROOM_CHANGE_OWNER],
+					});
+
+					expect(res).toBe(false);
+				});
 			});
 
 			describe('when user is not member of room', () => {

diff --git a/apps/server/src/modules/room/api/dto/request/add-room-members.body.params.ts b/apps/server/src/modules/room/api/dto/request/add-room-members.body.params.ts
@@ -1,7 +1,7 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { IsMongoId, IsString, ValidateNested } from 'class-validator';
 import { Type } from 'class-transformer';
-import { RoomRole, RoomRoleArray } from '@shared/domain/interface';
+import { RoleName, RoomRoleArray } from '@shared/domain/interface';
 
 class UserIdAndRole {
 	@ApiProperty({
@@ -17,7 +17,7 @@ class UserIdAndRole {
 		enum: RoomRoleArray,
 	})
 	@IsString()
-	roleName!: RoomRole;
+	roleName!: RoleName.ROOMADMIN | RoleName.ROOMEDITOR | RoleName.ROOMVIEWER;
 }
 
 export class AddRoomMembersBodyParams {

diff --git a/apps/server/src/shared/domain/interface/permission.enum.ts b/apps/server/src/shared/domain/interface/permission.enum.ts
@@ -104,6 +104,9 @@ export enum Permission {
 	ROOM_EDIT = 'ROOM_EDIT',
 	ROOM_VIEW = 'ROOM_VIEW',
 	ROOM_DELETE = 'ROOM_DELETE',
+	ROOM_MEMBERS_ADD = 'ROOM_MEMBERS_ADD',
+	ROOM_MEMBERS_REMOVE = 'ROOM_MEMBERS_REMOVE',
+	ROOM_CHANGE_OWNER = 'ROOM_CHANGE_OWNER',
 	SCHOOL_CHAT_MANAGE = 'SCHOOL_CHAT_MANAGE',
 	SCHOOL_CREATE = 'SCHOOL_CREATE',
 	SCHOOL_EDIT = 'SCHOOL_EDIT',

diff --git a/apps/server/src/shared/domain/interface/rolename.enum.ts b/apps/server/src/shared/domain/interface/rolename.enum.ts
@@ -13,6 +13,8 @@ export enum RoleName {
 	HELPDESK = 'helpdesk',
 	ROOMVIEWER = 'roomviewer',
 	ROOMEDITOR = 'roomeditor',
+	ROOMADMIN = 'roomadmin',
+	ROOMOWNER = 'roomowner',
 	STUDENT = 'student',
 	SUPERHERO = 'superhero',
 	TEACHER = 'teacher',
@@ -32,7 +34,12 @@ export type IUserRoleName =
 	| RoleName.DEMOSTUDENT
 	| RoleName.DEMOTEACHER;
 
-export const RoomRoleArray = [RoleName.ROOMEDITOR, RoleName.ROOMVIEWER] as const;
+export const RoomRoleArray = [
+	RoleName.ROOMOWNER,
+	RoleName.ROOMADMIN,
+	RoleName.ROOMEDITOR,
+	RoleName.ROOMVIEWER,
+] as const;
 export type RoomRole = typeof RoomRoleArray[number];
 
 export const GuestRoleArray = [RoleName.GUESTSTUDENT, RoleName.GUESTTEACHER] as const;