BC-8075 Switch admin-api-server configuration flow (#5239)

apps/server/src/core/interfaces/core-module-config.ts → apps/server/src/core/core.config.ts

@@ -1,4 +1,4 @@
 import { InterceptorConfig } from '@shared/common';
-import { LoggerConfig } from '../logger';
+import { LoggerConfig } from './logger';
 
 export interface CoreModuleConfig extends InterceptorConfig, LoggerConfig {}

apps/server/src/core/index.ts

@@ -1,3 +1,3 @@
 export { CoreModule } from './core.module';
 export { DomainErrorHandler } from './error';
-export * from './interfaces';
+export { CoreModuleConfig } from './core.config';

apps/server/src/core/logger/index.ts

@@ -5,3 +5,4 @@ export * from './logger';
 export * from './error-logger';
 export * from './types';
 export * from './logging.utils';
+export { LoggerConfig } from './logger.config';

apps/server/src/core/logger/interfaces/index.ts

@@ -1,3 +1,2 @@
-export * from './logger-config';
 export * from './legacy-logger.interface';
 export * from './loggable';

apps/server/src/core/logger/interfaces/logger-config.ts → apps/server/src/core/logger/logger.config.ts

@@ -1,4 +1,4 @@
 export interface LoggerConfig {
 	NEST_LOG_LEVEL: string;
-	EXIT_ON_ERROR?: boolean;
+	EXIT_ON_ERROR: boolean;
 }

apps/server/src/core/logger/logger.module.ts

@@ -3,7 +3,7 @@ import { ConfigService } from '@nestjs/config';
 import { utilities, WinstonModule } from 'nest-winston';
 import winston from 'winston';
 import { ErrorLogger } from './error-logger';
-import { LoggerConfig } from './interfaces';
+import { LoggerConfig } from './logger.config';
 import { LegacyLogger } from './legacy-logger.service';
 import { Logger } from './logger';
 

apps/server/src/infra/auth-guard/auth-guard.config.ts

@@ -0,0 +1,6 @@
+export interface AuthGuardConfig {
+	ADMIN_API__ALLOWED_API_KEYS: string[];
+	JWT_AUD: string;
+	JWT_LIFETIME: string;
+	AUTHENTICATION: string;
+}

apps/server/src/infra/auth-guard/index.ts

@@ -1,5 +1,6 @@
 export { JwtValidationAdapter } from './adapter';
 export { AuthGuardModule } from './auth-guard.module';
+export { AuthGuardConfig } from './auth-guard.config';
 export { XApiKeyConfig, authConfig } from './config';
 export { CurrentUser, JWT, JwtAuthentication } from './decorator';
 // JwtAuthGuard only exported because api tests still overried this guard.

apps/server/src/infra/calendar/calendar.config.ts

@@ -0,0 +1,3 @@
+import { LoggerConfig } from '@src/core/logger';
+
+export interface CalendarConfig extends LoggerConfig {}

apps/server/src/infra/calendar/index.ts

@@ -1,3 +1,4 @@
-export * from './calendar.module';
+export { CalendarModule } from './calendar.module';
 export * from './service/calendar.service';
 export * from './dto/calendar-event.dto';
+export { CalendarConfig } from './calendar.config';

apps/server/src/modules/account/account-config.ts

@@ -1,4 +1,7 @@
-export interface AccountConfig {
+import { LoggerConfig } from '@src/core/logger';
+import { SystemConfig } from '@modules/system';
+
+export interface AccountConfig extends LoggerConfig, SystemConfig {
 	LOGIN_BLOCK_TIME: number;
 	TEACHER_STUDENT_VISIBILITY__IS_CONFIGURABLE: boolean;
 	FEATURE_IDENTITY_MANAGEMENT_LOGIN_ENABLED: boolean;

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

@@ -2,7 +2,6 @@ import { IdentityManagementModule } from '@infra/identity-management';
 import { SystemModule } from '@modules/system';
 import { Module } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-
 import { CqrsModule } from '@nestjs/cqrs';
 import { UserRepo } from '@shared/repo';
 import { LoggerModule } from '@src/core/logger/logger.module';
@@ -23,7 +22,7 @@ function accountIdmToDtoMapperFactory(configService: ConfigService<AccountConfig
 @Module({
 	imports: [CqrsModule, IdentityManagementModule, SystemModule, LoggerModule],
 	providers: [
-		UserRepo,
+		UserRepo, // should not be added as provider
 		AccountRepo,
 		AccountServiceDb,
 		AccountServiceIdm,

apps/server/src/modules/account/domain/services/account.service.ts

@@ -89,14 +89,14 @@ export class AccountService extends AbstractAccountService implements DeletionSe
 		if (updateUser) {
 			try {
 				await this.userRepo.save(user);
-			} catch (err) {
+			} catch (err: unknown) {
 				throw new EntityNotFoundError(User.name);
 			}
 		}
 		if (updateAccount) {
 			try {
 				await this.save(accountSave);
-			} catch (err) {
+			} catch (err: unknown) {
 				if (err instanceof ValidationError) {
 					throw err;
 				}

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

@@ -0,0 +1,3 @@
+import { LoggerConfig } from '@src/core/logger';
+
+export interface AuthorizationConfig extends LoggerConfig {}

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

@@ -56,7 +56,7 @@ import { FeathersAuthorizationService, FeathersAuthProvider } from './feathers';
 	exports: [
 		FeathersAuthorizationService,
 		AuthorizationService,
-		SystemRule,
+		SystemRule, // Why export? This is a no go!
 		AuthorizationInjectionService,
 		AuthorizationHelper,
 	],

apps/server/src/modules/authorization/index.ts

@@ -1,4 +1,5 @@
 export { AuthorizationModule } from './authorization.module';
+export { AuthorizationConfig } from './authorization.config';
 export {
 	// Action should not be exported, but hard to solve for now. The AuthorizationContextBuilder is the prefared way
 	Action,

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

@@ -0,0 +1,2 @@
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface ClassConfig {}

apps/server/src/modules/class/index.ts

@@ -1,3 +1,4 @@
-export * from './class.module';
+export { ClassModule } from './class.module';
 export * from './domain';
-export * from './service';
+export { ClassConfig } from './class.config';
+export { ClassService } from './service';

apps/server/src/modules/deletion/api/uc/deletion-request.uc.ts

@@ -7,11 +7,12 @@ import { LegacyLogger } from '@src/core/logger';
 import { DomainDeletionReportBuilder } from '../../domain/builder';
 import { DeletionLog, DeletionRequest } from '../../domain/do';
 import { DataDeletedEvent, UserDeletedEvent } from '../../domain/event';
-import { DeletionConfig, DomainDeletionReport } from '../../domain/interface';
+import { DomainDeletionReport } from '../../domain/interface';
 import { DeletionLogService, DeletionRequestService } from '../../domain/service';
 import { DeletionRequestLogResponseBuilder } from '../builder';
 import { DeletionRequestBodyProps, DeletionRequestLogResponse, DeletionRequestResponse } from '../controller/dto';
 import { DeletionTargetRefBuilder } from '../controller/dto/builder';
+import { DeletionConfig } from '../../deletion.config';
 
 @Injectable()
 @EventsHandler(DataDeletedEvent)

apps/server/src/modules/deletion/deletion-api.module.ts

@@ -13,6 +13,7 @@ import { DeletionExecutionsController } from './api/controller/deletion-executio
 import { DeletionRequestsController } from './api/controller/deletion-requests.controller';
 import { DeletionRequestUc } from './api/uc';
 
+// The most of this imports should not be part of the api module.
 @Module({
 	imports: [
 		CalendarModule,

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

@@ -0,0 +1,24 @@
+import { LoggerConfig } from '@src/core/logger';
+import { CalendarConfig } from '@src/infra/calendar';
+import { ClassConfig } from '@modules/class';
+import { XApiKeyConfig } from '@infra/auth-guard';
+import { NewsConfig } from '@modules/news';
+import { TeamsConfig } from '@modules/teams';
+import { PseudonymConfig } from '@modules/pseudonym';
+import { FilesConfig } from '@modules/files';
+import { RocketChatUserConfig } from '@modules/rocketchat-user';
+
+export interface DeletionConfig
+	extends LoggerConfig,
+		CalendarConfig,
+		ClassConfig,
+		NewsConfig,
+		TeamsConfig,
+		PseudonymConfig,
+		FilesConfig,
+		RocketChatUserConfig,
+		XApiKeyConfig {
+	ADMIN_API__MODIFICATION_THRESHOLD_MS: number;
+	ADMIN_API__MAX_CONCURRENT_DELETION_REQUESTS: number;
+	ADMIN_API__DELETION_DELAY_MILLISECONDS: number;
+}

apps/server/src/modules/deletion/domain/interface/index.ts

@@ -2,4 +2,3 @@ export * from './deletion-service';
 export * from './domain-deletion-report';
 export * from './domain-operation-report';
 export * from './deletion-target-ref';
-export * from './deletion-config';

apps/server/src/modules/deletion/domain/service/deletion-request.service.ts

@@ -5,7 +5,7 @@ import { ConfigService } from '@nestjs/config';
 import { DeletionRequestRepo } from '../../repo';
 import { DeletionRequest } from '../do';
 import { DomainName, StatusModel } from '../types';
-import { DeletionConfig } from '../interface';
+import { DeletionConfig } from '../../deletion.config';
 
 @Injectable()
 export class DeletionRequestService {

apps/server/src/modules/deletion/index.ts

@@ -1,9 +1,9 @@
 export { DeletionModule } from './deletion.module';
+export { DeletionConfig } from './deletion.config';
 export { DataDeletedEvent, UserDeletedEvent } from './domain/event';
 export { DomainDeletionReportBuilder, DomainOperationReportBuilder } from './domain/builder';
 export { DomainName, OperationType, StatusModel } from './domain/types';
 export { DeletionService, DomainDeletionReport, DomainOperationReport } from './domain/interface';
 export { DataDeletionDomainOperationLoggable } from './domain/loggable';
 export { DeletionErrorLoggableException } from './domain/loggable-exception';
 export { OperationReportHelper } from './domain/helper';
-export { DeletionConfig } from './domain/interface';

apps/server/src/modules/files-storage/files-storage.config.ts

@@ -25,6 +25,7 @@ const fileStorageConfig: FileStorageConfig = {
 	USE_STREAM_TO_ANTIVIRUS: Configuration.get('FILES_STORAGE__USE_STREAM_TO_ANTIVIRUS') as boolean,
 	...authorizationClientConfig,
 	...defaultConfig,
+	EXIT_ON_ERROR: Configuration.get('EXIT_ON_ERROR') as boolean,
 };
 
 // The configurations lookup

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

@@ -0,0 +1,3 @@
+import { LoggerConfig } from '@src/core/logger';
+
+export interface FilesConfig extends LoggerConfig {}

apps/server/src/modules/files/index.ts

@@ -1,2 +1,3 @@
-export * from './files.module';
+export { FilesModule } from './files.module';
+export { FilesConfig } from './files.config';
 export * from './service';

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

@@ -0,0 +1,2 @@
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface GroupConfig {}

apps/server/src/modules/group/index.ts

@@ -1,3 +1,4 @@
-export * from './group.module';
+export { GroupModule } from './group.module';
+export { GroupConfig } from './group.config';
 export * from './domain';
 export { GroupService } from './service';

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

@@ -17,6 +17,7 @@ const h5pEditorConfig: H5PEditorConfig = {
 	NEST_LOG_LEVEL: Configuration.get('NEST_LOG_LEVEL') as string,
 	INCOMING_REQUEST_TIMEOUT: Configuration.get('H5P_EDITOR__INCOMING_REQUEST_TIMEOUT') as number,
 	...authorizationClientConfig,
+	EXIT_ON_ERROR: Configuration.get('EXIT_ON_ERROR') as boolean,
 };
 
 export const translatorConfig = {

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

@@ -150,7 +150,7 @@ describe('Course Controller (API)', () => {
 			const response = await loggedInClient.postWithAttachment('import', 'file', course, courseFileName);
 
 			expect(response.statusCode).toEqual(201);
-		});
+		}, 10000);
 	});
 
 	describe('[POST] /courses/:courseId/stop-sync', () => {

apps/server/src/modules/legacy-school/index.ts

@@ -1,4 +1,5 @@
-export * from './legacy-school.module';
+export { LegacySchoolModule } from './legacy-school.module';
+export { LegacySchoolConfig } from './legacy-school.config';
 export * from './service';
 export {
 	SchoolSystemOptionsBuilder,

apps/server/src/modules/legacy-school/legacy-school.config.ts

@@ -0,0 +1,4 @@
+import { GroupConfig } from '@modules/group';
+import { LoggerConfig } from '@src/core/logger';
+
+export interface LegacySchoolConfig extends GroupConfig, LoggerConfig {}

apps/server/src/modules/news/index.ts

@@ -1 +1,2 @@
-export * from './news.module';
+export { NewsModule } from './news.module';
+export { NewsConfig } from './news.config';

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

@@ -0,0 +1,4 @@
+import { AuthorizationConfig } from '@modules/authorization';
+import { LoggerConfig } from '@src/core/logger';
+
+export interface NewsConfig extends AuthorizationConfig, LoggerConfig {}

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

@@ -8,6 +8,7 @@ import { TeamNewsController } from './controller/team-news.controller';
 import { NewsUc } from './uc/news.uc';
 import { NewsService } from './service/news.service';
 
+// imports from deletion module?
 @Module({
 	imports: [AuthorizationModule, CqrsModule, LoggerModule],
 	controllers: [NewsController, TeamNewsController],

apps/server/src/modules/pseudonym/index.ts

@@ -1,2 +1,3 @@
-export * from './pseudonym.module';
+export { PseudonymModule } from './pseudonym.module';
+export { PseudonymConfig } from './pseudonym.config';
 export * from './service';

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

@@ -0,0 +1,6 @@
+import { LoggerConfig } from '@src/core/logger';
+import { LearnroomConfig } from '@modules/learnroom';
+import { ToolConfig } from '@modules/tool';
+import { UserConfig } from '@modules/user';
+
+export interface PseudonymConfig extends UserConfig, LearnroomConfig, ToolConfig, LoggerConfig {}

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

@@ -4,6 +4,7 @@ import { LegacyLogger, LoggerModule } from '@src/core/logger';
 import { ExternalToolPseudonymRepo, PseudonymsRepo } from './repo';
 import { PseudonymService } from './service';
 
+// Why import this module LearnroomModule and ToolModule, The UserModule should also checked, but maybe it is ok.
 @Module({
 	imports: [LoggerModule, CqrsModule],
 	providers: [PseudonymService, PseudonymsRepo, ExternalToolPseudonymRepo, LegacyLogger],

apps/server/src/modules/registration-pin/index.ts

@@ -1,2 +1,3 @@
-export * from './registration-pin.module';
+export { RegistrationPinModule } from './registration-pin.module';
+export { RegistrationPinConfig } from './registration-pin.config';
 export { RegistrationPinService } from './service';

apps/server/src/modules/registration-pin/registration-pin.config.ts

@@ -0,0 +1,3 @@
+import { LoggerConfig } from '@src/core/logger';
+
+export interface RegistrationPinConfig extends LoggerConfig {}

apps/server/src/modules/rocketchat-user/index.ts

@@ -1,3 +1,4 @@
-export * from './rocketchat-user.module';
+export { RocketChatUserModule } from './rocketchat-user.module';
+export { RocketChatUserConfig } from './rocketchat-user.config';
 export * from './service';
 export * from './domain';

apps/server/src/modules/rocketchat-user/rocketchat-user.config.ts

@@ -0,0 +1,9 @@
+import { LoggerConfig } from '@src/core/logger';
+
+export interface RocketChatUserConfig extends LoggerConfig {
+	ROCKET_CHAT_URI: string;
+	ROCKET_CHAT_ADMIN_ID: string;
+	ROCKET_CHAT_ADMIN_TOKEN: string;
+	ROCKET_CHAT_ADMIN_USER: string;
+	ROCKET_CHAT_ADMIN_PASSWORD: string;
+}

apps/server/src/modules/role/index.ts

@@ -1,2 +1,3 @@
 export { RoleModule } from './role.module';
 export { RoleService, RoleDto } from './service';
+export { RoleConfig } from './role.config';

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

@@ -0,0 +1,2 @@
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface RoleConfig {}