Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
refactor(backend:config): remove @nestjs/config dependency
johaven7a816d0887f7
diff --git a/backend/package.json b/backend/package.jsonindex 773478fa..b24f633b 100755--- a/backend/package.json+++ b/backend/package.json@@ -42,7 +42,6 @@"@lukeed/ms": "^2.0.2","@nestjs/axios": "^12.0.1","@nestjs/common": "^12.0.0",- "@nestjs/config": "^12.0.0","@nestjs/core": "^12.0.0","@nestjs/jwt": "^12.0.2","@nestjs/passport": "^12.0.0",diff --git a/backend/src/app.module.ts b/backend/src/app.module.tsindex 93da590c..89dcf068 100755--- a/backend/src/app.module.ts+++ b/backend/src/app.module.ts@@ -1,12 +1,11 @@import { HttpModule } from '@nestjs/axios'import { Module } from '@nestjs/common'-import { ConfigModule } from '@nestjs/config'import { LoggerModule } from 'nestjs-pino'import { USER_AGENT } from './app.constants.js'import { AppService } from './app.service.js'import { ApplicationsModule } from './applications/applications.module.js'import { AuthModule } from './authentication/auth.module.js'-import { configuration, exportConfiguration } from './configuration/config.environment.js'+import { configuration } from './configuration/config.environment.js'import { configLogger } from './configuration/config.logger.js'import type { FastifyLoggerRequest } from './configuration/interfaces/logger.interface.js'import { AvailabilityModule } from './infrastructure/availability/availability.module.js'@@ -18,7 +17,6 @@ import { SchedulerModule } from './infrastructure/scheduler/scheduler.module.js'@Module({imports: [- ConfigModule.forRoot({ load: [exportConfiguration], validatePredefined: false, ignoreEnvFile: true, isGlobal: true }),LoggerModule.forRootAsync<FastifyLoggerRequest>({useFactory: async () => ({pinoHttp: configLogger(configuration.logger)diff --git a/backend/src/app.service.spec.ts b/backend/src/app.service.spec.tsindex 3e361ee2..a913995e 100644--- a/backend/src/app.service.spec.ts+++ b/backend/src/app.service.spec.ts@@ -7,7 +7,7 @@ import path from 'node:path'import process from 'node:process'import { AppService } from './app.service.js'import { ENVIRONMENT_PREFIX } from './configuration/config.constants.js'-import { configuration, exportConfiguration } from './configuration/config.environment.js'+import { configuration, loadConfiguration } from './configuration/config.environment.js'vi.mock('@socket.io/cluster-adapter', () => ({setupPrimary: vi.fn()@@ -135,7 +135,7 @@ describe(AppService.name, () => {})it(`should use ${ENVIRONMENT_PREFIX} environment variables to override the configuration`, () => {- let conf = exportConfiguration()+ let conf = configurationexpect(conf.logger.stdout).toBe(true)expect(conf.logger.colorize).toBe(true)const tmpSecretFile = path.join(os.tmpdir(), 'secret')@@ -149,7 +149,7 @@ describe(AppService.name, () => {process.env[`${ENVIRONMENT_PREFIX}APPLICATIONS_FILES_SAMPLEDOCUMENTS`] = 'microsoft'// docker compose secret fileprocess.env[`${ENVIRONMENT_PREFIX}AUTH_TOKEN_ACCESS_SECRET_FILE`] = tmpSecretFile- conf = exportConfiguration(true)+ conf = loadConfiguration()expect(conf.applications.files.editors.onlyoffice.secret).toBe('fooBAR')expect(warnSpy).toHaveBeenCalledWith(`Environment variable "${ENVIRONMENT_PREFIX}APPLICATIONS_FILES_ONLYOFFICE_SECRET" is deprecated. Please use "${ENVIRONMENT_PREFIX}APPLICATIONS_FILES_EDITORS_ONLYOFFICE_SECRET" instead.`diff --git a/backend/src/applications/links/services/links-manager.service.spec.ts b/backend/src/applications/links/services/links-manager.service.spec.tsindex dd26037b..59bb2bb7 100644--- a/backend/src/applications/links/services/links-manager.service.spec.ts+++ b/backend/src/applications/links/services/links-manager.service.spec.ts@@ -1,6 +1,5 @@import { HttpService } from '@nestjs/axios'import { HttpException, HttpStatus } from '@nestjs/common'-import { ConfigService } from '@nestjs/config'import { JwtService } from '@nestjs/jwt'import { Test, TestingModule } from '@nestjs/testing'import { AuthManager } from '../../../authentication/auth.service.js'@@ -87,7 +86,6 @@ describe(LinksManager.name, () => {},{ provide: HttpService, useValue: {} },{ provide: FilesLockManager, useValue: {} },- { provide: ConfigService, useValue: {} },{ provide: JwtService, useValue: {} },{ provide: AuthManager, useValue: authManagerMock },{ provide: UsersManager, useValue: usersManagerMock },diff --git a/backend/src/applications/spaces/services/spaces-browser.service.spec.ts b/backend/src/applications/spaces/services/spaces-browser.service.spec.tsindex 35ac298b..c5ed9f67 100644--- a/backend/src/applications/spaces/services/spaces-browser.service.spec.ts+++ b/backend/src/applications/spaces/services/spaces-browser.service.spec.ts@@ -1,7 +1,6 @@-import { ConfigModule } from '@nestjs/config'import { Test, TestingModule } from '@nestjs/testing'import fs from 'node:fs/promises'-import { configuration, exportConfiguration } from '../../../configuration/config.environment.js'+import { configuration } from '../../../configuration/config.environment.js'import { Cache } from '../../../infrastructure/cache/cache.service.js'import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants.js'import { FilesQuotaManager } from '../../files/services/files-quota-manager.service.js'@@ -24,7 +23,6 @@ describe(SpacesBrowser.name, () => {beforeAll(async () => {const module: TestingModule = await Test.createTestingModule({- imports: [await ConfigModule.forRoot({ load: [exportConfiguration], isGlobal: true })],providers: [{ provide: DB_TOKEN_PROVIDER, useValue: {} },{diff --git a/backend/src/applications/spaces/services/spaces-manager.service.spec.ts b/backend/src/applications/spaces/services/spaces-manager.service.spec.tsindex 8b244d75..51f1f07b 100644--- a/backend/src/applications/spaces/services/spaces-manager.service.spec.ts+++ b/backend/src/applications/spaces/services/spaces-manager.service.spec.ts@@ -1,11 +1,10 @@import { HttpException, HttpStatus } from '@nestjs/common'-import { ConfigModule, ConfigService } from '@nestjs/config'import { Test, TestingModule } from '@nestjs/testing'import fs from 'node:fs/promises'import os from 'node:os'import path from 'node:path'import { transformAndValidate } from '../../../common/functions.js'-import { exportConfiguration } from '../../../configuration/config.environment.js'+import { configuration } from '../../../configuration/config.environment.js'import { Cache } from '../../../infrastructure/cache/cache.service.js'import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants.js'import { FilesConfig } from '../../files/files.config.js'@@ -40,7 +39,6 @@ describe(SpacesManager.name, () => {beforeAll(async () => {const module: TestingModule = await Test.createTestingModule({- imports: [await ConfigModule.forRoot({ load: [exportConfiguration], isGlobal: true })],providers: [{ provide: DB_TOKEN_PROVIDER, useValue: {} },{@@ -66,7 +64,7 @@ describe(SpacesManager.name, () => {}).compile()module.useLogger(['fatal'])- filesConfig = module.get<ConfigService>(ConfigService).get('applications.files')+ filesConfig = configuration.applications.filesspacesManager = module.get<SpacesManager>(SpacesManager)spacesQueries = module.get<SpacesQueries>(SpacesQueries)userTest = new UserModel(generateUserTest())diff --git a/backend/src/applications/users/admin-users.controller.spec.ts b/backend/src/applications/users/admin-users.controller.spec.tsindex e4b6c94f..bb2fa608 100644--- a/backend/src/applications/users/admin-users.controller.spec.ts+++ b/backend/src/applications/users/admin-users.controller.spec.ts@@ -1,10 +1,8 @@-import { ConfigModule } from '@nestjs/config'import { JwtService } from '@nestjs/jwt'import { Test, TestingModule } from '@nestjs/testing'import { AuthManager } from '../../authentication/auth.service.js'import { AuthProvider2FA } from '../../authentication/providers/two-fa/auth-provider-two-fa.service.js'import { AuthTwoFaVerificationGuard } from '../../authentication/providers/two-fa/guards/auth-two-fa-verification.guard.js'-import { exportConfiguration } from '../../configuration/config.environment.js'import { Cache } from '../../infrastructure/cache/cache.service.js'import { DB_TOKEN_PROVIDER } from '../../infrastructure/database/constants.js'import { NotificationsManager } from '../notifications/services/notifications-manager.service.js'@@ -20,7 +18,6 @@ describe(AdminUsersController.name, () => {beforeAll(async () => {const module: TestingModule = await Test.createTestingModule({- imports: [await ConfigModule.forRoot({ load: [exportConfiguration], isGlobal: true })],controllers: [AdminUsersController],providers: [{ provide: DB_TOKEN_PROVIDER, useValue: {} },diff --git a/backend/src/applications/users/users.controller.spec.ts b/backend/src/applications/users/users.controller.spec.tsindex 67231e05..4108c875 100755--- a/backend/src/applications/users/users.controller.spec.ts+++ b/backend/src/applications/users/users.controller.spec.ts@@ -1,9 +1,7 @@-import { ConfigModule } from '@nestjs/config'import { JwtService } from '@nestjs/jwt'import { Test, TestingModule } from '@nestjs/testing'import { AuthManager } from '../../authentication/auth.service.js'import { AuthProvider2FA } from '../../authentication/providers/two-fa/auth-provider-two-fa.service.js'-import { exportConfiguration } from '../../configuration/config.environment.js'import { Cache } from '../../infrastructure/cache/cache.service.js'import { DB_TOKEN_PROVIDER } from '../../infrastructure/database/constants.js'import { NotificationsManager } from '../notifications/services/notifications-manager.service.js'@@ -25,7 +23,6 @@ describe(UsersController.name, () => {beforeAll(async () => {module = await Test.createTestingModule({- imports: [await ConfigModule.forRoot({ load: [exportConfiguration], isGlobal: true })],controllers: [UsersController],providers: [{ provide: DB_TOKEN_PROVIDER, useValue: {} },diff --git a/backend/src/authentication/auth.controller.spec.ts b/backend/src/authentication/auth.controller.spec.tsindex 41247518..3f794b48 100755--- a/backend/src/authentication/auth.controller.spec.ts+++ b/backend/src/authentication/auth.controller.spec.ts@@ -1,6 +1,5 @@import fastifyCookie, { sign } from '@fastify/cookie'import { ExecutionContext, UnauthorizedException, ValidationPipe } from '@nestjs/common'-import { ConfigModule, ConfigService } from '@nestjs/config'import { APP_GUARD, Reflector } from '@nestjs/core'import { JwtService } from '@nestjs/jwt'import { PassportModule } from '@nestjs/passport'@@ -15,7 +14,7 @@ import { UsersManager } from '../applications/users/services/users-manager.serviimport { generateUserTest } from '../applications/users/utils/test.js'import { convertHumanTimeToSeconds } from '../common/functions.js'import { currentTimeStamp } from '../common/shared.js'-import { exportConfiguration } from '../configuration/config.environment.js'+import { configuration } from '../configuration/config.environment.js'import { Cache } from '../infrastructure/cache/cache.service.js'import { DB_TOKEN_PROVIDER } from '../infrastructure/database/constants.js'import { AuthConfig } from './auth.config.js'@@ -45,10 +44,9 @@ describe(AuthController.name, () => {beforeAll(async () => {const testingModuleBuilder = Test.createTestingModule({- imports: [await ConfigModule.forRoot({ load: [exportConfiguration], isGlobal: true }), PassportModule],+ imports: [PassportModule],controllers: [AuthController],providers: [- ConfigService,AuthManager,JwtService,AuthProvider2FA,@@ -63,7 +61,7 @@ describe(AuthController.name, () => {module = await testingModuleBuilder.compile()module.useLogger(['fatal'])- authConfig = module.get<ConfigService>(ConfigService).get<AuthConfig>('auth')+ authConfig = configuration.authauthController = module.get<AuthController>(AuthController)authManager = module.get<AuthManager>(AuthManager)authProvider2FA = module.get<AuthProvider2FA>(AuthProvider2FA)@@ -280,10 +278,9 @@ describe(`${AuthController.name} HTTP`, () => {beforeAll(async () => {const testingModuleBuilder = Test.createTestingModule({- imports: [await ConfigModule.forRoot({ load: [exportConfiguration], isGlobal: true }), PassportModule],+ imports: [PassportModule],controllers: [AuthController],providers: [- ConfigService,AuthManager,JwtService,AuthProvider2FA,@@ -321,7 +318,7 @@ describe(`${AuthController.name} HTTP`, () => {const module: TestingModule = await testingModuleBuilder.compile()module.useLogger(['fatal'])- authConfig = module.get<ConfigService>(ConfigService).get<AuthConfig>('auth')+ authConfig = configuration.authauthManager = module.get<AuthManager>(AuthManager)authProvider2FA = module.get<AuthProvider2FA>(AuthProvider2FA)jwtService = module.get<JwtService>(JwtService)diff --git a/backend/src/authentication/auth.e2e-spec.ts b/backend/src/authentication/auth.e2e-spec.tsindex a2c01ef8..3ba194d4 100644--- a/backend/src/authentication/auth.e2e-spec.ts+++ b/backend/src/authentication/auth.e2e-spec.ts@@ -1,4 +1,3 @@-import { ConfigService } from '@nestjs/config'import { JwtService } from '@nestjs/jwt'import { NestFastifyApplication } from '@nestjs/platform-fastify'import { Type } from 'class-transformer'@@ -15,6 +14,7 @@ import { generateUserTest } from '../applications/users/utils/test.js'import { XML_CONTENT_TYPE } from '../applications/webdav/constants/webdav.js'import { convertHumanTimeToSeconds, transformAndValidate } from '../common/functions.js'import { currentTimeStamp, decodeUrl } from '../common/shared.js'+import { configuration } from '../configuration/config.environment.js'import { Cache } from '../infrastructure/cache/cache.service.js'import { dbCheckConnection } from '../infrastructure/database/utils.js'import { AuthConfig } from './auth.config.js'@@ -66,7 +66,7 @@ describe('Auth (e2e)', () => {app = await appBootstrap()await app.init()await app.getHttpAdapter().getInstance().ready()- authConfig = app.get<ConfigService>(ConfigService).get<AuthConfig>('auth')+ authConfig = configuration.authjwtService = app.get<JwtService>(JwtService)adminUsersManager = app.get<AdminUsersManager>(AdminUsersManager)usersManager = app.get<UsersManager>(UsersManager)diff --git a/backend/src/authentication/auth.service.spec.ts b/backend/src/authentication/auth.service.spec.tsindex 6443b90f..4117a678 100755--- a/backend/src/authentication/auth.service.spec.ts+++ b/backend/src/authentication/auth.service.spec.ts@@ -1,4 +1,3 @@-import { ConfigService } from '@nestjs/config'import { JwtService } from '@nestjs/jwt'import { Test, TestingModule } from '@nestjs/testing'import { USER_ROLE } from '../applications/users/constants/user.js'@@ -16,7 +15,7 @@ describe(AuthManager.name, () => {beforeAll(async () => {const module: TestingModule = await Test.createTestingModule({- providers: [AuthManager, { provide: JwtService, useValue: jwtService }, { provide: ConfigService, useValue: { get: () => null } }]+ providers: [AuthManager, { provide: JwtService, useValue: jwtService }]}).compile()module.useLogger(['fatal'])diff --git a/backend/src/authentication/guards/auth-anonymous.guard.spec.ts b/backend/src/authentication/guards/auth-anonymous.guard.spec.tsindex d54dd3c0..2577ebc2 100644--- a/backend/src/authentication/guards/auth-anonymous.guard.spec.ts+++ b/backend/src/authentication/guards/auth-anonymous.guard.spec.ts@@ -1,11 +1,9 @@import { createMock, DeepMocked } from '@golevelup/ts-vitest'import { ExecutionContext } from '@nestjs/common'-import { ConfigModule } from '@nestjs/config'import { PassportModule } from '@nestjs/passport'import { Test, TestingModule } from '@nestjs/testing'import { PinoLogger } from 'nestjs-pino'import { UsersManager } from '../../applications/users/services/users-manager.service.js'-import { exportConfiguration } from '../../configuration/config.environment.js'import { AuthAnonymousGuard } from './auth-anonymous.guard.js'import { AuthAnonymousStrategy } from './auth-anonymous.strategy.js'@@ -16,13 +14,7 @@ describe(AuthAnonymousGuard.name, () => {beforeAll(async () => {const module: TestingModule = await Test.createTestingModule({- imports: [- await ConfigModule.forRoot({- load: [exportConfiguration],- isGlobal: true- }),- PassportModule- ],+ imports: [PassportModule],providers: [AuthAnonymousGuard,AuthAnonymousStrategy,diff --git a/backend/src/authentication/guards/auth-token-access.guard.spec.ts b/backend/src/authentication/guards/auth-token-access.guard.spec.tsindex 6131f974..ba8fb6fa 100644--- a/backend/src/authentication/guards/auth-token-access.guard.spec.ts+++ b/backend/src/authentication/guards/auth-token-access.guard.spec.ts@@ -1,7 +1,6 @@import { sign } from '@fastify/cookie'import { createMock, DeepMocked } from '@golevelup/ts-vitest'import { ExecutionContext } from '@nestjs/common'-import { ConfigModule, ConfigService } from '@nestjs/config'import { Reflector } from '@nestjs/core'import { JwtModule, JwtService } from '@nestjs/jwt'import { PassportModule } from '@nestjs/passport'@@ -10,7 +9,7 @@ import { PinoLogger } from 'nestjs-pino'import crypto from 'node:crypto'import { USER_PERMISSION, USER_ROLE } from '../../applications/users/constants/user.js'import { WEB_DAV_CONTEXT, WebDAVContext } from '../../applications/webdav/decorators/webdav-context.decorator.js'-import { exportConfiguration } from '../../configuration/config.environment.js'+import { configuration } from '../../configuration/config.environment.js'import { AuthConfig } from '../auth.config.js'import { AuthManager } from '../auth.service.js'import { CSRF_ERROR } from '../constants/auth.js'@@ -47,14 +46,7 @@ describe(AuthTokenAccessGuard.name, () => {beforeAll(async () => {const module: TestingModule = await Test.createTestingModule({- imports: [- await ConfigModule.forRoot({- load: [exportConfiguration],- isGlobal: true- }),- JwtModule.register({ global: true }),- PassportModule- ],+ imports: [JwtModule.register({ global: true }), PassportModule],providers: [AuthTokenAccessStrategy,AuthAnonymousStrategy,@@ -69,7 +61,7 @@ describe(AuthTokenAccessGuard.name, () => {]}).compile()- authConfig = module.get<ConfigService>(ConfigService).get<AuthConfig>('auth')+ authConfig = configuration.authjwtService = module.get<JwtService>(JwtService)reflector = new Reflector()authAccessGuard = new AuthTokenAccessGuard(reflector)diff --git a/backend/src/authentication/guards/auth-token-refresh.guard.spec.ts b/backend/src/authentication/guards/auth-token-refresh.guard.spec.tsindex 1b790d08..054af65a 100644--- a/backend/src/authentication/guards/auth-token-refresh.guard.spec.ts+++ b/backend/src/authentication/guards/auth-token-refresh.guard.spec.ts@@ -1,7 +1,6 @@import { sign } from '@fastify/cookie'import { createMock, DeepMocked } from '@golevelup/ts-vitest'import { ExecutionContext } from '@nestjs/common'-import { ConfigModule, ConfigService } from '@nestjs/config'import { JwtModule, JwtService } from '@nestjs/jwt'import { PassportModule } from '@nestjs/passport'import { Test, TestingModule } from '@nestjs/testing'@@ -9,7 +8,7 @@ import { PinoLogger } from 'nestjs-pino'import crypto from 'node:crypto'import { UserModel } from '../../applications/users/models/user.model.js'import { UsersManager } from '../../applications/users/services/users-manager.service.js'-import { exportConfiguration } from '../../configuration/config.environment.js'+import { configuration } from '../../configuration/config.environment.js'import { AuthConfig } from '../auth.config.js'import { AuthManager } from '../auth.service.js'import { CSRF_ERROR } from '../constants/auth.js'@@ -33,7 +32,7 @@ describe(AuthTokenRefreshGuard.name, () => {beforeAll(async () => {const module: TestingModule = await Test.createTestingModule({- imports: [await ConfigModule.forRoot({ load: [exportConfiguration], isGlobal: true }), JwtModule.register({ global: true }), PassportModule],+ imports: [JwtModule.register({ global: true }), PassportModule],providers: [AuthTokenRefreshGuard,AuthTokenRefreshStrategy,@@ -48,7 +47,7 @@ describe(AuthTokenRefreshGuard.name, () => {]}).compile()- authConfig = module.get<ConfigService>(ConfigService).get<AuthConfig>('auth')+ authConfig = configuration.authjwtService = module.get<JwtService>(JwtService)authRefreshGuard = module.get<AuthTokenRefreshGuard>(AuthTokenRefreshGuard)refreshToken = await jwtService.signAsync(diff --git a/backend/src/authentication/providers/two-fa/guards/auth-token-two-fa.guard.spec.ts b/backend/src/authentication/providers/two-fa/guards/auth-token-two-fa.guard.spec.tsindex 3876a0c9..fbb4cfbd 100644--- a/backend/src/authentication/providers/two-fa/guards/auth-token-two-fa.guard.spec.ts+++ b/backend/src/authentication/providers/two-fa/guards/auth-token-two-fa.guard.spec.ts@@ -1,13 +1,12 @@import { sign } from '@fastify/cookie'import { createMock, DeepMocked } from '@golevelup/ts-vitest'import { ExecutionContext } from '@nestjs/common'-import { ConfigModule, ConfigService } from '@nestjs/config'import { JwtModule, JwtService } from '@nestjs/jwt'import { PassportModule } from '@nestjs/passport'import { Test, TestingModule } from '@nestjs/testing'import { PinoLogger } from 'nestjs-pino'import crypto from 'node:crypto'-import { exportConfiguration } from '../../../../configuration/config.environment.js'+import { configuration } from '../../../../configuration/config.environment.js'import { AuthConfig } from '../../../auth.config.js'import { AuthManager } from '../../../auth.service.js'import { CSRF_ERROR } from '../../../constants/auth.js'@@ -26,7 +25,7 @@ describe(AuthTokenTwoFaGuard.name, () => {beforeAll(async () => {const module: TestingModule = await Test.createTestingModule({- imports: [await ConfigModule.forRoot({ load: [exportConfiguration], isGlobal: true }), JwtModule.register({ global: true }), PassportModule],+ imports: [JwtModule.register({ global: true }), PassportModule],providers: [AuthTokenTwoFaGuard,AuthTokenTwoFaStrategy,@@ -40,7 +39,7 @@ describe(AuthTokenTwoFaGuard.name, () => {]}).compile()- authConfig = module.get<ConfigService>(ConfigService).get<AuthConfig>('auth')+ authConfig = configuration.authconst jwtService = module.get<JwtService>(JwtService)authTokenTwoFaGuard = module.get<AuthTokenTwoFaGuard>(AuthTokenTwoFaGuard)temporaryTwoFaToken = await jwtService.signAsync(diff --git a/backend/src/configuration/config.environment.ts b/backend/src/configuration/config.environment.tsindex 8af07c5e..ec7ff90b 100755--- a/backend/src/configuration/config.environment.ts+++ b/backend/src/configuration/config.environment.ts@@ -24,9 +24,8 @@ export const serverConfig: ServerConfig = {sampleDocuments: getDocumentTypes(configuration.applications.files.sampleDocuments)}}-export const exportConfiguration: (reload?: boolean) => GlobalConfig = (reload = false) => (reload ? loadConfiguration() : configuration)-function loadConfiguration(): GlobalConfig {+export function loadConfiguration(): GlobalConfig {deprecatedFilesEditorsEnvConfig()const config: GlobalConfig = configLoader()// LOGGERdiff --git a/backend/src/infrastructure/mailer/mailer.service.spec.ts b/backend/src/infrastructure/mailer/mailer.service.spec.tsindex b46b95f7..d321affc 100644--- a/backend/src/infrastructure/mailer/mailer.service.spec.ts+++ b/backend/src/infrastructure/mailer/mailer.service.spec.ts@@ -1,7 +1,7 @@-import { ConfigService } from '@nestjs/config'import { Test, TestingModule } from '@nestjs/testing'import { PinoLogger } from 'nestjs-pino'import nodemailer, { type Transporter } from 'nodemailer'+import { configuration } from '../../configuration/config.environment.js'import { MailerConfig } from './mailer.config.js'import { Mailer } from './mailer.service.js'@@ -16,8 +16,8 @@ vi.mocked(nodemailer.createTransport).mockReturnValue(createTransportMock as unkdescribe(Mailer.name, () => {let module: TestingModulelet mailer: Mailer- let configService: ConfigServicelet logger: PinoLogger+ const originalMailerConfig = configuration.mailconst mailerConfig: MailerConfig = {host: 'smtp.example.com',@@ -31,10 +31,10 @@ describe(Mailer.name, () => {}const initModule = async (config: MailerConfig | undefined, loggerLevel: string = 'info') => {+ configuration.mail = configmodule = await Test.createTestingModule({providers: [Mailer,- { provide: ConfigService, useValue: { get: vi.fn().mockReturnValue(config) } },{provide: PinoLogger,useValue: {@@ -53,7 +53,6 @@ describe(Mailer.name, () => {await module.init()mailer = module.get<Mailer>(Mailer)- configService = module.get<ConfigService>(ConfigService)logger = module.get<PinoLogger>(PinoLogger)}@@ -61,10 +60,13 @@ describe(Mailer.name, () => {await initModule(undefined)})+ afterAll(() => {+ configuration.mail = originalMailerConfig+ })+it('should be defined', () => {expect(module).toBeDefined()expect(mailer).toBeDefined()- expect(configService).toBeDefined()expect(logger).toBeDefined()})diff --git a/backend/src/infrastructure/mailer/mailer.service.ts b/backend/src/infrastructure/mailer/mailer.service.tsindex b608639c..e50d155b 100644--- a/backend/src/infrastructure/mailer/mailer.service.ts+++ b/backend/src/infrastructure/mailer/mailer.service.ts@@ -1,7 +1,7 @@import { Injectable, type OnModuleInit } from '@nestjs/common'-import { ConfigService } from '@nestjs/config'import { PinoLogger } from 'nestjs-pino'import type { SendMailOptions, SMTPTransportOptions, Transporter } from 'nodemailer'+import { configuration } from '../../configuration/config.environment.js'import type { MailProps } from './interfaces/mail.interface.js'import { MailerConfig } from './mailer.config.js'@@ -11,12 +11,9 @@ export class Mailer implements OnModuleInit {private transporter: Transporterprivate readonly configuration: MailerConfig- constructor(- private configService: ConfigService,- private readonly logger: PinoLogger- ) {+ constructor(private readonly logger: PinoLogger) {this.logger.setContext(Mailer.name.toUpperCase())- this.configuration = this.configService.get<MailerConfig>('mail')+ this.configuration = configuration.mail}async onModuleInit(): Promise<void> {diff --git a/package-lock.json b/package-lock.jsonindex 650a2556..9aed83af 100644--- a/package-lock.json+++ b/package-lock.json@@ -52,7 +52,6 @@"@lukeed/ms": "^2.0.2","@nestjs/axios": "^12.0.1","@nestjs/common": "^12.0.0",- "@nestjs/config": "^12.0.0","@nestjs/core": "^12.0.0","@nestjs/jwt": "^12.0.2","@nestjs/passport": "^12.0.0",@@ -6726,22 +6725,6 @@}}},- "node_modules/@nestjs/config": {- "version": "12.0.1",- "resolved": "https://registry.npmjs.org/@nestjs/config/-/config-12.0.1.tgz",- "integrity": "sha512-pxqEtULFi4qXda0TqyR2YFq7o4UoRa7h4K5H0lgFuBMrUGr6x6VVldaJJrowFyh4uvp8dNq9Mie3T+l+uEOTfw==",- "license": "MIT",- "dependencies": {- "@standard-schema/spec": "1.1.0",- "dotenv": "18.0.3",- "dotenv-expand": "13.0.0",- "es-toolkit": "1.52.0"- },- "peerDependencies": {- "@nestjs/common": "^11.0.0 || ^12.0.0",- "rxjs": "^7.1.0"- }- },"node_modules/@nestjs/core": {"version": "12.1.2","resolved": "https://registry.npmjs.org/@nestjs/core/-/core-12.1.2.tgz",@@ -12871,48 +12854,6 @@"url": "https://github.com/fb55/domutils?sponsor=1"}},- "node_modules/dotenv": {- "version": "18.0.3",- "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-18.0.3.tgz",- "integrity": "sha512-/8CJTyL817qPnfbQrJgOEcrU3fDrJkRIoXBE566wHuvIXKOCHUZhPqGPbCPi9SogjdGnreF0TlvnTgK6J/8zpA==",- "license": "BSD-2-Clause",- "bin": {- "dotenv": "dist/index.cjs"- },- "engines": {- "node": ">=12"- },- "funding": {- "url": "https://dotenvx.com"- }- },- "node_modules/dotenv-expand": {- "version": "13.0.0",- "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-13.0.0.tgz",- "integrity": "sha512-aBfBS8eYIeXmpHI9ThIlA7/WLq+SLt18iXUZhb52rW89QLKQFoIpPG1bPeewoPZsTyjSSO3T7234FBVUM1V2rA==",- "license": "BSD-2-Clause",- "dependencies": {- "dotenv": "^17.4.2"- },- "engines": {- "node": ">=12"- },- "funding": {- "url": "https://dotenvx.com"- }- },- "node_modules/dotenv-expand/node_modules/dotenv": {- "version": "17.4.2",- "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz",- "integrity": "sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==",- "license": "BSD-2-Clause",- "engines": {- "node": ">=12"- },- "funding": {- "url": "https://dotenvx.com"- }- },"node_modules/dotgitignore": {"version": "2.1.0","resolved": "https://registry.npmjs.org/dotgitignore/-/dotgitignore-2.1.0.tgz",@@ -13860,18 +13801,6 @@"node": ">= 0.4"}},- "node_modules/es-toolkit": {- "version": "1.52.0",- "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.52.0.tgz",- "integrity": "sha512-XTNEJQh1tY1ZJVcf6ayP/2n4ZPyaHlW2FWs7xvw5ddPuhUVjLD3olQVQS7kf58JbAB48iL0uL/jerTrjtV3lDA==",- "license": "MIT",- "workspaces": [- "docs",- "benchmarks",- "tests/types",- "tests/browser-compat"- ]- },"node_modules/esbuild": {"version": "0.28.1","resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz",