BC-8693 - Dependency updates

.github/workflows/dependency-review.yml

@@ -14,5 +14,17 @@ jobs:
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v4
         with:
-          allow-licenses: AGPL-3.0-only, LGPL-3.0, MIT, Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, X11, 0BSD, GPL-3.0, Unlicense, CC0-1.0
+          allow-licenses: |
+            AGPL-3.0-only, 
+            LGPL-3.0, 
+            MIT, 
+            Apache-2.0, 
+            BSD-2-Clause, 
+            BSD-3-Clause, 
+            ISC, 
+            X11, 
+            0BSD, 
+            GPL-3.0, 
+            Unlicense, 
+            CC0-1.0,
           allow-ghsas: 'GHSA-vxvm-qww3-2fh7'

apps/server/src/apps/helpers/swagger.spec.ts

@@ -1,12 +1,13 @@
 import { ServerTestModule } from '@modules/server';
 import { INestApplication } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
+import type { Server } from 'node:net';
 import request from 'supertest';
 import { enableOpenApiDocs } from './swagger';
 
 describe('swagger setup', () => {
 	describe('when adding swagger to an app', () => {
-		let app: INestApplication;
+		let app: INestApplication<Server>;
 
 		beforeAll(async () => {
 			app = await NestFactory.create(ServerTestModule);

apps/server/src/infra/auth-guard/mapper/jwt-strategy-options.factory.ts

@@ -1,4 +1,5 @@
 import { ConfigService } from '@nestjs/config';
+import { Algorithm } from 'jsonwebtoken';
 import { JwtFromRequestFunction, StrategyOptions } from 'passport-jwt';
 import { JwtAuthGuardConfig } from '../config';
 
@@ -8,7 +9,7 @@ export class JwtStrategyOptionsFactory {
 		configService: ConfigService<JwtAuthGuardConfig>
 	): StrategyOptions {
 		const publicKey = configService.getOrThrow<string>('JWT_PUBLIC_KEY');
-		const algorithm = configService.getOrThrow<string>('JWT_SIGNING_ALGORITHM');
+		const algorithm = configService.getOrThrow<string>('JWT_SIGNING_ALGORITHM') as Algorithm;
 
 		const options = {
 			jwtFromRequest: jwtFromRequestFunction,

apps/server/src/infra/file-system/file-system.adapter.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@nestjs/common';
-import { promises as fsp, existsSync } from 'fs';
+import { existsSync, promises as fsp } from 'fs';
 import os from 'os';
 import path from 'path';
 
-import rimraf = require('rimraf');
+import { rimrafSync } from 'rimraf';
 
 const { mkdir, readdir, writeFile, readFile, mkdtemp } = fsp;
 
@@ -77,7 +77,7 @@ export class FileSystemAdapter {
 	 */
 	async removeDirRecursive(folderPath: string): Promise<void> {
 		// fs.rm changed in node 14.14, use rimraf instead
-		rimraf.sync(folderPath);
+		rimrafSync(folderPath);
 		return Promise.resolve();
 	}
 

apps/server/src/infra/s3-client/s3-client.adapter.spec.ts

@@ -255,21 +255,22 @@ describe('S3ClientAdapter', () => {
 			const setup = () => {
 				const { file } = createFile();
 				const { pathToFile } = createParameter();
-				const error = new InternalServerErrorException('S3ClientAdapter:create');
+				const error = new Error('Connection Error');
+				const expectedError = new InternalServerErrorException('S3ClientAdapter:create', { cause: error });
 
 				const uploadDoneMock = jest.spyOn(Upload.prototype, 'done').mockRejectedValueOnce(error);
 
 				const restoreMocks = () => {
 					uploadDoneMock.mockRestore();
 				};
 
-				return { file, pathToFile, error, restoreMocks };
+				return { file, pathToFile, expectedError, restoreMocks };
 			};
 
 			it('should throw error from client', async () => {
-				const { file, pathToFile, error, restoreMocks } = setup();
+				const { file, pathToFile, expectedError, restoreMocks } = setup();
 
-				await expect(service.create(pathToFile, file)).rejects.toThrow(error);
+				await expect(service.create(pathToFile, file)).rejects.toThrow(expectedError);
 
 				restoreMocks();
 			});
@@ -451,13 +452,13 @@ describe('S3ClientAdapter', () => {
 			const setup = () => {
 				const { pathToFile } = createParameter();
 				const filePath = 'directory/test.txt';
-				const error = new Error('testError');
+				const error = new Error('S3ClientAdapter:delete');
 				// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 				// @ts-ignore
 				client.send.mockResolvedValueOnce({ Contents: [{ Key: filePath }] });
 				// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 				// @ts-ignore
-				client.send.mockRejectedValueOnce(error);
+				client.send.mockRejectedValueOnce();
 
 				const expectedError = new InternalServerErrorException(
 					'S3ClientAdapter:deleteDirectory',

apps/server/src/modules/account/domain/services/account-db.service.spec.ts

@@ -406,17 +406,12 @@ describe('AccountDbService', () => {
 			};
 
 			it('should update account', async () => {
-				const { mockStudentUser, mockTeacherAccount } = setup();
+				const { mockTeacherAccount } = setup();
 
 				const ret = await accountService.save(mockTeacherAccount);
+
 				expect(ret).toBeDefined();
-				expect(ret).toMatchObject({
-					id: mockTeacherAccount.id,
-					username: mockTeacherAccount.username,
-					activated: mockTeacherAccount.activated,
-					systemId: mockTeacherAccount.systemId,
-					userId: new ObjectId(mockStudentUser.id),
-				});
+				expect(ret).toEqual(mockTeacherAccount);
 			});
 		});
 

apps/server/src/modules/account/repo/micro-orm/mapper/account-entity-to-do.mapper.spec.ts

@@ -1,6 +1,6 @@
-import { AccountEntityToDoMapper } from './account-entity-to-do.mapper';
 import { AccountEntity } from '../../../domain/entity/account.entity';
 import { accountFactory } from '../../../testing';
+import { AccountEntityToDoMapper } from './account-entity-to-do.mapper';
 
 describe('AccountEntityToDoMapper', () => {
 	beforeEach(() => {
@@ -16,7 +16,7 @@ describe('AccountEntityToDoMapper', () => {
 	describe('mapToDo', () => {
 		describe('When mapping AccountEntity to Account', () => {
 			const setup = () => {
-				const accountEntity = accountFactory.withAllProperties().buildWithId({}, '000000000000000000000001');
+				const accountEntity = accountFactory.withAllProperties().buildWithId();
 
 				const missingSystemUserIdEntity: AccountEntity = accountFactory.withoutSystemAndUserId().build();
 
@@ -28,7 +28,21 @@ describe('AccountEntityToDoMapper', () => {
 
 				const ret = AccountEntityToDoMapper.mapToDo(accountEntity);
 
-				expect({ ...ret.getProps(), _id: accountEntity._id }).toMatchObject(accountEntity);
+				expect({ ...ret.getProps(), _id: accountEntity._id }).toMatchObject({
+					id: accountEntity.id,
+					createdAt: accountEntity.createdAt,
+					updatedAt: accountEntity.updatedAt,
+					userId: accountEntity.userId?.toHexString(),
+					systemId: accountEntity.systemId?.toHexString(),
+					username: accountEntity.username,
+					password: accountEntity.password,
+					token: accountEntity.token,
+					credentialHash: accountEntity.credentialHash,
+					lastLogin: accountEntity.lastLogin,
+					expiresAt: accountEntity.expiresAt,
+					activated: accountEntity.activated,
+					deactivatedAt: accountEntity.deactivatedAt,
+				});
 			});
 
 			it('should ignore missing ids', () => {

apps/server/src/modules/alert/controller/api-test/alert.api.spec.ts

@@ -4,6 +4,7 @@ import { INestApplication } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { SchulcloudTheme } from '@shared/domain/types';
 import { axiosResponseFactory } from '@testing/factory/axios-response.factory';
+import type { Server } from 'node:net';
 import { of } from 'rxjs';
 import request from 'supertest';
 import { serverConfig, ServerTestModule } from '../../../server';
@@ -21,7 +22,7 @@ describe('Alert Controller api', () => {
 	const component1 = createComponent(1, 1);
 	const component2 = createComponent(2, 2);
 
-	let app: INestApplication;
+	let app: INestApplication<Server>;
 	let httpService: DeepMocked<HttpService>;
 
 	beforeEach(async () => {

apps/server/src/modules/authentication/controllers/api-test/login.api.spec.ts

@@ -17,6 +17,7 @@ import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
 import jwt from 'jsonwebtoken';
 import moment from 'moment';
+import type { Server } from 'node:net';
 import request, { Response } from 'supertest';
 import { LdapAuthorizationBodyParams, LocalAuthorizationBodyParams, OauthLoginResponse } from '../dto';
 
@@ -71,7 +72,7 @@ jest.mock('jwks-rsa', () => () => {
 describe('Login Controller (api)', () => {
 	const basePath = '/authentication';
 
-	let app: INestApplication;
+	let app: INestApplication<Server>;
 	let em: EntityManager;
 
 	const defaultPassword = 'DummyPasswd!1';

apps/server/src/modules/authentication/strategy/local.strategy.spec.ts

@@ -2,7 +2,6 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { IdentityManagementOauthService } from '@infra/identity-management';
 import { Account } from '@modules/account';
 import { accountDoFactory } from '@modules/account/testing';
-import { ServerConfig } from '@modules/server';
 import { UnauthorizedException } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { User } from '@shared/domain/entity';
@@ -30,7 +29,7 @@ describe('LocalStrategy', () => {
 		await setupEntities();
 		authenticationServiceMock = createMock<AuthenticationService>();
 		idmOauthServiceMock = createMock<IdentityManagementOauthService>();
-		configServiceMock = createMock<ConfigService<ServerConfig, true>>();
+		configServiceMock = createMock<ConfigService>();
 		userRepoMock = createMock<UserRepo>();
 		strategy = new LocalStrategy(authenticationServiceMock, idmOauthServiceMock, configServiceMock, userRepoMock);
 		mockUser = userFactory.withRoleByName(RoleName.STUDENT).buildWithId();

apps/server/src/modules/board/controller/dto/element/update-element-content.body.params.ts

@@ -25,7 +25,7 @@ export class FileContentBody {
 }
 
 export class FileElementContentBody extends ElementContentBody {
-	@ApiProperty({ type: ContentElementType.FILE })
+	@ApiProperty({ type: () => ContentElementType.FILE })
 	type!: ContentElementType.FILE;
 
 	@ValidateNested()
@@ -60,7 +60,7 @@ export class LinkContentBody {
 }
 
 export class LinkElementContentBody extends ElementContentBody {
-	@ApiProperty({ type: ContentElementType.LINK })
+	@ApiProperty({ type: () => ContentElementType.LINK })
 	type!: ContentElementType.LINK;
 
 	@ValidateNested()
@@ -75,7 +75,7 @@ export class DrawingContentBody {
 }
 
 export class DrawingElementContentBody extends ElementContentBody {
-	@ApiProperty({ type: ContentElementType.DRAWING })
+	@ApiProperty({ type: () => ContentElementType.DRAWING })
 	type!: ContentElementType.DRAWING;
 
 	@ValidateNested()
@@ -94,7 +94,7 @@ export class RichTextContentBody {
 }
 
 export class RichTextElementContentBody extends ElementContentBody {
-	@ApiProperty({ type: ContentElementType.RICH_TEXT })
+	@ApiProperty({ type: () => ContentElementType.RICH_TEXT })
 	type!: ContentElementType.RICH_TEXT;
 
 	@ValidateNested()
@@ -112,7 +112,7 @@ export class SubmissionContainerContentBody {
 }
 
 export class SubmissionContainerElementContentBody extends ElementContentBody {
-	@ApiProperty({ type: ContentElementType.SUBMISSION_CONTAINER })
+	@ApiProperty({ type: () => ContentElementType.SUBMISSION_CONTAINER })
 	type!: ContentElementType.SUBMISSION_CONTAINER;
 
 	@ValidateNested()
@@ -128,7 +128,7 @@ export class ExternalToolContentBody {
 }
 
 export class ExternalToolElementContentBody extends ElementContentBody {
-	@ApiProperty({ type: ContentElementType.EXTERNAL_TOOL })
+	@ApiProperty({ type: () => ContentElementType.EXTERNAL_TOOL })
 	type!: ContentElementType.EXTERNAL_TOOL;
 
 	@ValidateNested()
@@ -143,7 +143,7 @@ export class VideoConferenceContentBody {
 }
 
 export class VideoConferenceElementContentBody extends ElementContentBody {
-	@ApiProperty({ type: ContentElementType.VIDEO_CONFERENCE })
+	@ApiProperty({ type: () => ContentElementType.VIDEO_CONFERENCE })
 	type!: ContentElementType.VIDEO_CONFERENCE;
 
 	@ValidateNested()
@@ -188,7 +188,7 @@ export class UpdateElementContentBodyParams {
 			{ $ref: getSchemaPath(VideoConferenceElementContentBody) },
 		],
 	})
-	data!:
+	public data!:
 		| FileElementContentBody
 		| LinkElementContentBody
 		| RichTextElementContentBody

apps/server/src/modules/collaborative-storage/services/collaborative-storage.service.spec.ts

@@ -92,6 +92,7 @@ describe('Collaborative Storage Service', () => {
 
 	describe('Update TeamPermissions For Role', () => {
 		it('should call the adapter', async () => {
+			mockId = 'mockId';
 			jest.spyOn(service, 'findTeamById').mockResolvedValue({
 				id: 'testId',
 				name: 'testTeam',
@@ -108,6 +109,7 @@ describe('Collaborative Storage Service', () => {
 		});
 
 		it('should throw a forbidden exception', async () => {
+			mockId = 'mockId';
 			authService.checkPermission.mockImplementation(() => {
 				throw new ForbiddenException();
 			});

apps/server/src/modules/common-cartridge/controller/common-cartridge.controller.api.spec.ts

@@ -6,6 +6,7 @@ import { ConfigModule } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
 import { CoursesApi } from '@src/infra/courses-client/generated';
 import { axiosResponseFactory } from '@testing/factory/axios-response.factory';
+import type { Server } from 'node:net';
 import supertest from 'supertest';
 import { CommonCartridgeApiModule } from '../common-cartridge-api.app.module';
 import { CommonCartridgeFileBuilder } from '../export/builders/common-cartridge-file-builder';
@@ -29,7 +30,7 @@ jest.mock('../../../infra/auth-guard/decorator/jwt-auth.decorator', () => {
 
 describe('CommonCartridgeController (API)', () => {
 	let module: TestingModule;
-	let app: INestApplication;
+	let app: INestApplication<Server>;
 
 	beforeAll(async () => {
 		module = await Test.createTestingModule({

apps/server/src/modules/files-storage/controller/api-test/files-security.api.spec.ts

@@ -8,6 +8,7 @@ import { fileRecordFactory } from '@testing/factory/filerecord.factory';
 import { schoolEntityFactory } from '@testing/factory/school-entity.factory';
 import { UserAndAccountTestFactory } from '@testing/factory/user-and-account.test.factory';
 import NodeClam from 'clamscan';
+import type { Server } from 'node:net';
 import request from 'supertest';
 import { FileRecord } from '../../entity';
 import { FilesStorageTestModule } from '../../files-storage-test.module';
@@ -18,9 +19,9 @@ const baseRouteName = '/file-security';
 const scanResult: ScanResultParams = { virus_detected: false };
 
 class API {
-	app: INestApplication;
+	app: INestApplication<Server>;
 
-	constructor(app: INestApplication) {
+	constructor(app: INestApplication<Server>) {
 		this.app = app;
 	}
 
@@ -39,7 +40,7 @@ class API {
 }
 
 describe(`${baseRouteName} (api)`, () => {
-	let app: INestApplication;
+	let app: INestApplication<Server>;
 	let em: EntityManager;
 	let api: API;
 	let validId: string;