Merge branch 'BC-5522-impl-of-deletion-api' of https://github.com/hpi…

…-schul-cloud/schulcloud-server into BC-5522-impl-of-deletion-api
hpi-schul-cloud · Nov 15, 2023 · 9ea749f · 9ea749f
2 parents 9a04a4a + 3f046f5
commit 9ea749f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/apps/server/src/modules/authentication/strategy/x-api-key.strategy.ts b/apps/server/src/modules/authentication/strategy/x-api-key.strategy.ts
@@ -9,12 +9,7 @@ export class XApiKeyStrategy extends PassportStrategy(Strategy, 'api-key') {
 	private readonly allowedApiKeys: string[];
 
 	constructor(private readonly configService: ConfigService<IXApiKeyConfig, true>) {
-		super(
-			{ header: 'X-API-KEY', prefix: '' },
-			true,
-			// eslint-disable-next-line @typescript-eslint/require-await
-			async (apiKey: string, done: (error: Error | null, data: boolean | null) => void) => this.validate(apiKey, done)
-		);
+		super({ header: 'X-API-KEY', prefix: '' }, true);
 		this.allowedApiKeys = this.configService.get<string[]>('ADMIN_API__ALLOWED_API_KEYS');
 	}
 

diff --git a/apps/server/src/modules/server/admin-api.server.module.ts b/apps/server/src/modules/server/admin-api.server.module.ts
@@ -20,13 +20,10 @@ const serverModules = [ConfigModule.forRoot(createConfigModuleOptions(serverConf
 		MikroOrmModule.forRoot({
 			...defaultMikroOrmOptions,
 			type: 'mongo',
-			// TODO add mongoose options as mongo options (see database.js)
 			clientUrl: DB_URL,
 			password: DB_PASSWORD,
 			user: DB_USERNAME,
 			entities: ALL_ENTITIES,
-
-			// debug: true, // use it for locally debugging of queries
 		}),
 		LoggerModule,
 	],