BC-7737 - Bump h5p server

apps/server/src/modules/h5p-editor/provider/editor-permission-system.ts

@@ -0,0 +1,40 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import {
+	ContentPermission,
+	GeneralPermission,
+	IPermissionSystem,
+	IUser,
+	TemporaryFilePermission,
+	UserDataPermission,
+} from '@lumieducation/h5p-server';
+
+export default class EditorPermissionSystem implements IPermissionSystem<IUser> {
+	checkForUserData(
+		actingUser: IUser,
+		permission: UserDataPermission,
+		contentId: string,
+		affectedUserId?: string
+	): Promise<boolean> {
+		return Promise.resolve(false);
+	}
+
+	async checkForContent(
+		actingUser: IUser | undefined,
+		permission: ContentPermission,
+		contentId?: string
+	): Promise<boolean> {
+		return Promise.resolve(true);
+	}
+
+	async checkForTemporaryFile(
+		user: IUser | undefined,
+		permission: TemporaryFilePermission,
+		filename?: string
+	): Promise<boolean> {
+		return Promise.resolve(true);
+	}
+
+	async checkForGeneralAction(actingUser: IUser | undefined, permission: GeneralPermission): Promise<boolean> {
+		return Promise.resolve(false);
+	}
+}

apps/server/src/modules/h5p-editor/provider/h5p-editor.provider.ts

@@ -1,8 +1,9 @@
 import { H5PEditor, cacheImplementations } from '@lumieducation/h5p-server';
 
 import { IH5PEditorOptions, ITranslationFunction } from '@lumieducation/h5p-server/build/src/types';
+import { ContentStorage, LibraryStorage, TemporaryFileStorage, Translator } from '../service';
 import { h5pConfig, h5pUrlGenerator } from '../service/config/h5p-service-config';
