-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix idp-console.module configs with dependencies
- Loading branch information
Showing
13 changed files
with
70 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
// eslint-disable-next-line @typescript-eslint/no-empty-interface | ||
export interface ConsoleWriterConfig {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
export * from './console-writer'; | ||
export { ConsoleWriterModule, ConsoleWriterService } from './console-writer'; | ||
export { ConsoleWriterConfig } from './console-writer.config'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,13 @@ | ||
export * from './error.mapper'; | ||
export * from './exchange'; | ||
export * from './rabbitmq.config'; | ||
export { | ||
RabbitMqConfig, | ||
FilesPreviewExchange, | ||
FilesStorageExchange, | ||
MailSendExchange, | ||
AntivirusExchange, | ||
RabbitMqURI, | ||
} from './rabbitmq.config'; | ||
export * from './rabbitmq.module'; | ||
export * from './rpc-message'; | ||
export * from './rpc-message-producer'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,11 @@ | ||
import { Configuration } from '@hpi-schul-cloud/commons/lib'; | ||
|
||
// should be move to config interface and added reading on places that use the module | ||
export const FilesPreviewExchange = Configuration.get('FILES_STORAGE__EXCHANGE') as string; | ||
export const FilesStorageExchange = Configuration.get('FILES_STORAGE__EXCHANGE') as string; | ||
export const MailSendExchange = Configuration.get('MAIL_SEND_EXCHANGE') as string; | ||
export const AntivirusExchange = Configuration.get('ANTIVIRUS_EXCHANGE') as string; | ||
export const RabbitMqURI = Configuration.get('RABBITMQ_URI') as string; | ||
|
||
// eslint-disable-next-line @typescript-eslint/no-empty-interface | ||
export interface RabbitMqConfig {} |
7 changes: 4 additions & 3 deletions
7
...modules/idp-console/idp-console.module.ts → ...les/idp-console/idp-console.app.module.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
import { ConsoleWriterConfig } from '@infra/console'; | ||
import { LoggerConfig } from '@src/core/logger'; | ||
import { AccountConfig } from '@modules/account'; | ||
import { UserConfig } from '@modules/user'; | ||
import { SynchronizationConfig } from '@modules/synchronization'; | ||
import { SchulconnexClientConfig } from '@infra/schulconnex-client'; | ||
import { Configuration } from '@hpi-schul-cloud/commons'; | ||
import { LanguageType } from '@shared/domain/interface'; | ||
import { RabbitMqConfig } from '@src/infra/rabbitmq'; | ||
|
||
interface IdpConsoleConfig | ||
extends ConsoleWriterConfig, | ||
RabbitMqConfig, | ||
LoggerConfig, | ||
AccountConfig, | ||
UserConfig, | ||
SynchronizationConfig, | ||
SchulconnexClientConfig { | ||
SYNCHRONIZATION_CHUNK: number; | ||
} | ||
|
||
const config: IdpConsoleConfig = { | ||
SYNCHRONIZATION_CHUNK: Configuration.get('SYNCHRONIZATION_CHUNK') as number, | ||
NEST_LOG_LEVEL: Configuration.get('NEST_LOG_LEVEL') as string, | ||
EXIT_ON_ERROR: Configuration.get('EXIT_ON_ERROR') as boolean, | ||
LOGIN_BLOCK_TIME: Configuration.get('LOGIN_BLOCK_TIME') as number, | ||
TEACHER_STUDENT_VISIBILITY__IS_CONFIGURABLE: Configuration.get( | ||
'TEACHER_STUDENT_VISIBILITY__IS_CONFIGURABLE' | ||
) as boolean, | ||
FEATURE_IDENTITY_MANAGEMENT_LOGIN_ENABLED: Configuration.get('FEATURE_IDENTITY_MANAGEMENT_LOGIN_ENABLED') as boolean, | ||
FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: Configuration.get('FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED') as boolean, | ||
AVAILABLE_LANGUAGES: (Configuration.get('I18N__AVAILABLE_LANGUAGES') as string).split(',') as LanguageType[], | ||
TEACHER_VISIBILITY_FOR_EXTERNAL_TEAM_INVITATION: '', | ||
SCHULCONNEX_CLIENT__PERSONEN_INFO_TIMEOUT_IN_MS: Configuration.get( | ||
'SCHULCONNEX_CLIENT__PERSONEN_INFO_TIMEOUT_IN_MS' | ||
) as number, | ||
SCHULCONNEX_CLIENT__POLICIES_INFO_TIMEOUT_IN_MS: Configuration.get( | ||
'SCHULCONNEX_CLIENT__POLICIES_INFO_TIMEOUT_IN_MS' | ||
) as number, | ||
}; | ||
|
||
export const idpConsoleConfigConfig = () => config; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1 @@ | ||
export * from './idp-console.module'; | ||
export * from './interface'; | ||
export { UsersSyncOptions, SystemType } from './interface'; // TODO: Why exports are needed? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,2 @@ | ||
export * from './system-type.enum'; | ||
export * from './users-sync-options.interface'; | ||
export * from './synchronization.config'; |
3 changes: 0 additions & 3 deletions
3
apps/server/src/modules/idp-console/interface/synchronization.config.ts
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
export { SynchronizationModule } from './synchronization.module'; | ||
export * from './domain'; | ||
export * from './domain'; // TODO: Fix me! | ||
export { SynchronizationEntity, SynchronizationRepo } from './repo'; | ||
export { SynchronizationConfig } from './synchronization.config'; |
2 changes: 2 additions & 0 deletions
2
apps/server/src/modules/synchronization/synchronization.config.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
// eslint-disable-next-line @typescript-eslint/no-empty-interface | ||
export interface SynchronizationConfig {} |