BC-5424 - persistent storage for tldraw

apps/server/src/config/database.config.ts

@@ -4,10 +4,9 @@ interface GlobalConstants {
 	DB_URL: string;
 	DB_PASSWORD?: string;
 	DB_USERNAME?: string;
-	TLDRAW_DB_URL: string;
 }
 
 const usedGlobals: GlobalConstants = globals;
 
 /** Database URL */
-export const { DB_URL, DB_PASSWORD, DB_USERNAME, TLDRAW_DB_URL } = usedGlobals;
+export const { DB_URL, DB_PASSWORD, DB_USERNAME } = usedGlobals;

apps/server/src/modules/board/repo/recursive-delete.vistor.ts

@@ -65,6 +65,7 @@ export class RecursiveDeleteVisitor implements BoardCompositeVisitorAsync {
 
 	async visitDrawingElementAsync(drawingElement: DrawingElement): Promise<void> {
 		await this.drawingElementAdapterService.deleteDrawingBinData(drawingElement.id);
+		await this.filesStorageClientAdapterService.deleteFilesOfParent(drawingElement.id);
 
 		this.deleteNode(drawingElement);
 		await this.visitChildrenAsync(drawingElement);

apps/server/src/modules/board/service/board-do-authorizable.service.ts

@@ -6,6 +6,7 @@ import {
 	BoardExternalReferenceType,
 	BoardRoles,
 	ColumnBoard,
+	isDrawingElement,
 	UserBoardRoles,
 	UserRoleEnum,
 } from '@shared/domain/domainobject';
@@ -34,10 +35,14 @@ export class BoardDoAuthorizableService implements AuthorizationLoaderService {
 		const ids = [...ancestorIds, boardDo.id];
 		const rootId = ids[0];
 		const rootBoardDo = await this.boardDoRepo.findById(rootId, 1);
+
+		// TODO: fix this temporary hack to allow students to upload Files to the DrawingElement
+		const isDrawing = isDrawingElement(boardDo);
+
 		if (rootBoardDo instanceof ColumnBoard) {
 			if (rootBoardDo.context?.type === BoardExternalReferenceType.Course) {
 				const course = await this.courseRepo.findById(rootBoardDo.context.id);
-				const users = this.mapCourseUsersToUsergroup(course);
+				const users = this.mapCourseUsersToUsergroup(course, isDrawing);
 				return new BoardDoAuthorizable({ users, id: boardDo.id });
 			}
 		} else {
@@ -47,7 +52,7 @@ export class BoardDoAuthorizableService implements AuthorizationLoaderService {
 		return new BoardDoAuthorizable({ users: [], id: boardDo.id });
 	}
 
-	private mapCourseUsersToUsergroup(course: Course): UserBoardRoles[] {
+	private mapCourseUsersToUsergroup(course: Course, isDrawing: boolean): UserBoardRoles[] {
 		const users = [
 			...course.getTeachersList().map((user) => {
 				return {
@@ -72,7 +77,7 @@ export class BoardDoAuthorizableService implements AuthorizationLoaderService {
 					userId: user.id,
 					firstName: user.firstName,
 					lastName: user.lastName,
-					roles: [BoardRoles.READER],
+					roles: isDrawing ? [BoardRoles.EDITOR] : [BoardRoles.READER],
 					userRoleEnum: UserRoleEnum.STUDENT,
 				};
 			}),

apps/server/src/modules/board/uc/element.uc.ts

@@ -3,6 +3,7 @@ import { ForbiddenException, forwardRef, Inject, Injectable, UnprocessableEntity
 import {
 	AnyBoardDo,
 	AnyContentElementDo,
+	isDrawingElement,
 	isSubmissionContainerElement,
 	isSubmissionItem,
 	SubmissionItem,
@@ -54,7 +55,9 @@ export class ElementUc extends BaseUc {
 		if (isSubmissionItem(parent)) {
 			await this.checkSubmissionItemWritePermission(userId, parent);
 		} else {
-			await this.checkPermission(userId, element, Action.write);
+			// TODO: fix this temporary hack to prevent students from deleting the DrawingElement
+			const requiredRole = isDrawingElement(element) ? UserRoleEnum.TEACHER : undefined;
+			await this.checkPermission(userId, element, Action.write, requiredRole);
 		}
 
 		return element;

apps/server/src/modules/tldraw/config.ts

@@ -1,32 +1,38 @@
 import { Configuration } from '@hpi-schul-cloud/commons';
 
 export interface TldrawConfig {
+	TLDRAW_DB_URL: string;
 	NEST_LOG_LEVEL: string;
 	INCOMING_REQUEST_TIMEOUT: number;
 	TLDRAW_DB_COLLECTION_NAME: string;
 	TLDRAW_DB_FLUSH_SIZE: string;
 	TLDRAW_DB_MULTIPLE_COLLECTIONS: boolean;
-	CONNECTION_STRING: string;
 	FEATURE_TLDRAW_ENABLED: boolean;
 	TLDRAW_PING_TIMEOUT: number;
 	TLDRAW_GC_ENABLED: number;
+	TLDRAW_ASSETS_ENABLED: boolean;
+	TLDRAW_ASSETS_MAX_SIZE: number;
+	TLDRAW_ASSETS_ALLOWED_EXTENSIONS_LIST: string;
 	API_HOST: number;
 }
 
-const tldrawConnectionString: string = Configuration.get('TLDRAW_DB_URL') as string;
+export const TLDRAW_DB_URL: string = Configuration.get('TLDRAW_DB_URL') as string;
+export const TLDRAW_SOCKET_PORT = Configuration.get('TLDRAW__SOCKET_PORT') as number;
 
 const tldrawConfig = {
+	TLDRAW_DB_URL,
 	NEST_LOG_LEVEL: Configuration.get('NEST_LOG_LEVEL') as string,
 	INCOMING_REQUEST_TIMEOUT: Configuration.get('INCOMING_REQUEST_TIMEOUT_API') as number,
 	TLDRAW_DB_COLLECTION_NAME: Configuration.get('TLDRAW__DB_COLLECTION_NAME') as string,
 	TLDRAW_DB_FLUSH_SIZE: Configuration.get('TLDRAW__DB_FLUSH_SIZE') as number,
 	TLDRAW_DB_MULTIPLE_COLLECTIONS: Configuration.get('TLDRAW__DB_MULTIPLE_COLLECTIONS') as boolean,
 	FEATURE_TLDRAW_ENABLED: Configuration.get('FEATURE_TLDRAW_ENABLED') as boolean,
-	CONNECTION_STRING: tldrawConnectionString,
 	TLDRAW_PING_TIMEOUT: Configuration.get('TLDRAW__PING_TIMEOUT') as number,
 	TLDRAW_GC_ENABLED: Configuration.get('TLDRAW__GC_ENABLED') as boolean,
+	TLDRAW_ASSETS_ENABLED: Configuration.get('TLDRAW__ASSETS_ENABLED') as boolean,
+	TLDRAW_ASSETS_MAX_SIZE: Configuration.get('TLDRAW__ASSETS_MAX_SIZE') as number,
+	TLDRAW_ASSETS_ALLOWED_EXTENSIONS_LIST: Configuration.get('TLDRAW__ASSETS_ALLOWED_EXTENSIONS_LIST') as string,
 	API_HOST: Configuration.get('API_HOST') as string,
 };
 
-export const SOCKET_PORT = Configuration.get('TLDRAW__SOCKET_PORT') as number;
 export const config = () => tldrawConfig;

apps/server/src/modules/tldraw/controller/tldraw.ws.ts

@@ -9,11 +9,11 @@ import { AxiosError } from 'axios';
 import { firstValueFrom } from 'rxjs';
 import { HttpService } from '@nestjs/axios';
 import { WebsocketCloseErrorLoggable } from '../loggable/websocket-close-error.loggable';
-import { TldrawConfig, SOCKET_PORT } from '../config';
+import { TldrawConfig, TLDRAW_SOCKET_PORT } from '../config';
 import { WsCloseCodeEnum, WsCloseMessageEnum } from '../types';
 import { TldrawWsService } from '../service';
 
-@WebSocketGateway(SOCKET_PORT)
+@WebSocketGateway(TLDRAW_SOCKET_PORT)
 export class TldrawWs implements OnGatewayInit, OnGatewayConnection {
 	@WebSocketServer()
 	server!: Server;

apps/server/src/modules/tldraw/repo/tldraw-board.repo.ts

@@ -19,7 +19,7 @@ export class TldrawBoardRepo {
 	public mdb: MongodbPersistence;
 
 	constructor(public readonly configService: ConfigService<TldrawConfig, true>) {
-		this.connectionString = this.configService.get<string>('CONNECTION_STRING');
+		this.connectionString = this.configService.get<string>('TLDRAW_DB_URL');
 		this.collectionName = this.configService.get<string>('TLDRAW_DB_COLLECTION_NAME') ?? 'drawings';
 		this.flushSize = this.configService.get<number>('TLDRAW_DB_FLUSH_SIZE') ?? 400;
 		this.multipleCollections = this.configService.get<boolean>('TLDRAW_DB_MULTIPLE_COLLECTIONS');

apps/server/src/modules/tldraw/tldraw.module.ts

@@ -1,6 +1,6 @@
 import { Module, NotFoundException } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
-import { createConfigModuleOptions, DB_PASSWORD, DB_USERNAME, TLDRAW_DB_URL } from '@src/config';
+import { createConfigModuleOptions, DB_PASSWORD, DB_USERNAME } from '@src/config';
 import { CoreModule } from '@src/core';
 import { Logger } from '@src/core/logger';
 import { MikroOrmModule, MikroOrmModuleSyncOptions } from '@mikro-orm/nestjs';
@@ -9,7 +9,7 @@ import { RabbitMQWrapperTestModule } from '@infra/rabbitmq';
 import { Dictionary, IPrimaryKey } from '@mikro-orm/core';
 import { AuthorizationModule } from '@modules/authorization';
 import { TldrawDrawing } from './entities';
-import { config } from './config';
+import { config, TLDRAW_DB_URL } from './config';
 import { TldrawService } from './service/tldraw.service';
 import { TldrawBoardRepo } from './repo';
 import { TldrawController } from './controller/tldraw.controller';

apps/server/src/modules/user/mapper/resolved-user.mapper.ts

@@ -9,7 +9,7 @@ export class ResolvedUserMapper {
 		dto.lastName = user.lastName;
 		dto.createdAt = user.createdAt;
 		dto.updatedAt = user.updatedAt;
-		dto.schoolId = user.school.toString();
+		dto.schoolId = user.school.id;
 		dto.roles = roles.map((role) => {
 			return { name: role.name, id: role.id };
 		});

config/default.schema.json

@@ -1430,10 +1430,15 @@
 				"API_KEY": ""
 			}
 		},
+		"FEATURE_TLDRAW_ENABLED": {
+			"type": "boolean",
+			"default": true,
+			"description": "Enables tldraw feature"
+		},
 		"TLDRAW": {
 			"type": "object",
-			"description": "Tldraw managing variables.",
-			"required": ["PING_TIMEOUT", "SOCKET_PORT","GC_ENABLED", "DB_COLLECTION_NAME", "DB_FLUSH_SIZE", "DB_MULTIPLE_COLLECTIONS"],
+			"description": "Configuration of tldraw related settings",
+			"required": ["PING_TIMEOUT", "SOCKET_PORT","GC_ENABLED", "DB_COLLECTION_NAME", "DB_FLUSH_SIZE", "DB_MULTIPLE_COLLECTIONS", "ASSETS_ENABLED", "ASSETS_MAX_SIZE", "ASSETS_ALLOWED_EXTENSIONS_LIST"],
 			"properties": {
 				"SOCKET_PORT": {
 					"type": "number",
@@ -1458,27 +1463,38 @@
 				"DB_MULTIPLE_COLLECTIONS": {
 					"type": "boolean",
 					"description": "DB collection allowing multiple collections for drawing"
+				},
+				"ASSETS_ENABLED": {
+					"type": "boolean",
+					"description": "Enables uploading assets to tldraw board"
+				},
+				"ASSETS_MAX_SIZE": {
+					"type": "integer",
+					"description": "Maximum asset size in bytes"
+				},
+				"ASSETS_ALLOWED_EXTENSIONS_LIST": {
+					"type": "string",
+					"description": "List with allowed assets extensions, comma separated, empty if all extensions should be allowed",
+					"examples": ["png,jpg,jpeg,svg,webp"]
 				}
 			},
 			"default": {
 				"SOCKET_PORT": 3345,
-				"PING_TIMEOUT": 10000,
+				"PING_TIMEOUT": 30000,
 				"GC_ENABLED": true,
 				"DB_COLLECTION_NAME": "drawings",
 				"DB_FLUSH_SIZE": 400,
-				"DB_MULTIPLE_COLLECTIONS": false
+				"DB_MULTIPLE_COLLECTIONS": false,
+				"ASSETS_ENABLED": true,
+				"ASSETS_MAX_SIZE": 25000000,
+				"ASSETS_ALLOWED_EXTENSIONS_LIST": ""
 			}
 		},
 		"TLDRAW_DB_URL": {
 			"type": "string",
 			"default": "mongodb://127.0.0.1:27017/tldraw",
 			"description": "DB connection url"
 		},
-		"FEATURE_TLDRAW_ENABLED": {
-			"type": "boolean",
-			"default": true,
-			"description": "Tldraw feature enabled"
-		},
 		"TLDRAW_URI": {
 			"type": "string",
 			"default": "http://localhost:3349",

config/globals.js

@@ -24,14 +24,12 @@ switch (NODE_ENV) {
 }
 
 let defaultDbUrl = null;
-let defaultTldrawDbUrl = null;
 switch (NODE_ENV) {
 	case ENVIRONMENTS.TEST:
 		defaultDbUrl = 'mongodb://127.0.0.1:27017/schulcloud-test';
 		break;
 	default:
 		defaultDbUrl = 'mongodb://127.0.0.1:27017/schulcloud';
-		defaultTldrawDbUrl = 'mongodb://127.0.0.1:27017/tldraw';
 }
 
 const globals = {
@@ -106,9 +104,6 @@ const globals = {
 
 	// calendar
 	CALENDAR_URI: process.env.CALENDAR_URI,
-
-	// tldraw
-	TLDRAW_DB_URL: process.env.TLDRAW_DB_URL || defaultTldrawDbUrl,
 };
 
 // validation /////////////////////////////////////////////////

config/test.json

@@ -71,7 +71,10 @@
 		"GC_ENABLED": true,
 		"DB_COLLECTION_NAME": "drawings",
 		"DB_FLUSH_SIZE": 400,
-		"DB_MULTIPLE_COLLECTIONS": false
+		"DB_MULTIPLE_COLLECTIONS": false,
+		"ASSETS_ENABLED": true,
+		"ASSETS_MAX_SIZE": 25000000,
+		"ASSETS_ALLOWED_EXTENSIONS_LIST": ""
 	},
 	"SCHULCONNEX_CLIENT": {
 		"API_URL": "http://localhost:8888/v1/",

package.json

@@ -234,8 +234,8 @@
 		"winston": "^3.8.2",
 		"ws": "^7.5.7",
 		"y-mongodb-provider": "^0.1.7",
-		"y-protocols": "^1.0.5",
-		"yjs": "^13.6.7"
+		"y-protocols": "^1.0.6",
+		"yjs": "^13.6.11"
 	},
 	"devDependencies": {
 		"@aws-sdk/client-s3": "^3.352.0",

src/services/config/publicAppConfigService.js

@@ -63,8 +63,11 @@ const exposedVars = [
 	'FEATURE_ENABLE_LDAP_SYNC_DURING_MIGRATION',
 	'FEATURE_CTL_CONTEXT_CONFIGURATION_ENABLED',
 	'FEATURE_SHOW_NEW_CLASS_VIEW_ENABLED',
-	'FEATURE_TLDRAW_ENABLED',
 	'FEATURE_CTL_TOOLS_COPY_ENABLED',
+	'FEATURE_TLDRAW_ENABLED',
+	'TLDRAW__ASSETS_ENABLED',
+	'TLDRAW__ASSETS_MAX_SIZE',
+	'TLDRAW__ASSETS_ALLOWED_EXTENSIONS_LIST',
 ];
 
 /**