-import { ContentStorage, Translator, LibraryStorage, TemporaryFileStorage } from '../service';
+import EditorPermissionSystem from './editor-permission-system';
 
 export const H5PEditorProvider = {
 	provide: H5PEditor,
@@ -14,9 +15,11 @@ export const H5PEditorProvider = {
 	) {
 		const cache = new cacheImplementations.CachedKeyValueStorage('kvcache');
 
+		const permissionSystem = new EditorPermissionSystem();
 		const h5pOptions: IH5PEditorOptions = {
 			enableHubLocalization: true,
 			enableLibraryNameLocalization: true,
+			permissionSystem,
 		};
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 		const translationFunction: ITranslationFunction = await Translator.translate();

apps/server/src/modules/h5p-editor/service/contentStorage.service.ts

@@ -1,12 +1,13 @@
+import { S3ClientAdapter } from '@infra/s3-client';
 import {
 	ContentId,
+	ContentPermission,
 	IContentMetadata,
 	IContentStorage,
 	IFileStats,
 	ILibraryName,
 	IUser as ILumiUser,
 	LibraryName,
-	Permission,
 } from '@lumieducation/h5p-server';
 import {
 	HttpException,
@@ -17,7 +18,6 @@ import {
 	NotFoundException,
 	UnprocessableEntityException,
 } from '@nestjs/common';
-import { S3ClientAdapter } from '@infra/s3-client';
 import { ErrorUtils } from '@src/core/error/utils';
 import { Readable } from 'stream';
 import { H5pFileDto } from '../controller/dto/h5p-file.dto';
@@ -184,8 +184,14 @@ export class ContentStorage implements IContentStorage {
 		return result;
 	}
 
-	public getUserPermissions(): Promise<Permission[]> {
-		const permissions = [Permission.Delete, Permission.Download, Permission.Edit, Permission.Embed, Permission.View];
+	public getUserPermissions(): Promise<ContentPermission[]> {
+		const permissions = [
+			ContentPermission.Delete,
+			ContentPermission.Download,
+			ContentPermission.Edit,
+			ContentPermission.Embed,
+			ContentPermission.View,
+		];
 
 		return Promise.resolve(permissions);
 	}

apps/server/src/modules/h5p-editor/types/lumi-types.ts

@@ -15,12 +15,6 @@ export class LumiUserWithContentData implements IUser {
 
 	schoolId: EntityId;
 
-	canCreateRestricted: boolean;
-
-	canInstallRecommended: boolean;
-
-	canUpdateAndInstallLibraries: boolean;
-
 	email: string;
 
 	id: EntityId;
@@ -34,9 +28,6 @@ export class LumiUserWithContentData implements IUser {
 		this.contentParentId = parentParams.parentId;
 		this.schoolId = parentParams.schoolId;
 
-		this.canCreateRestricted = user.canCreateRestricted;
-		this.canInstallRecommended = user.canInstallRecommended;
-		this.canUpdateAndInstallLibraries = user.canUpdateAndInstallLibraries;
 		this.email = user.email;
 		this.id = user.id;
 		this.name = user.name;

apps/server/src/modules/h5p-editor/uc/h5p.uc.ts

@@ -356,9 +356,6 @@ export class H5PEditorUc {
 
 	private changeUserType(currentUser: ICurrentUser): LumiIUser {
 		const user: LumiIUser = {
-			canCreateRestricted: false,
-			canInstallRecommended: false,
-			canUpdateAndInstallLibraries: false,
 			email: '',
 			id: currentUser.userId,
 			name: '',

apps/server/src/modules/h5p-library-management/service/h5p-library-management.service.ts

@@ -1,21 +1,22 @@
 import {
-	H5PConfig,
 	cacheImplementations,
-	LibraryManager,
 	ContentTypeCache,
+	H5PConfig,
+	ILibraryAdministrationOverviewItem,
 	IUser,
 	LibraryAdministration,
-	ILibraryAdministrationOverviewItem,
+	LibraryManager,
 } from '@lumieducation/h5p-server';
 import ContentManager from '@lumieducation/h5p-server/build/src/ContentManager';
 import ContentTypeInformationRepository from '@lumieducation/h5p-server/build/src/ContentTypeInformationRepository';
+import { IHubContentType } from '@lumieducation/h5p-server/build/src/types';
 import { Injectable, InternalServerErrorException, NotFoundException } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
 import { ContentStorage, LibraryStorage } from '@src/modules/h5p-editor';
 import { readFileSync } from 'fs';
 import { parse } from 'yaml';
-import { ConfigService } from '@nestjs/config';
-import { IHubContentType } from '@lumieducation/h5p-server/build/src/types';
 import { IH5PLibraryManagementConfig } from './h5p-library-management.config';
+import LibraryManagementPermissionSystem from './library-management-permission-system';
 
 const h5pConfig = new H5PConfig(undefined, {
 	baseUrl: '/api/v3/h5p-editor',
@@ -75,8 +76,14 @@ export class H5PLibraryManagementService {
 			undefined,
 			h5pConfig
 		);
-		this.contentTypeRepo = new ContentTypeInformationRepository(this.contentTypeCache, this.libraryManager, h5pConfig);
-		const contentManager = new ContentManager(this.contentStorage);
+		const permissionSystem = new LibraryManagementPermissionSystem();
+		this.contentTypeRepo = new ContentTypeInformationRepository(
+			this.contentTypeCache,
+			this.libraryManager,
+			h5pConfig,
+			permissionSystem
+		);
+		const contentManager = new ContentManager(this.contentStorage, permissionSystem);
 		this.libraryAdministration = new LibraryAdministration(this.libraryManager, contentManager);
 		const filePath = this.configService.get<string>('H5P_EDITOR__LIBRARY_LIST_PATH');
 
@@ -115,9 +122,6 @@ export class H5PLibraryManagementService {
 
 	private createDefaultIUser(): IUser {
 		const user: IUser = {
-			canCreateRestricted: true,
-			canInstallRecommended: true,
-			canUpdateAndInstallLibraries: true,
 			email: '[email protected]',
 			id: 'a',
 			name: 'a',

apps/server/src/modules/h5p-library-management/service/library-management-permission-system.ts

@@ -0,0 +1,49 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import {
+	ContentPermission,
+	GeneralPermission,
+	IPermissionSystem,
+	IUser,
+	TemporaryFilePermission,
+	UserDataPermission,
+} from '@lumieducation/h5p-server';
+
+export default class LibraryManagementPermissionSystem implements IPermissionSystem<IUser> {
+	checkForUserData(
+		actingUser: IUser,
+		permission: UserDataPermission,
+		contentId: string,
+		affectedUserId?: string
+	): Promise<boolean> {
+		return Promise.resolve(false);
+	}
+
+	async checkForContent(
+		actingUser: IUser | undefined,
+		permission: ContentPermission,
+		contentId?: string
+	): Promise<boolean> {
+		return Promise.resolve(false);
+	}
+
+	async checkForTemporaryFile(
+		user: IUser | undefined,
+		permission: TemporaryFilePermission,
+		filename?: string
+	): Promise<boolean> {
+		return Promise.resolve(false);
+	}
+
+	async checkForGeneralAction(actingUser: IUser | undefined, permission: GeneralPermission): Promise<boolean> {
+		switch (permission) {
+			case GeneralPermission.InstallRecommended:
+				return Promise.resolve(true);
+			case GeneralPermission.UpdateAndInstallLibraries:
+				return Promise.resolve(true);
+			case GeneralPermission.CreateRestricted:
+				return Promise.resolve(true);
+			default:
+				return false;
+		}
+	}
+}

package.json

@@ -137,7 +137,7 @@
 		"@hendt/xml2json": "^1.0.3",
 		"@hpi-schul-cloud/commons": "^1.3.4",
 		"@keycloak/keycloak-admin-client": "^25.0.1",
-		"@lumieducation/h5p-server": "^9.2.0",
+		"@lumieducation/h5p-server": "^9.3.2",
 		"@mikro-orm/cli": "^5.6.16",
 		"@mikro-orm/core": "^5.6.16",
 		"@mikro-orm/migrations-mongodb": "^5.6.16",