From 02467337acd3599c1695703fba62a93cdec58572 Mon Sep 17 00:00:00 2001 From: RXRD Date: Fri, 16 Feb 2024 12:23:31 +0700 Subject: [PATCH 01/18] fix --- src/common/modules/caches/index.ts | 13 +++++------- .../debio-conversion.module.ts | 13 +++++------- .../debio-conversion.service.ts | 21 +++++-------------- src/common/modules/escrow/escrow.service.ts | 11 +++------- .../modules/ethereum/ethereum.service.ts | 13 ++++-------- src/config.ts | 13 ++++++++++++ 6 files changed, 35 insertions(+), 49 deletions(-) create mode 100644 src/config.ts diff --git a/src/common/modules/caches/index.ts b/src/common/modules/caches/index.ts index 0d416687..09c03a26 100644 --- a/src/common/modules/caches/index.ts +++ b/src/common/modules/caches/index.ts @@ -1,23 +1,20 @@ import { CacheModule, Module } from '@nestjs/common'; import { CachesService } from './caches.service'; import * as redisStore from 'cache-manager-redis-store'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { keyList } from '../../secrets'; +import { config } from 'src/config'; @Module({ imports: [ CacheModule.registerAsync({ - inject: [GCloudSecretManagerService], + inject: [], useFactory: async ( - gCloudSecretManagerService: GCloudSecretManagerService, ) => { return { store: redisStore, - host: gCloudSecretManagerService.getSecret('REDIS_HOST').toString(), - port: gCloudSecretManagerService.getSecret('REDIS_PORT').toString(), - auth_pass: gCloudSecretManagerService - .getSecret('REDIS_PASSWORD') - .toString(), + host: config.REDIS_HOST.toString(), + port: config.REDIS_PORT.toString(), + auth_pass: config.REDIS_PASSWORD.toString(), }; }, }), diff --git a/src/common/modules/debio-conversion/debio-conversion.module.ts b/src/common/modules/debio-conversion/debio-conversion.module.ts index b925b9ac..5589bc94 100644 --- a/src/common/modules/debio-conversion/debio-conversion.module.ts +++ b/src/common/modules/debio-conversion/debio-conversion.module.ts @@ -1,23 +1,20 @@ import { DebioConversionService } from './debio-conversion.service'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { CacheModule, Module } from '@nestjs/common'; import * as redisStore from 'cache-manager-redis-store'; import { keyList } from '../../../common/secrets'; +import { config } from 'src/config'; @Module({ imports: [ CacheModule.registerAsync({ - inject: [GCloudSecretManagerService], + inject: [], useFactory: async ( - gCloudSecretManagerService: GCloudSecretManagerService, ) => { return { store: redisStore, - host: gCloudSecretManagerService.getSecret('REDIS_HOST').toString(), - port: gCloudSecretManagerService.getSecret('REDIS_PORT').toString(), - auth_pass: gCloudSecretManagerService - .getSecret('REDIS_PASSWORD') - .toString(), + host: config.REDIS_HOST.toString(), + port: config.REDIS_PORT.toString(), + auth_pass: config.REDIS_PASSWORD.toString(), ttl: 2 * 60 * 60, }; }, diff --git a/src/common/modules/debio-conversion/debio-conversion.service.ts b/src/common/modules/debio-conversion/debio-conversion.service.ts index ded1645e..bd02270e 100644 --- a/src/common/modules/debio-conversion/debio-conversion.service.ts +++ b/src/common/modules/debio-conversion/debio-conversion.service.ts @@ -1,4 +1,3 @@ -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { keyList } from '../../secrets'; import axios from 'axios'; import { CACHE_MANAGER, Inject, Injectable } from '@nestjs/common'; @@ -10,11 +9,11 @@ import { estimateSwap, getExpectedOutputFromSwapTodos, } from '@ref-finance/ref-sdk'; +import { config } from 'src/config'; @Injectable() export class DebioConversionService { constructor( - private readonly gCloudSecretManagerService: GCloudSecretManagerService, @Inject(CACHE_MANAGER) private readonly cacheManager: Cache, ) {} @@ -27,10 +26,7 @@ export class DebioConversionService { } async setCacheExchangeFromTo(from: string, to: string) { - const listApiKey: string[] = this.gCloudSecretManagerService - .getSecret('COINMARKETCAP_API_KEY') - .toString() - .split(','); + const listApiKey: string[] = config.COINMARKETCAP_API_KEY.toString().split(','); const indexCurrentApiKey: number = await this.cacheManager.get( 'index_api_key', ); @@ -68,10 +64,7 @@ export class DebioConversionService { async setCacheExchange() { const sodaki = await this.getSodakiExchange(); - const listApiKey: string[] = this.gCloudSecretManagerService - .getSecret('COINMARKETCAP_API_KEY') - .toString() - .split(','); + const listApiKey: string[] = config.COINMARKETCAP_API_KEY.toString().split(','); const indexCurrentApiKey: number = await this.cacheManager.get( 'index_api_key', ); @@ -149,9 +142,7 @@ export class DebioConversionService { async convertDaiToUsd(apiKey: string, daiAmount: number): Promise { const response = await axios.get( - `${this.gCloudSecretManagerService - .getSecret('COINMARKETCAP_HOST') - .toString()}/tools/price-conversion`, + `${config.COINMARKETCAP_HOST.toString()}/tools/price-conversion`, { headers: { 'X-CMC_PRO_API_KEY': apiKey, @@ -174,9 +165,7 @@ export class DebioConversionService { to: string, ): Promise { const response = await axios.get( - `${this.gCloudSecretManagerService - .getSecret('COINMARKETCAP_HOST') - .toString()}/tools/price-conversion`, + `${config.COINMARKETCAP_HOST.toString()}/tools/price-conversion`, { headers: { 'X-CMC_PRO_API_KEY': apiKey, diff --git a/src/common/modules/escrow/escrow.service.ts b/src/common/modules/escrow/escrow.service.ts index 7fc5f72d..29f4df3a 100644 --- a/src/common/modules/escrow/escrow.service.ts +++ b/src/common/modules/escrow/escrow.service.ts @@ -4,8 +4,8 @@ import { EthereumService, SubstrateService } from '../..'; import { setOrderPaid } from '@debionetwork/polkadot-provider'; import { ethers } from 'ethers'; import AsyncLock from 'async-lock'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { keyList } from '../../secrets'; +import { config } from 'src/config'; const lock = new AsyncLock(); const ESCROW_WALLET_LOCK_KEY = 'escrow-wallet-lock'; @@ -14,7 +14,6 @@ let nonce = 0; @Injectable() export class EscrowService { constructor( - private readonly gCloudSecretManagerService: GCloudSecretManagerService, private readonly substrateService: SubstrateService, private readonly ethereumService: EthereumService, ) {} @@ -24,9 +23,7 @@ export class EscrowService { async onModuleInit(): Promise { this.provider = await this.ethereumService.getEthersProvider(); this.escrowWallet = await new ethers.Wallet( - this.gCloudSecretManagerService - .getSecret('DEBIO_ESCROW_PRIVATE_KEY') - .toString(), + config.DEBIO_ESCROW_PRIVATE_KEY.toString(), this.provider, ); } @@ -138,9 +135,7 @@ export class EscrowService { const tokenAmount = ethers.utils.parseUnits(String(amount), 18); const tokenContract = this.ethereumService.getContract(); const wallet: WalletSigner = await this.ethereumService.createWallet( - this.gCloudSecretManagerService - .getSecret('DEBIO_ESCROW_PRIVATE_KEY') - .toString(), + config.DEBIO_ESCROW_PRIVATE_KEY.toString(), ); const tokenContractWithSigner = tokenContract.connect(wallet); const options = { diff --git a/src/common/modules/ethereum/ethereum.service.ts b/src/common/modules/ethereum/ethereum.service.ts index c5b757e3..f9fe2203 100644 --- a/src/common/modules/ethereum/ethereum.service.ts +++ b/src/common/modules/ethereum/ethereum.service.ts @@ -9,13 +9,12 @@ import ABI from './utils/ABI.json'; import escrowContract from './utils/Escrow.json'; import { ethers } from 'ethers'; import { CachesService } from '../caches'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { keyList } from '../../secrets'; +import { config } from 'src/config'; @Injectable() export class EthereumService { constructor( - private readonly gCloudSecretManagerService: GCloudSecretManagerService, private readonly ethersContract: EthersContract, private readonly ethersSigner: EthersSigner, private readonly cachesService: CachesService, @@ -38,7 +37,7 @@ export class EthereumService { getEthersProvider(): ethers.providers.JsonRpcProvider { const provider = new ethers.providers.JsonRpcProvider( - this.gCloudSecretManagerService.getSecret('WEB3_RPC_HTTPS').toString(), + config.WEB3_RPC_HTTPS.toString(), ); return provider; } @@ -46,9 +45,7 @@ export class EthereumService { getContract(): SmartContract { try { const contract: SmartContract = this.ethersContract.create( - this.gCloudSecretManagerService - .getSecret('ESCROW_CONTRACT_ADDRESS') - .toString(), + config.ESCROW_CONTRACT_ADDRESS.toString(), ABI, ); @@ -62,9 +59,7 @@ export class EthereumService { try { const provider = this.getEthersProvider(); const contract = new ethers.Contract( - this.gCloudSecretManagerService - .getSecret('ESCROW_CONTRACT_ADDRESS') - .toString(), + config.ESCROW_CONTRACT_ADDRESS.toString(), escrowContract.abi, provider, ); diff --git a/src/config.ts b/src/config.ts new file mode 100644 index 00000000..4f3aee57 --- /dev/null +++ b/src/config.ts @@ -0,0 +1,13 @@ +import dotenv from 'dotenv'; +dotenv.config(); + +export const config = { + REDIS_HOST : process.env.HOST_REDIS ?? 'localhost', + REDIS_PORT : process.env.PORT_REDIS ?? '6379', + REDIS_PASSWORD : process.env.REDIS_PASSWORD ?? 'root', + COINMARKETCAP_API_KEY : process.env.API_KEY_COINMARKETCAP ?? '', + COINMARKETCAP_HOST : process.env.COINMARKETCAP_HOST ?? '', + DEBIO_ESCROW_PRIVATE_KEY : process.env.DEBIO_ESCROW_PRIVATE_KEY ?? '', + WEB3_RPC_HTTPS : process.env.WEB3_RPC_HTTPS ?? '', + ESCROW_CONTRACT_ADDRESS : process.env.ESCROW_CONTRACT_ADDRESS ?? '' , +}; From efebd68c3277638e4966cd509a4dbde8594f4349 Mon Sep 17 00:00:00 2001 From: RXRD Date: Fri, 16 Feb 2024 12:36:20 +0700 Subject: [PATCH 02/18] fix --- src/app.module.ts | 31 +++++-------------- .../elasticsearch.health/index.ts | 17 +++------- src/common/modules/mailer/mailer.manager.ts | 11 +++---- src/common/modules/mailer/mailer.module.ts | 11 +++---- src/config.ts | 9 ++++++ 5 files changed, 30 insertions(+), 49 deletions(-) diff --git a/src/app.module.ts b/src/app.module.ts index 0cf10ec0..062303d8 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -28,22 +28,17 @@ import { TransactionModule } from './endpoints/transaction/transaction.module'; import { SpecializationModule } from './endpoints/category/specialization/specialization.module'; import { NotificationEndpointModule } from './endpoints/notification-endpoint/notification-endpoint.module'; import { DnaCollectionModule } from './endpoints/category/dna-collection/dna-collection.module'; -import { - GCloudSecretManagerModule, - GCloudSecretManagerService, -} from '@debionetwork/nestjs-gcloud-secret-manager'; -import { keyList, SecretKeyList } from './common/secrets'; import { ConversionModule } from './endpoints/conversion/conversion.module'; import { PinataModule } from './endpoints/pinata/pinata.module'; import { MyriadModule } from './endpoints/myriad/myriad.module'; import { SecondOpinionModule } from './endpoints/second-opinion/second-opinion.module'; +import { config } from './config'; require('dotenv').config(); // eslint-disable-line @Module({ imports: [ ScheduleModule.forRoot(), - GCloudSecretManagerModule.withConfig(process.env.PARENT, SecretKeyList), TypeOrmModule.forRootAsync({ imports: [ ProcessEnvModule.setDefault({ @@ -52,23 +47,17 @@ require('dotenv').config(); // eslint-disable-line DB_POSTGRES: 'DB_POSTGRES', DB_LOCATIONS: 'DB_LOCATIONS', }), - GCloudSecretManagerModule.withConfig(process.env.PARENT, SecretKeyList), ], - inject: [ProcessEnvProxy, GCloudSecretManagerService], + inject: [ProcessEnvProxy], useFactory: async ( processEnvProxy: ProcessEnvProxy, - gCloudSecretManagerService: GCloudSecretManagerService, ) => { return { type: 'postgres', host: processEnvProxy.env.HOST_POSTGRES, port: 5432, - username: gCloudSecretManagerService - .getSecret('POSTGRES_USERNAME') - .toString(), - password: gCloudSecretManagerService - .getSecret('POSTGRES_PASSWORD') - .toString(), + username: config.POSTGRES_USERNAME.toString(), + password: config.POSTGRES_PASSWORD.toString(), database: processEnvProxy.env.DB_POSTGRES, entities: [LabRating, TransactionRequest], autoLoadEntities: true, @@ -84,23 +73,17 @@ require('dotenv').config(); // eslint-disable-line DB_POSTGRES: 'DB_POSTGRES', DB_LOCATIONS: 'DB_LOCATIONS', }), - GCloudSecretManagerModule.withConfig(process.env.PARENT, SecretKeyList), ], - inject: [ProcessEnvProxy, GCloudSecretManagerService], + inject: [ProcessEnvProxy], useFactory: async ( processEnvProxy: ProcessEnvProxy, - gCloudSecretManagerService: GCloudSecretManagerService, ) => { return { type: 'postgres', host: processEnvProxy.env.HOST_POSTGRES, port: 5432, - username: gCloudSecretManagerService - .getSecret('POSTGRES_USERNAME') - .toString(), - password: gCloudSecretManagerService - .getSecret('POSTGRES_PASSWORD') - .toString(), + username: config.POSTGRES_USERNAME.toString(), + password: config.POSTGRES_PASSWORD.toString(), database: processEnvProxy.env.DB_LOCATIONS, entities: [...LocationEntities], autoLoadEntities: true, diff --git a/src/common/modules/health-indicators/elasticsearch.health/index.ts b/src/common/modules/health-indicators/elasticsearch.health/index.ts index e111c360..9a365126 100644 --- a/src/common/modules/health-indicators/elasticsearch.health/index.ts +++ b/src/common/modules/health-indicators/elasticsearch.health/index.ts @@ -1,29 +1,22 @@ -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { Module } from '@nestjs/common'; import { ElasticsearchModule } from '@nestjs/elasticsearch'; import { TerminusModule } from '@nestjs/terminus'; import { ElasticsearchHealthIndicator } from './elasticsearch.health.indicator'; import { keyList } from '../../../secrets'; +import { config } from 'src/config'; @Module({ imports: [ TerminusModule, ElasticsearchModule.registerAsync({ - inject: [GCloudSecretManagerService], + inject: [], useFactory: async ( - gCloudSecretManagerService: GCloudSecretManagerService, ) => { return { - node: gCloudSecretManagerService - .getSecret('ELASTICSEARCH_NODE') - .toString(), + node: config.ELASTICSEARCH_NODE.toString(), auth: { - username: gCloudSecretManagerService - .getSecret('ELASTICSEARCH_USERNAME') - .toString(), - password: gCloudSecretManagerService - .getSecret('ELASTICSEARCH_PASSWORD') - .toString(), + username: config.ELASTICSEARCH_USERNAME.toString(), + password: config.ELASTICSEARCH_PASSWORD.toString(), }, }; }, diff --git a/src/common/modules/mailer/mailer.manager.ts b/src/common/modules/mailer/mailer.manager.ts index c3d3bd7a..adabdce6 100644 --- a/src/common/modules/mailer/mailer.manager.ts +++ b/src/common/modules/mailer/mailer.manager.ts @@ -1,4 +1,3 @@ -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { MailerService } from '@nestjs-modules/mailer'; import { Injectable, Logger } from '@nestjs/common'; import { @@ -8,13 +7,13 @@ import { } from './models'; import { keyList } from '../../secrets'; import { HealthProfessionalRegister } from './models/health-professional.model'; +import { config } from 'src/config'; @Injectable() export class MailerManager { private readonly _logger: Logger = new Logger(MailerManager.name); constructor( private readonly mailerService: MailerService, - private readonly gCloudSecretManagerService: GCloudSecretManagerService, ) {} async sendCustomerStakingRequestServiceEmail( @@ -23,7 +22,7 @@ export class MailerManager { ) { let subject = `New Service Request - ${context.service_name} - ${context.city}, ${context.state}, ${context.country}`; if ( - this.gCloudSecretManagerService.getSecret('POSTGRES_HOST') == 'localhost' + config.POSTGRES_HOST == 'localhost' ) { subject = `Testing New Service Request Email`; } @@ -41,7 +40,7 @@ export class MailerManager { ) { let subject = `New Genetic Analyst Register – ${context.genetic_analyst_name}`; if ( - this.gCloudSecretManagerService.getSecret('POSTGRES_HOST') == 'localhost' + config.POSTGRES_HOST == 'localhost' ) { subject = `Testing New Genetic Analyst Register Email`; } @@ -80,7 +79,7 @@ export class MailerManager { async sendLabRegistrationEmail(to: string | string[], context: LabRegister) { let subject = `New Lab Register – ${context.lab_name} - ${context.city}, ${context.state}, ${context.country}`; if ( - this.gCloudSecretManagerService.getSecret('POSTGRES_HOST') == 'localhost' + config.POSTGRES_HOST == 'localhost' ) { subject = `Testing New Lab Register Email`; } @@ -129,7 +128,7 @@ export class MailerManager { ) { let subject = `New Health Professinal Register – ${context.health_professional_name}`; if ( - this.gCloudSecretManagerService.getSecret('POSTGRES_HOST') == 'localhost' + config.POSTGRES_HOST == 'localhost' ) { subject = `Testing New Lab Register Email`; } diff --git a/src/common/modules/mailer/mailer.module.ts b/src/common/modules/mailer/mailer.module.ts index 90bce1d1..8450f802 100644 --- a/src/common/modules/mailer/mailer.module.ts +++ b/src/common/modules/mailer/mailer.module.ts @@ -1,27 +1,24 @@ -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { MailerModule } from '@nestjs-modules/mailer'; import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handlebars.adapter'; import { Module } from '@nestjs/common'; import { join } from 'path'; import { MailerManager } from './mailer.manager'; import { keyList } from '../../secrets'; +import { config } from 'src/config'; @Module({ imports: [ MailerModule.forRootAsync({ - inject: [GCloudSecretManagerService], + inject: [], useFactory: async ( - gCloudSecretManagerService: GCloudSecretManagerService, ) => { return { transport: { host: 'smtp.gmail.com', secure: false, auth: { - user: gCloudSecretManagerService.getSecret('EMAIL').toString(), - pass: gCloudSecretManagerService - .getSecret('PASS_EMAIL') - .toString(), + user: config.EMAIL.toString(), + pass: config.PASS_EMAIL.toString(), }, }, template: { diff --git a/src/config.ts b/src/config.ts index 4f3aee57..be7be638 100644 --- a/src/config.ts +++ b/src/config.ts @@ -10,4 +10,13 @@ export const config = { DEBIO_ESCROW_PRIVATE_KEY : process.env.DEBIO_ESCROW_PRIVATE_KEY ?? '', WEB3_RPC_HTTPS : process.env.WEB3_RPC_HTTPS ?? '', ESCROW_CONTRACT_ADDRESS : process.env.ESCROW_CONTRACT_ADDRESS ?? '' , + ELASTICSEARCH_NODE : process.env.ELASTICSEARCH_NODE ?? '', + ELASTICSEARCH_USERNAME : process.env.ELASTICSEARCH_USERNAME ?? '', + ELASTICSEARCH_PASSWORD : process.env.ELASTICSEARCH_PASSWORD ?? '', + POSTGRES_HOST : process.env.HOST_POSTGRES ?? 'localhost', + POSTGRES_USERNAME : process.env.USERNAME_POSTGRES ?? '', + POSTGRES_PASSWORD : process.env.POSTGRES_PASSWORD ?? '', + EMAIL : process.env.EMAIL ?? '', + PASS_EMAIL : process.env.PASS_EMAIL ?? '', + }; From edec33069ccc9dffdbdef49cf50f9135c11c48ac Mon Sep 17 00:00:00 2001 From: RXRD Date: Fri, 16 Feb 2024 12:47:58 +0700 Subject: [PATCH 03/18] fix --- .../modules/substrate/substrate.service.ts | 9 +++------ src/config.ts | 5 +++++ src/endpoints/bounty/bounty.module.ts | 14 ++++---------- .../cloud-storage/cloud-storage.module.ts | 13 ++++--------- src/endpoints/email/email.controller.ts | 18 ++++-------------- .../substrate-endpoint.module.ts | 17 +++++------------ .../transaction/transaction.module.ts | 17 +++++------------ 7 files changed, 30 insertions(+), 63 deletions(-) diff --git a/src/common/modules/substrate/substrate.service.ts b/src/common/modules/substrate/substrate.service.ts index b3f4e1ec..d75a1caf 100644 --- a/src/common/modules/substrate/substrate.service.ts +++ b/src/common/modules/substrate/substrate.service.ts @@ -1,8 +1,8 @@ import { ApiPromise, Keyring, WsProvider } from '@polkadot/api'; import { Injectable, OnModuleInit, Logger } from '@nestjs/common'; import { waitReady } from '@polkadot/wasm-crypto'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { keyList } from '../../secrets'; +import { config } from 'src/config'; @Injectable() export class SubstrateService implements OnModuleInit { @@ -13,7 +13,6 @@ export class SubstrateService implements OnModuleInit { private readonly _logger: Logger = new Logger(SubstrateService.name); constructor( - private readonly gCloudSecretManagerService: GCloudSecretManagerService, ) {} get api(): ApiPromise { @@ -26,16 +25,14 @@ export class SubstrateService implements OnModuleInit { async onModuleInit() { this._wsProvider = new WsProvider( - this.gCloudSecretManagerService.getSecret('SUBSTRATE_URL').toString(), + config.SUBSTRATE_URL.toString(), ); const keyring = new Keyring({ type: 'sr25519' }); await waitReady(); this._pair = await keyring.addFromUri( - this.gCloudSecretManagerService - .getSecret('ADMIN_SUBSTRATE_MNEMONIC') - .toString(), + config.ADMIN_SUBSTRATE_MNEMONIC.toString(), ); await this.startListen(); diff --git a/src/config.ts b/src/config.ts index be7be638..f45cb826 100644 --- a/src/config.ts +++ b/src/config.ts @@ -18,5 +18,10 @@ export const config = { POSTGRES_PASSWORD : process.env.POSTGRES_PASSWORD ?? '', EMAIL : process.env.EMAIL ?? '', PASS_EMAIL : process.env.PASS_EMAIL ?? '', + EMAILS : process.env.EMAILS ?? '', + SUBSTRATE_URL : process.env.SUBSTRATE_URL ?? '', + ADMIN_SUBSTRATE_MNEMONIC : process.env.ADMIN_SUBSTRATE_MNEMONIC ?? '', + BUCKET_NAME : process.env.BUCKET_NAME ?? '', + STORAGE_BASE_URI : process.env.STORAGE_BASE_URI ?? '', }; diff --git a/src/endpoints/bounty/bounty.module.ts b/src/endpoints/bounty/bounty.module.ts index 0426bd45..587f3bca 100644 --- a/src/endpoints/bounty/bounty.module.ts +++ b/src/endpoints/bounty/bounty.module.ts @@ -5,22 +5,16 @@ import { DataStakingEvents } from './models/data-staking-events.entity'; import { DateTimeModule } from '../../common'; import { DataTokenToDatasetMapping } from './models/data-token-to-dataset-mapping.entity'; import { GCloudStorageModule } from '@debionetwork/nestjs-gcloud-storage'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; -import { keyList } from '../../common/secrets'; +import { config } from 'src/config'; @Module({ imports: [ GCloudStorageModule.withConfigAsync({ - inject: [GCloudSecretManagerService], + inject: [], useFactory: async ( - gCloudSecretManagerService: GCloudSecretManagerService, ) => ({ - defaultBucketname: gCloudSecretManagerService - .getSecret('BUCKET_NAME') - .toString(), - storageBaseUri: gCloudSecretManagerService - .getSecret('STORAGE_BASE_URI') - .toString(), + defaultBucketname: config.BUCKET_NAME.toString(), + storageBaseUri: config.STORAGE_BASE_URI.toString(), predefinedAcl: 'private', }), }), diff --git a/src/endpoints/cloud-storage/cloud-storage.module.ts b/src/endpoints/cloud-storage/cloud-storage.module.ts index 0accbf27..2c096edb 100644 --- a/src/endpoints/cloud-storage/cloud-storage.module.ts +++ b/src/endpoints/cloud-storage/cloud-storage.module.ts @@ -2,23 +2,18 @@ import { Module } from '@nestjs/common'; import { GCloudStorageModule } from '@debionetwork/nestjs-gcloud-storage'; import { CloudStorageController } from './cloud-storage.controller'; import { DateTimeModule } from '../../common'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { keyList } from '../../common/secrets'; +import { config } from 'src/config'; @Module({ imports: [ GCloudStorageModule.withConfigAsync({ - inject: [GCloudSecretManagerService], + inject: [], useFactory: async ( - gCloudSecretManagerService: GCloudSecretManagerService, ) => { return { - defaultBucketname: gCloudSecretManagerService - .getSecret('BUCKET_NAME') - .toString(), - storageBaseUri: gCloudSecretManagerService - .getSecret('STORAGE_BASE_URI') - .toString(), + defaultBucketname: config.BUCKET_NAME.toString(), + storageBaseUri: config.STORAGE_BASE_URI.toString(), predefinedAcl: 'private', }; }, diff --git a/src/endpoints/email/email.controller.ts b/src/endpoints/email/email.controller.ts index 4636dde7..a7ac318c 100644 --- a/src/endpoints/email/email.controller.ts +++ b/src/endpoints/email/email.controller.ts @@ -17,14 +17,13 @@ import { queryGeneticAnalystByAccountId, queryLabById, } from '@debionetwork/polkadot-provider'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { keyList } from '../../common/secrets'; import { queryHealthProfessionalById } from '@common/modules/polkadot-provider/query/health-professional'; +import { config } from 'src/config'; @Controller('email') export class EmailEndpointController { constructor( - private readonly gCloudSecretManagerService: GCloudSecretManagerService, private readonly mailerManager: MailerManager, private readonly substrateService: SubstrateService, private readonly emailNotificationService: EmailNotificationService, @@ -62,10 +61,7 @@ export class EmailEndpointController { ); const sentEMail = await this.mailerManager.sendLabRegistrationEmail( - this.gCloudSecretManagerService - .getSecret('EMAILS') - .toString() - .split(','), + config.EMAILS.toString().split(','), labRegister, ); @@ -119,10 +115,7 @@ export class EmailEndpointController { const sentEMail = await this.mailerManager.sendGeneticAnalystRegistrationEmail( - this.gCloudSecretManagerService - .getSecret('EMAILS') - .toString() - .split(','), + config.EMAILS.toString().split(','), geneticAnalystRegister, ); @@ -175,10 +168,7 @@ export class EmailEndpointController { ); const sentEMail = await this.mailerManager.sendHealthProfessionalEmail( - this.gCloudSecretManagerService - .getSecret('EMAILS') - .toString() - .split(','), + config.EMAILS.toString().split(','), healthProfessionalRegister, ); diff --git a/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts b/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts index 295e5695..004e2c1d 100644 --- a/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts +++ b/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts @@ -14,31 +14,24 @@ import { ServiceRequestService } from './services/service-request.service'; import { LocationModule } from '../location/location.module'; import { GeneticAnalysisService } from './services/genetic-analysis.service'; import { GeneticAnalysisOrderService } from './services/genetic-analysis-order.service'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { keyList } from '../../common/secrets'; import { MenstrualCalendarService } from './services/menstrual-calendar.service'; import { MenstrualSubscriptionService } from './services/menstrual-subscription.service'; +import { config } from 'src/config'; @Module({ imports: [ LocationModule, DebioConversionModule, ElasticsearchModule.registerAsync({ - inject: [GCloudSecretManagerService], + inject: [], useFactory: async ( - gCloudSecretManagerService: GCloudSecretManagerService, ) => { return { - node: gCloudSecretManagerService - .getSecret('ELASTICSEARCH_NODE') - .toString(), + node: config.ELASTICSEARCH_NODE.toString(), auth: { - username: gCloudSecretManagerService - .getSecret('ELASTICSEARCH_USERNAME') - .toString(), - password: gCloudSecretManagerService - .getSecret('ELASTICSEARCH_PASSWORD') - .toString(), + username: config.ELASTICSEARCH_USERNAME.toString(), + password: config.ELASTICSEARCH_PASSWORD.toString(), }, }; }, diff --git a/src/endpoints/transaction/transaction.module.ts b/src/endpoints/transaction/transaction.module.ts index a29bf408..101f40b6 100644 --- a/src/endpoints/transaction/transaction.module.ts +++ b/src/endpoints/transaction/transaction.module.ts @@ -1,30 +1,23 @@ -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { Module } from '@nestjs/common'; import { ElasticsearchModule } from '@nestjs/elasticsearch'; import { keyList } from '../../common/secrets'; import { TransactionLoggingModule } from '../../common'; import { TransactionController } from './transaction.controller'; import { TransactionService } from './transaction.service'; +import { config } from 'src/config'; @Module({ imports: [ TransactionLoggingModule, ElasticsearchModule.registerAsync({ - inject: [GCloudSecretManagerService], + inject: [], useFactory: async ( - gCloudSecretManagerService: GCloudSecretManagerService, ) => { return { - node: gCloudSecretManagerService - .getSecret('ELASTICSEARCH_NODE') - .toString(), + node: config.ELASTICSEARCH_NODE.toString(), auth: { - username: gCloudSecretManagerService - .getSecret('ELASTICSEARCH_USERNAME') - .toString(), - password: gCloudSecretManagerService - .getSecret('ELASTICSEARCH_PASSWORD') - .toString(), + username: config.ELASTICSEARCH_USERNAME.toString(), + password: config.ELASTICSEARCH_PASSWORD.toString(), }, }; }, From 446da405ae78538891d8641ed86c989e0f9bd07c Mon Sep 17 00:00:00 2001 From: RXRD Date: Fri, 16 Feb 2024 13:03:17 +0700 Subject: [PATCH 04/18] fix --- src/config.ts | 7 ++++++ src/endpoints/conversion/conversion.module.ts | 12 ++++------ src/endpoints/myriad/myriad.module.ts | 11 ++++----- src/endpoints/myriad/myriad.service.ts | 23 +++++-------------- src/endpoints/pinata/pinata.service.ts | 11 ++++----- .../recaptcha/recaptcha.controller.ts | 8 ++----- .../second-opinion/second-opinion.module.ts | 12 ++++------ .../substrate-endpoint.controller.ts | 7 +++--- .../verification/verification.controller.ts | 9 ++++---- .../verification/verification.module.ts | 12 ++++------ 10 files changed, 46 insertions(+), 66 deletions(-) diff --git a/src/config.ts b/src/config.ts index f45cb826..6b8db76f 100644 --- a/src/config.ts +++ b/src/config.ts @@ -2,6 +2,8 @@ import dotenv from 'dotenv'; dotenv.config(); export const config = { + DEBIO_API_KEY: process.env.DEBIO_API_KEY ?? '', + RECAPTCHA_SECRET_KEY : process.env.RECAPTCHA_SECRET_KEY ?? '', REDIS_HOST : process.env.HOST_REDIS ?? 'localhost', REDIS_PORT : process.env.PORT_REDIS ?? '6379', REDIS_PASSWORD : process.env.REDIS_PASSWORD ?? 'root', @@ -23,5 +25,10 @@ export const config = { ADMIN_SUBSTRATE_MNEMONIC : process.env.ADMIN_SUBSTRATE_MNEMONIC ?? '', BUCKET_NAME : process.env.BUCKET_NAME ?? '', STORAGE_BASE_URI : process.env.STORAGE_BASE_URI ?? '', + MYRIAD_API_URL : process.env.MYRIAD_API_URL ?? '', + MYRIAD_ADMIN_USERNAME : process.env.MYRIAD_ADMIN_USERNAME ?? '', + MYRIAD_PHYSICAL_HEALTH_TIMELINE_ID : process.env.PHYSICAL_HEALTH_EXPERIENCE_ID ?? '', + MYRIAD_MENTAL_HEALTH_TIMELINE_ID : process.env.MENTAL_HEALTH_EXPERIENCE_ID ?? '', + PINATA_JWT : process.env.PINATA_SECRET_KEY ?? '' }; diff --git a/src/endpoints/conversion/conversion.module.ts b/src/endpoints/conversion/conversion.module.ts index 4efa9152..4becb93d 100644 --- a/src/endpoints/conversion/conversion.module.ts +++ b/src/endpoints/conversion/conversion.module.ts @@ -1,23 +1,21 @@ -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { HttpModule } from '@nestjs/axios'; import { CacheModule, Module } from '@nestjs/common'; import * as redisStore from 'cache-manager-redis-store'; import { DebioConversionModule } from 'src/common'; -import { keyList } from '../../common/secrets'; import { CacheController } from './conversion.controller'; +import { config } from 'src/config'; @Module({ imports: [ CacheModule.registerAsync({ - inject: [GCloudSecretManagerService], + inject: [], useFactory: async ( - gCloudSecretManagerService: GCloudSecretManagerService, ) => { return { store: redisStore, - host: gCloudSecretManagerService.getSecret('REDIS_HOST'), - port: gCloudSecretManagerService.getSecret('REDIS_PORT'), - auth_pass: gCloudSecretManagerService.getSecret('REDIS_PASSWORD'), + host: config.REDIS_HOST, + port: config.REDIS_PORT, + auth_pass: config.REDIS_PASSWORD, ttl: 2 * 60 * 60, }; }, diff --git a/src/endpoints/myriad/myriad.module.ts b/src/endpoints/myriad/myriad.module.ts index 52a7f096..0c565d84 100644 --- a/src/endpoints/myriad/myriad.module.ts +++ b/src/endpoints/myriad/myriad.module.ts @@ -1,24 +1,23 @@ import { keyList } from '@common/secrets'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { CacheModule, Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { MyriadAccount } from './models/myriad-account.entity'; import { MyriadController } from './myriad.controller'; import { MyriadService } from './myriad.service'; import * as redisStore from 'cache-manager-redis-store'; +import { config } from 'src/config'; @Module({ imports: [ CacheModule.registerAsync({ - inject: [GCloudSecretManagerService], + inject: [], useFactory: async ( - gCloudSecretManagerService: GCloudSecretManagerService, ) => { return { store: redisStore, - host: gCloudSecretManagerService.getSecret('REDIS_HOST'), - port: gCloudSecretManagerService.getSecret('REDIS_PORT'), - auth_pass: gCloudSecretManagerService.getSecret('REDIS_PASSWORD'), + host: config.REDIS_HOST, + port: config.REDIS_PORT, + auth_pass: config.REDIS_PASSWORD, ttl: 2 * 60 * 60, }; }, diff --git a/src/endpoints/myriad/myriad.service.ts b/src/endpoints/myriad/myriad.service.ts index 23e1b7e9..23868cd6 100644 --- a/src/endpoints/myriad/myriad.service.ts +++ b/src/endpoints/myriad/myriad.service.ts @@ -1,5 +1,4 @@ import { keyList } from '@common/secrets'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { CACHE_MANAGER, Inject, @@ -23,6 +22,7 @@ import { UserMyriadInterface } from './interface/user'; import { UsernameCheckInterface } from './interface/username-check'; import { MyriadAccount } from './models/myriad-account.entity'; import { Cache } from 'cache-manager'; +import { config } from 'src/config'; @Injectable() export class MyriadService { @@ -32,12 +32,9 @@ export class MyriadService { constructor( @InjectRepository(MyriadAccount) private readonly myriadAccountRepository: Repository, - private readonly gCloudSecretManagerService: GCloudSecretManagerService, @Inject(CACHE_MANAGER) private readonly cacheManager: Cache, ) { - this.myriadEndPoints = this.gCloudSecretManagerService - .getSecret('MYRIAD_API_URL') - .toString(); + this.myriadEndPoints = config.MYRIAD_API_URL.toString(); } public async checkUsernameMyriad(username: string): Promise { @@ -68,9 +65,7 @@ export class MyriadService { const user = await this.myriadAccountRepository.findOne({ select: ['username', 'jwt_token'], where: { - username: this.gCloudSecretManagerService - .getSecret('MYRIAD_ADMIN_USERNAME') - .toString(), + username: config.MYRIAD_ADMIN_USERNAME.toString(), }, }); @@ -583,9 +578,7 @@ export class MyriadService { const user = await this.myriadAccountRepository.findOne({ select: ['username', 'jwt_token'], where: { - username: this.gCloudSecretManagerService - .getSecret('MYRIAD_ADMIN_USERNAME') - .toString(), + username: config.MYRIAD_ADMIN_USERNAME.toString(), }, }); @@ -616,13 +609,9 @@ export class MyriadService { private getExperienceIdAdmin(type: string): string { if (type === E_PostType.PHYSICAL_HEALTH) { - return this.gCloudSecretManagerService - .getSecret('MYRIAD_PHYSICAL_HEALTH_TIMELINE_ID') - .toString(); + return config.MYRIAD_PHYSICAL_HEALTH_TIMELINE_ID.toString(); } else if (type === E_PostType.MENTAL_HEALTH) { - return this.gCloudSecretManagerService - .getSecret('MYRIAD_MENTAL_HEALTH_TIMELINE_ID') - .toString(); + return config.MYRIAD_MENTAL_HEALTH_TIMELINE_ID.toString(); } else { throw new HttpException( { diff --git a/src/endpoints/pinata/pinata.service.ts b/src/endpoints/pinata/pinata.service.ts index 9b3fd19d..373e8e8b 100644 --- a/src/endpoints/pinata/pinata.service.ts +++ b/src/endpoints/pinata/pinata.service.ts @@ -1,14 +1,13 @@ import { Injectable } from '@nestjs/common'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { keyList } from '../../common/secrets'; import axios from 'axios'; import { AxiosRequestConfig } from 'axios'; import FormData from 'form-data'; +import { config } from 'src/config'; @Injectable() export class PinataService { constructor( - private readonly gCloudSecretManagerService: GCloudSecretManagerService, ) {} async uploadToPinata(file: Express.Multer.File) { const options = { @@ -30,19 +29,17 @@ export class PinataService { data.append('pinataMetadata', JSON.stringify(options.pinataMetadata)); data.append('pinataOptions', JSON.stringify(options.pinataOptions)); - const config: AxiosRequestConfig = { + const configuration: AxiosRequestConfig = { method: 'POST', url: 'https://api.pinata.cloud/pinning/pinFileToIPFS', headers: { - Authorization: this.gCloudSecretManagerService - .getSecret('PINATA_JWT') - .toString(), + Authorization: config.PINATA_JWT.toString(), ...data.getHeaders(), }, data: data, }; - const res = await axios(config); + const res = await axios(configuration); return res; } diff --git a/src/endpoints/recaptcha/recaptcha.controller.ts b/src/endpoints/recaptcha/recaptcha.controller.ts index 188a54da..14f0b456 100644 --- a/src/endpoints/recaptcha/recaptcha.controller.ts +++ b/src/endpoints/recaptcha/recaptcha.controller.ts @@ -1,15 +1,13 @@ -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { Body, Controller, Post, Res, UseInterceptors } from '@nestjs/common'; import axios from 'axios'; import { Response } from 'express'; -import { keyList } from '../../common/secrets'; import { SentryInterceptor } from '../../common/interceptors'; +import { config } from 'src/config'; @UseInterceptors(SentryInterceptor) @Controller('recaptcha') export class RecaptchaController { constructor( - private readonly gCloudSecretManagerService: GCloudSecretManagerService, ) {} @Post() @@ -17,9 +15,7 @@ export class RecaptchaController { const result = await axios.post( 'https://www.google.com/recaptcha/api/siteverify' + '?secret=' + - this.gCloudSecretManagerService - .getSecret('RECAPTCHA_SECRET_KEY') - .toString() + + config.RECAPTCHA_SECRET_KEY.toString() + '&response=' + payload.response, ); diff --git a/src/endpoints/second-opinion/second-opinion.module.ts b/src/endpoints/second-opinion/second-opinion.module.ts index 820ad15a..6fb5aa05 100644 --- a/src/endpoints/second-opinion/second-opinion.module.ts +++ b/src/endpoints/second-opinion/second-opinion.module.ts @@ -1,5 +1,3 @@ -import { keyList } from '@common/secrets'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { CacheModule, Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { HealthProfessionalRole } from './models/health-professional-role.entity'; @@ -7,19 +5,19 @@ import { HealthProfessionalSpecialization } from './models/health-professional-s import { SecondOpinionController } from './second-opinion.controller'; import { SecondOpinionService } from './second-opinion.service'; import * as redisStore from 'cache-manager-redis-store'; +import { config } from 'src/config'; @Module({ imports: [ CacheModule.registerAsync({ - inject: [GCloudSecretManagerService], + inject: [], useFactory: async ( - gCloudSecretManagerService: GCloudSecretManagerService, ) => { return { store: redisStore, - host: gCloudSecretManagerService.getSecret('REDIS_HOST'), - port: gCloudSecretManagerService.getSecret('REDIS_PORT'), - auth_pass: gCloudSecretManagerService.getSecret('REDIS_PASSWORD'), + host: config.REDIS_HOST, + port: config.REDIS_PORT, + auth_pass: config.REDIS_PASSWORD, ttl: 2 * 60 * 60, }; }, diff --git a/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts b/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts index 6a1f8d31..3cf05375 100644 --- a/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts +++ b/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts @@ -39,9 +39,9 @@ import { geneticAnalysisByTrakingIdResponse, geneticAnalysisOrderByGA, } from './models/response'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { keyList } from '../../common/secrets'; import { MenstrualSubscriptionService } from './services/menstrual-subscription.service'; +import { config } from 'src/config'; @Controller('substrate') @UseInterceptors(SentryInterceptor) @@ -51,7 +51,6 @@ export class SubstrateController { private readonly labService: LabService, private readonly serviceService: ServiceService, private readonly orderService: OrderService, - private readonly gCloudSecretManagerService: GCloudSecretManagerService, private readonly serviceRequestService: ServiceRequestService, private readonly geneticAnalysisService: GeneticAnalysisService, private readonly geneticAnalysisOrderService: GeneticAnalysisOrderService, @@ -407,7 +406,7 @@ export class SubstrateController { ) { if ( debioApiKey !== - this.gCloudSecretManagerService.getSecret('DEBIO_API_KEY').toString() + config.DEBIO_API_KEY.toString() ) { return response.status(401).send('debio-api-key header is required'); } @@ -444,7 +443,7 @@ export class SubstrateController { if ( debioApiKey != - this.gCloudSecretManagerService.getSecret('DEBIO_API_KEY').toString() + config.DEBIO_API_KEY.toString() ) { return response.status(401).send('debio-api-key header is required'); } diff --git a/src/endpoints/verification/verification.controller.ts b/src/endpoints/verification/verification.controller.ts index 50fbe5dc..3b653c24 100644 --- a/src/endpoints/verification/verification.controller.ts +++ b/src/endpoints/verification/verification.controller.ts @@ -1,4 +1,3 @@ -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { Body, Controller, @@ -16,12 +15,12 @@ import { SentryInterceptor } from '../../common'; import { VerificationService } from './verification.service'; import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives'; import { HealthProfessionalRegisterDTO } from './dto/health-professional.dto'; +import { config } from 'src/config'; @UseInterceptors(SentryInterceptor) @Controller('verification') export class VerificationController { constructor( - private readonly gCloudSecretManagerService: GCloudSecretManagerService, private readonly verificationService: VerificationService, ) {} @@ -41,7 +40,7 @@ export class VerificationController { try { if ( debioApiKey != - this.gCloudSecretManagerService.getSecret('DEBIO_API_KEY').toString() + config.DEBIO_API_KEY.toString() ) { return response.status(401).send('debio-api-key header is required'); } @@ -77,7 +76,7 @@ export class VerificationController { try { if ( debioApiKey != - this.gCloudSecretManagerService.getSecret('DEBIO_API_KEY').toString() + config.DEBIO_API_KEY.toString() ) { return response.status(401).send('debio-api-key header is required'); } @@ -104,7 +103,7 @@ export class VerificationController { ) { if ( debioApiKey != - this.gCloudSecretManagerService.getSecret('DEBIO_API_KEY').toString() + config.DEBIO_API_KEY.toString() ) { throw new HttpException( { diff --git a/src/endpoints/verification/verification.module.ts b/src/endpoints/verification/verification.module.ts index 538c52a4..bd847d75 100644 --- a/src/endpoints/verification/verification.module.ts +++ b/src/endpoints/verification/verification.module.ts @@ -7,22 +7,20 @@ import { VerificationService } from './verification.service'; import { TypeOrmModule } from '@nestjs/typeorm'; import { MyriadAccount } from '@endpoints/myriad/models/myriad-account.entity'; import * as redisStore from 'cache-manager-redis-store'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; -import { keyList } from '@common/secrets'; import { MyriadModule } from '@endpoints/myriad/myriad.module'; +import { config } from 'src/config'; @Module({ imports: [ CacheModule.registerAsync({ - inject: [GCloudSecretManagerService], + inject: [], useFactory: async ( - gCloudSecretManagerService: GCloudSecretManagerService, ) => { return { store: redisStore, - host: gCloudSecretManagerService.getSecret('REDIS_HOST'), - port: gCloudSecretManagerService.getSecret('REDIS_PORT'), - auth_pass: gCloudSecretManagerService.getSecret('REDIS_PASSWORD'), + host: config.REDIS_HOST, + port: config.REDIS_PORT, + auth_pass: config.REDIS_PASSWORD, ttl: 2 * 60 * 60, }; }, From 0a028f6993da4ea2e3e5bed3d4db915b4645df3e Mon Sep 17 00:00:00 2001 From: RXRD Date: Mon, 19 Feb 2024 08:57:20 +0700 Subject: [PATCH 05/18] Update config.ts --- src/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.ts b/src/config.ts index 6b8db76f..7223a5cc 100644 --- a/src/config.ts +++ b/src/config.ts @@ -17,7 +17,7 @@ export const config = { ELASTICSEARCH_PASSWORD : process.env.ELASTICSEARCH_PASSWORD ?? '', POSTGRES_HOST : process.env.HOST_POSTGRES ?? 'localhost', POSTGRES_USERNAME : process.env.USERNAME_POSTGRES ?? '', - POSTGRES_PASSWORD : process.env.POSTGRES_PASSWORD ?? '', + POSTGRES_PASSWORD : process.env.PASSWORD_POSTGRES ?? '', EMAIL : process.env.EMAIL ?? '', PASS_EMAIL : process.env.PASS_EMAIL ?? '', EMAILS : process.env.EMAILS ?? '', From c407bd004b525e4f3284c517418a479bc80e94c3 Mon Sep 17 00:00:00 2001 From: RXRD Date: Mon, 19 Feb 2024 09:01:00 +0700 Subject: [PATCH 06/18] lint fix --- src/app.module.ts | 8 +-- src/common/modules/caches/index.ts | 3 +- .../debio-conversion.module.ts | 3 +- .../debio-conversion.service.ts | 10 ++-- .../elasticsearch.health/index.ts | 3 +- src/common/modules/mailer/mailer.manager.ts | 20 ++----- src/common/modules/mailer/mailer.module.ts | 3 +- .../modules/substrate/substrate.service.ts | 7 +-- src/config.ts | 59 ++++++++++--------- src/endpoints/bounty/bounty.module.ts | 3 +- .../cloud-storage/cloud-storage.module.ts | 3 +- src/endpoints/conversion/conversion.module.ts | 3 +- src/endpoints/myriad/myriad.module.ts | 3 +- src/endpoints/pinata/pinata.service.ts | 3 +- .../recaptcha/recaptcha.controller.ts | 3 +- .../second-opinion/second-opinion.module.ts | 3 +- .../substrate-endpoint.controller.ts | 10 +--- .../substrate-endpoint.module.ts | 3 +- .../transaction/transaction.module.ts | 3 +- .../verification/verification.controller.ts | 19 ++---- .../verification/verification.module.ts | 3 +- 21 files changed, 64 insertions(+), 111 deletions(-) diff --git a/src/app.module.ts b/src/app.module.ts index 062303d8..12810907 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -49,9 +49,7 @@ require('dotenv').config(); // eslint-disable-line }), ], inject: [ProcessEnvProxy], - useFactory: async ( - processEnvProxy: ProcessEnvProxy, - ) => { + useFactory: async (processEnvProxy: ProcessEnvProxy) => { return { type: 'postgres', host: processEnvProxy.env.HOST_POSTGRES, @@ -75,9 +73,7 @@ require('dotenv').config(); // eslint-disable-line }), ], inject: [ProcessEnvProxy], - useFactory: async ( - processEnvProxy: ProcessEnvProxy, - ) => { + useFactory: async (processEnvProxy: ProcessEnvProxy) => { return { type: 'postgres', host: processEnvProxy.env.HOST_POSTGRES, diff --git a/src/common/modules/caches/index.ts b/src/common/modules/caches/index.ts index 09c03a26..42f72ef2 100644 --- a/src/common/modules/caches/index.ts +++ b/src/common/modules/caches/index.ts @@ -8,8 +8,7 @@ import { config } from 'src/config'; imports: [ CacheModule.registerAsync({ inject: [], - useFactory: async ( - ) => { + useFactory: async () => { return { store: redisStore, host: config.REDIS_HOST.toString(), diff --git a/src/common/modules/debio-conversion/debio-conversion.module.ts b/src/common/modules/debio-conversion/debio-conversion.module.ts index 5589bc94..39f51166 100644 --- a/src/common/modules/debio-conversion/debio-conversion.module.ts +++ b/src/common/modules/debio-conversion/debio-conversion.module.ts @@ -8,8 +8,7 @@ import { config } from 'src/config'; imports: [ CacheModule.registerAsync({ inject: [], - useFactory: async ( - ) => { + useFactory: async () => { return { store: redisStore, host: config.REDIS_HOST.toString(), diff --git a/src/common/modules/debio-conversion/debio-conversion.service.ts b/src/common/modules/debio-conversion/debio-conversion.service.ts index bd02270e..833b9fc2 100644 --- a/src/common/modules/debio-conversion/debio-conversion.service.ts +++ b/src/common/modules/debio-conversion/debio-conversion.service.ts @@ -13,9 +13,7 @@ import { config } from 'src/config'; @Injectable() export class DebioConversionService { - constructor( - @Inject(CACHE_MANAGER) private readonly cacheManager: Cache, - ) {} + constructor(@Inject(CACHE_MANAGER) private readonly cacheManager: Cache) {} async getCacheExchange() { return this.cacheManager.get('exchange'); @@ -26,7 +24,8 @@ export class DebioConversionService { } async setCacheExchangeFromTo(from: string, to: string) { - const listApiKey: string[] = config.COINMARKETCAP_API_KEY.toString().split(','); + const listApiKey: string[] = + config.COINMARKETCAP_API_KEY.toString().split(','); const indexCurrentApiKey: number = await this.cacheManager.get( 'index_api_key', ); @@ -64,7 +63,8 @@ export class DebioConversionService { async setCacheExchange() { const sodaki = await this.getSodakiExchange(); - const listApiKey: string[] = config.COINMARKETCAP_API_KEY.toString().split(','); + const listApiKey: string[] = + config.COINMARKETCAP_API_KEY.toString().split(','); const indexCurrentApiKey: number = await this.cacheManager.get( 'index_api_key', ); diff --git a/src/common/modules/health-indicators/elasticsearch.health/index.ts b/src/common/modules/health-indicators/elasticsearch.health/index.ts index 9a365126..657ef9b0 100644 --- a/src/common/modules/health-indicators/elasticsearch.health/index.ts +++ b/src/common/modules/health-indicators/elasticsearch.health/index.ts @@ -10,8 +10,7 @@ import { config } from 'src/config'; TerminusModule, ElasticsearchModule.registerAsync({ inject: [], - useFactory: async ( - ) => { + useFactory: async () => { return { node: config.ELASTICSEARCH_NODE.toString(), auth: { diff --git a/src/common/modules/mailer/mailer.manager.ts b/src/common/modules/mailer/mailer.manager.ts index adabdce6..cac54c26 100644 --- a/src/common/modules/mailer/mailer.manager.ts +++ b/src/common/modules/mailer/mailer.manager.ts @@ -12,18 +12,14 @@ import { config } from 'src/config'; @Injectable() export class MailerManager { private readonly _logger: Logger = new Logger(MailerManager.name); - constructor( - private readonly mailerService: MailerService, - ) {} + constructor(private readonly mailerService: MailerService) {} async sendCustomerStakingRequestServiceEmail( to: string | string[], context: CustomerStakingRequestService, ) { let subject = `New Service Request - ${context.service_name} - ${context.city}, ${context.state}, ${context.country}`; - if ( - config.POSTGRES_HOST == 'localhost' - ) { + if (config.POSTGRES_HOST == 'localhost') { subject = `Testing New Service Request Email`; } this.mailerService.sendMail({ @@ -39,9 +35,7 @@ export class MailerManager { context: GeneticAnalystRegister, ) { let subject = `New Genetic Analyst Register – ${context.genetic_analyst_name}`; - if ( - config.POSTGRES_HOST == 'localhost' - ) { + if (config.POSTGRES_HOST == 'localhost') { subject = `Testing New Genetic Analyst Register Email`; } const files: any[] = []; @@ -78,9 +72,7 @@ export class MailerManager { async sendLabRegistrationEmail(to: string | string[], context: LabRegister) { let subject = `New Lab Register – ${context.lab_name} - ${context.city}, ${context.state}, ${context.country}`; - if ( - config.POSTGRES_HOST == 'localhost' - ) { + if (config.POSTGRES_HOST == 'localhost') { subject = `Testing New Lab Register Email`; } const files: any[] = []; @@ -127,9 +119,7 @@ export class MailerManager { context: HealthProfessionalRegister, ) { let subject = `New Health Professinal Register – ${context.health_professional_name}`; - if ( - config.POSTGRES_HOST == 'localhost' - ) { + if (config.POSTGRES_HOST == 'localhost') { subject = `Testing New Lab Register Email`; } const files: any[] = []; diff --git a/src/common/modules/mailer/mailer.module.ts b/src/common/modules/mailer/mailer.module.ts index 8450f802..ee7303c4 100644 --- a/src/common/modules/mailer/mailer.module.ts +++ b/src/common/modules/mailer/mailer.module.ts @@ -10,8 +10,7 @@ import { config } from 'src/config'; imports: [ MailerModule.forRootAsync({ inject: [], - useFactory: async ( - ) => { + useFactory: async () => { return { transport: { host: 'smtp.gmail.com', diff --git a/src/common/modules/substrate/substrate.service.ts b/src/common/modules/substrate/substrate.service.ts index d75a1caf..16c57066 100644 --- a/src/common/modules/substrate/substrate.service.ts +++ b/src/common/modules/substrate/substrate.service.ts @@ -12,8 +12,7 @@ export class SubstrateService implements OnModuleInit { private _listenStatus: boolean; private readonly _logger: Logger = new Logger(SubstrateService.name); - constructor( - ) {} + constructor() {} get api(): ApiPromise { return this._api; @@ -24,9 +23,7 @@ export class SubstrateService implements OnModuleInit { } async onModuleInit() { - this._wsProvider = new WsProvider( - config.SUBSTRATE_URL.toString(), - ); + this._wsProvider = new WsProvider(config.SUBSTRATE_URL.toString()); const keyring = new Keyring({ type: 'sr25519' }); await waitReady(); diff --git a/src/config.ts b/src/config.ts index 7223a5cc..84cd5379 100644 --- a/src/config.ts +++ b/src/config.ts @@ -2,33 +2,34 @@ import dotenv from 'dotenv'; dotenv.config(); export const config = { - DEBIO_API_KEY: process.env.DEBIO_API_KEY ?? '', - RECAPTCHA_SECRET_KEY : process.env.RECAPTCHA_SECRET_KEY ?? '', - REDIS_HOST : process.env.HOST_REDIS ?? 'localhost', - REDIS_PORT : process.env.PORT_REDIS ?? '6379', - REDIS_PASSWORD : process.env.REDIS_PASSWORD ?? 'root', - COINMARKETCAP_API_KEY : process.env.API_KEY_COINMARKETCAP ?? '', - COINMARKETCAP_HOST : process.env.COINMARKETCAP_HOST ?? '', - DEBIO_ESCROW_PRIVATE_KEY : process.env.DEBIO_ESCROW_PRIVATE_KEY ?? '', - WEB3_RPC_HTTPS : process.env.WEB3_RPC_HTTPS ?? '', - ESCROW_CONTRACT_ADDRESS : process.env.ESCROW_CONTRACT_ADDRESS ?? '' , - ELASTICSEARCH_NODE : process.env.ELASTICSEARCH_NODE ?? '', - ELASTICSEARCH_USERNAME : process.env.ELASTICSEARCH_USERNAME ?? '', - ELASTICSEARCH_PASSWORD : process.env.ELASTICSEARCH_PASSWORD ?? '', - POSTGRES_HOST : process.env.HOST_POSTGRES ?? 'localhost', - POSTGRES_USERNAME : process.env.USERNAME_POSTGRES ?? '', - POSTGRES_PASSWORD : process.env.PASSWORD_POSTGRES ?? '', - EMAIL : process.env.EMAIL ?? '', - PASS_EMAIL : process.env.PASS_EMAIL ?? '', - EMAILS : process.env.EMAILS ?? '', - SUBSTRATE_URL : process.env.SUBSTRATE_URL ?? '', - ADMIN_SUBSTRATE_MNEMONIC : process.env.ADMIN_SUBSTRATE_MNEMONIC ?? '', - BUCKET_NAME : process.env.BUCKET_NAME ?? '', - STORAGE_BASE_URI : process.env.STORAGE_BASE_URI ?? '', - MYRIAD_API_URL : process.env.MYRIAD_API_URL ?? '', - MYRIAD_ADMIN_USERNAME : process.env.MYRIAD_ADMIN_USERNAME ?? '', - MYRIAD_PHYSICAL_HEALTH_TIMELINE_ID : process.env.PHYSICAL_HEALTH_EXPERIENCE_ID ?? '', - MYRIAD_MENTAL_HEALTH_TIMELINE_ID : process.env.MENTAL_HEALTH_EXPERIENCE_ID ?? '', - PINATA_JWT : process.env.PINATA_SECRET_KEY ?? '' - + DEBIO_API_KEY: process.env.DEBIO_API_KEY ?? '', + RECAPTCHA_SECRET_KEY: process.env.RECAPTCHA_SECRET_KEY ?? '', + REDIS_HOST: process.env.HOST_REDIS ?? 'localhost', + REDIS_PORT: process.env.PORT_REDIS ?? '6379', + REDIS_PASSWORD: process.env.REDIS_PASSWORD ?? 'root', + COINMARKETCAP_API_KEY: process.env.API_KEY_COINMARKETCAP ?? '', + COINMARKETCAP_HOST: process.env.COINMARKETCAP_HOST ?? '', + DEBIO_ESCROW_PRIVATE_KEY: process.env.DEBIO_ESCROW_PRIVATE_KEY ?? '', + WEB3_RPC_HTTPS: process.env.WEB3_RPC_HTTPS ?? '', + ESCROW_CONTRACT_ADDRESS: process.env.ESCROW_CONTRACT_ADDRESS ?? '', + ELASTICSEARCH_NODE: process.env.ELASTICSEARCH_NODE ?? '', + ELASTICSEARCH_USERNAME: process.env.ELASTICSEARCH_USERNAME ?? '', + ELASTICSEARCH_PASSWORD: process.env.ELASTICSEARCH_PASSWORD ?? '', + POSTGRES_HOST: process.env.HOST_POSTGRES ?? 'localhost', + POSTGRES_USERNAME: process.env.USERNAME_POSTGRES ?? '', + POSTGRES_PASSWORD: process.env.PASSWORD_POSTGRES ?? '', + EMAIL: process.env.EMAIL ?? '', + PASS_EMAIL: process.env.PASS_EMAIL ?? '', + EMAILS: process.env.EMAILS ?? '', + SUBSTRATE_URL: process.env.SUBSTRATE_URL ?? '', + ADMIN_SUBSTRATE_MNEMONIC: process.env.ADMIN_SUBSTRATE_MNEMONIC ?? '', + BUCKET_NAME: process.env.BUCKET_NAME ?? '', + STORAGE_BASE_URI: process.env.STORAGE_BASE_URI ?? '', + MYRIAD_API_URL: process.env.MYRIAD_API_URL ?? '', + MYRIAD_ADMIN_USERNAME: process.env.MYRIAD_ADMIN_USERNAME ?? '', + MYRIAD_PHYSICAL_HEALTH_TIMELINE_ID: + process.env.PHYSICAL_HEALTH_EXPERIENCE_ID ?? '', + MYRIAD_MENTAL_HEALTH_TIMELINE_ID: + process.env.MENTAL_HEALTH_EXPERIENCE_ID ?? '', + PINATA_JWT: process.env.PINATA_SECRET_KEY ?? '', }; diff --git a/src/endpoints/bounty/bounty.module.ts b/src/endpoints/bounty/bounty.module.ts index 587f3bca..b7c07721 100644 --- a/src/endpoints/bounty/bounty.module.ts +++ b/src/endpoints/bounty/bounty.module.ts @@ -11,8 +11,7 @@ import { config } from 'src/config'; imports: [ GCloudStorageModule.withConfigAsync({ inject: [], - useFactory: async ( - ) => ({ + useFactory: async () => ({ defaultBucketname: config.BUCKET_NAME.toString(), storageBaseUri: config.STORAGE_BASE_URI.toString(), predefinedAcl: 'private', diff --git a/src/endpoints/cloud-storage/cloud-storage.module.ts b/src/endpoints/cloud-storage/cloud-storage.module.ts index 2c096edb..7ad056cb 100644 --- a/src/endpoints/cloud-storage/cloud-storage.module.ts +++ b/src/endpoints/cloud-storage/cloud-storage.module.ts @@ -9,8 +9,7 @@ import { config } from 'src/config'; imports: [ GCloudStorageModule.withConfigAsync({ inject: [], - useFactory: async ( - ) => { + useFactory: async () => { return { defaultBucketname: config.BUCKET_NAME.toString(), storageBaseUri: config.STORAGE_BASE_URI.toString(), diff --git a/src/endpoints/conversion/conversion.module.ts b/src/endpoints/conversion/conversion.module.ts index 4becb93d..4e1647f0 100644 --- a/src/endpoints/conversion/conversion.module.ts +++ b/src/endpoints/conversion/conversion.module.ts @@ -9,8 +9,7 @@ import { config } from 'src/config'; imports: [ CacheModule.registerAsync({ inject: [], - useFactory: async ( - ) => { + useFactory: async () => { return { store: redisStore, host: config.REDIS_HOST, diff --git a/src/endpoints/myriad/myriad.module.ts b/src/endpoints/myriad/myriad.module.ts index 0c565d84..4da1400e 100644 --- a/src/endpoints/myriad/myriad.module.ts +++ b/src/endpoints/myriad/myriad.module.ts @@ -11,8 +11,7 @@ import { config } from 'src/config'; imports: [ CacheModule.registerAsync({ inject: [], - useFactory: async ( - ) => { + useFactory: async () => { return { store: redisStore, host: config.REDIS_HOST, diff --git a/src/endpoints/pinata/pinata.service.ts b/src/endpoints/pinata/pinata.service.ts index 373e8e8b..b9cf1fff 100644 --- a/src/endpoints/pinata/pinata.service.ts +++ b/src/endpoints/pinata/pinata.service.ts @@ -7,8 +7,7 @@ import { config } from 'src/config'; @Injectable() export class PinataService { - constructor( - ) {} + constructor() {} async uploadToPinata(file: Express.Multer.File) { const options = { pinataMetadata: { diff --git a/src/endpoints/recaptcha/recaptcha.controller.ts b/src/endpoints/recaptcha/recaptcha.controller.ts index 14f0b456..44287e48 100644 --- a/src/endpoints/recaptcha/recaptcha.controller.ts +++ b/src/endpoints/recaptcha/recaptcha.controller.ts @@ -7,8 +7,7 @@ import { config } from 'src/config'; @UseInterceptors(SentryInterceptor) @Controller('recaptcha') export class RecaptchaController { - constructor( - ) {} + constructor() {} @Post() async recaptcha(@Body() payload: any, @Res() response: Response) { diff --git a/src/endpoints/second-opinion/second-opinion.module.ts b/src/endpoints/second-opinion/second-opinion.module.ts index 6fb5aa05..5230ac5e 100644 --- a/src/endpoints/second-opinion/second-opinion.module.ts +++ b/src/endpoints/second-opinion/second-opinion.module.ts @@ -11,8 +11,7 @@ import { config } from 'src/config'; imports: [ CacheModule.registerAsync({ inject: [], - useFactory: async ( - ) => { + useFactory: async () => { return { store: redisStore, host: config.REDIS_HOST, diff --git a/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts b/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts index 3cf05375..1063af11 100644 --- a/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts +++ b/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts @@ -404,10 +404,7 @@ export class SubstrateController { @Body() payload: WalletBindingDTO, @Res() response: Response, ) { - if ( - debioApiKey !== - config.DEBIO_API_KEY.toString() - ) { + if (debioApiKey !== config.DEBIO_API_KEY.toString()) { return response.status(401).send('debio-api-key header is required'); } const { accountId, ethAddress } = payload; @@ -441,10 +438,7 @@ export class SubstrateController { ) { const { genetic_analysis_order_id } = geneticOrderId; - if ( - debioApiKey != - config.DEBIO_API_KEY.toString() - ) { + if (debioApiKey != config.DEBIO_API_KEY.toString()) { return response.status(401).send('debio-api-key header is required'); } diff --git a/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts b/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts index 004e2c1d..b2b87032 100644 --- a/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts +++ b/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts @@ -25,8 +25,7 @@ import { config } from 'src/config'; DebioConversionModule, ElasticsearchModule.registerAsync({ inject: [], - useFactory: async ( - ) => { + useFactory: async () => { return { node: config.ELASTICSEARCH_NODE.toString(), auth: { diff --git a/src/endpoints/transaction/transaction.module.ts b/src/endpoints/transaction/transaction.module.ts index 101f40b6..af6bf1b3 100644 --- a/src/endpoints/transaction/transaction.module.ts +++ b/src/endpoints/transaction/transaction.module.ts @@ -11,8 +11,7 @@ import { config } from 'src/config'; TransactionLoggingModule, ElasticsearchModule.registerAsync({ inject: [], - useFactory: async ( - ) => { + useFactory: async () => { return { node: config.ELASTICSEARCH_NODE.toString(), auth: { diff --git a/src/endpoints/verification/verification.controller.ts b/src/endpoints/verification/verification.controller.ts index 3b653c24..f4ef7ed5 100644 --- a/src/endpoints/verification/verification.controller.ts +++ b/src/endpoints/verification/verification.controller.ts @@ -20,9 +20,7 @@ import { config } from 'src/config'; @UseInterceptors(SentryInterceptor) @Controller('verification') export class VerificationController { - constructor( - private readonly verificationService: VerificationService, - ) {} + constructor(private readonly verificationService: VerificationService) {} @Post('/lab') @ApiQuery({ name: 'account_id' }) @@ -38,10 +36,7 @@ export class VerificationController { @Query('verification_status') verification_status: string, ) { try { - if ( - debioApiKey != - config.DEBIO_API_KEY.toString() - ) { + if (debioApiKey != config.DEBIO_API_KEY.toString()) { return response.status(401).send('debio-api-key header is required'); } await this.verificationService.verificationLab( @@ -74,10 +69,7 @@ export class VerificationController { @Query('verification_status') verification_status: string, ) { try { - if ( - debioApiKey != - config.DEBIO_API_KEY.toString() - ) { + if (debioApiKey != config.DEBIO_API_KEY.toString()) { return response.status(401).send('debio-api-key header is required'); } await this.verificationService.verificationGeneticAnalyst( @@ -101,10 +93,7 @@ export class VerificationController { @Res() response: Response, @Body() data: HealthProfessionalRegisterDTO, ) { - if ( - debioApiKey != - config.DEBIO_API_KEY.toString() - ) { + if (debioApiKey != config.DEBIO_API_KEY.toString()) { throw new HttpException( { status: 401, diff --git a/src/endpoints/verification/verification.module.ts b/src/endpoints/verification/verification.module.ts index bd847d75..524b49ee 100644 --- a/src/endpoints/verification/verification.module.ts +++ b/src/endpoints/verification/verification.module.ts @@ -14,8 +14,7 @@ import { config } from 'src/config'; imports: [ CacheModule.registerAsync({ inject: [], - useFactory: async ( - ) => { + useFactory: async () => { return { store: redisStore, host: config.REDIS_HOST, From 2601d3e77af07b7f3936263a754eeb6558c57e80 Mon Sep 17 00:00:00 2001 From: RXRD Date: Mon, 19 Feb 2024 09:08:56 +0700 Subject: [PATCH 07/18] fix --- src/common/modules/caches/index.ts | 1 - src/common/modules/debio-conversion/debio-conversion.module.ts | 1 - .../modules/debio-conversion/debio-conversion.service.ts | 1 - src/common/modules/escrow/escrow.service.ts | 1 - src/common/modules/ethereum/ethereum.service.ts | 1 - .../modules/health-indicators/elasticsearch.health/index.ts | 1 - src/common/modules/mailer/mailer.manager.ts | 1 - src/common/modules/mailer/mailer.module.ts | 1 - src/common/modules/substrate/substrate.service.ts | 3 --- src/endpoints/cloud-storage/cloud-storage.module.ts | 1 - src/endpoints/email/email.controller.ts | 1 - src/endpoints/myriad/myriad.module.ts | 1 - src/endpoints/myriad/myriad.service.ts | 2 -- src/endpoints/pinata/pinata.service.ts | 2 -- src/endpoints/recaptcha/recaptcha.controller.ts | 1 - .../substrate-endpoint/substrate-endpoint.controller.ts | 1 - src/endpoints/substrate-endpoint/substrate-endpoint.module.ts | 1 - src/endpoints/transaction/transaction.module.ts | 1 - src/endpoints/verification/verification.controller.ts | 1 - 19 files changed, 23 deletions(-) diff --git a/src/common/modules/caches/index.ts b/src/common/modules/caches/index.ts index 42f72ef2..c6df8e9d 100644 --- a/src/common/modules/caches/index.ts +++ b/src/common/modules/caches/index.ts @@ -1,7 +1,6 @@ import { CacheModule, Module } from '@nestjs/common'; import { CachesService } from './caches.service'; import * as redisStore from 'cache-manager-redis-store'; -import { keyList } from '../../secrets'; import { config } from 'src/config'; @Module({ diff --git a/src/common/modules/debio-conversion/debio-conversion.module.ts b/src/common/modules/debio-conversion/debio-conversion.module.ts index 39f51166..fc73c520 100644 --- a/src/common/modules/debio-conversion/debio-conversion.module.ts +++ b/src/common/modules/debio-conversion/debio-conversion.module.ts @@ -1,7 +1,6 @@ import { DebioConversionService } from './debio-conversion.service'; import { CacheModule, Module } from '@nestjs/common'; import * as redisStore from 'cache-manager-redis-store'; -import { keyList } from '../../../common/secrets'; import { config } from 'src/config'; @Module({ diff --git a/src/common/modules/debio-conversion/debio-conversion.service.ts b/src/common/modules/debio-conversion/debio-conversion.service.ts index 833b9fc2..43ff86c0 100644 --- a/src/common/modules/debio-conversion/debio-conversion.service.ts +++ b/src/common/modules/debio-conversion/debio-conversion.service.ts @@ -1,4 +1,3 @@ -import { keyList } from '../../secrets'; import axios from 'axios'; import { CACHE_MANAGER, Inject, Injectable } from '@nestjs/common'; import { Cache } from 'cache-manager'; diff --git a/src/common/modules/escrow/escrow.service.ts b/src/common/modules/escrow/escrow.service.ts index 29f4df3a..90fa8064 100644 --- a/src/common/modules/escrow/escrow.service.ts +++ b/src/common/modules/escrow/escrow.service.ts @@ -4,7 +4,6 @@ import { EthereumService, SubstrateService } from '../..'; import { setOrderPaid } from '@debionetwork/polkadot-provider'; import { ethers } from 'ethers'; import AsyncLock from 'async-lock'; -import { keyList } from '../../secrets'; import { config } from 'src/config'; const lock = new AsyncLock(); diff --git a/src/common/modules/ethereum/ethereum.service.ts b/src/common/modules/ethereum/ethereum.service.ts index f9fe2203..d8423258 100644 --- a/src/common/modules/ethereum/ethereum.service.ts +++ b/src/common/modules/ethereum/ethereum.service.ts @@ -9,7 +9,6 @@ import ABI from './utils/ABI.json'; import escrowContract from './utils/Escrow.json'; import { ethers } from 'ethers'; import { CachesService } from '../caches'; -import { keyList } from '../../secrets'; import { config } from 'src/config'; @Injectable() diff --git a/src/common/modules/health-indicators/elasticsearch.health/index.ts b/src/common/modules/health-indicators/elasticsearch.health/index.ts index 657ef9b0..071ada61 100644 --- a/src/common/modules/health-indicators/elasticsearch.health/index.ts +++ b/src/common/modules/health-indicators/elasticsearch.health/index.ts @@ -2,7 +2,6 @@ import { Module } from '@nestjs/common'; import { ElasticsearchModule } from '@nestjs/elasticsearch'; import { TerminusModule } from '@nestjs/terminus'; import { ElasticsearchHealthIndicator } from './elasticsearch.health.indicator'; -import { keyList } from '../../../secrets'; import { config } from 'src/config'; @Module({ diff --git a/src/common/modules/mailer/mailer.manager.ts b/src/common/modules/mailer/mailer.manager.ts index cac54c26..41079fe0 100644 --- a/src/common/modules/mailer/mailer.manager.ts +++ b/src/common/modules/mailer/mailer.manager.ts @@ -5,7 +5,6 @@ import { GeneticAnalystRegister, LabRegister, } from './models'; -import { keyList } from '../../secrets'; import { HealthProfessionalRegister } from './models/health-professional.model'; import { config } from 'src/config'; diff --git a/src/common/modules/mailer/mailer.module.ts b/src/common/modules/mailer/mailer.module.ts index ee7303c4..22bc3df3 100644 --- a/src/common/modules/mailer/mailer.module.ts +++ b/src/common/modules/mailer/mailer.module.ts @@ -3,7 +3,6 @@ import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handleba import { Module } from '@nestjs/common'; import { join } from 'path'; import { MailerManager } from './mailer.manager'; -import { keyList } from '../../secrets'; import { config } from 'src/config'; @Module({ diff --git a/src/common/modules/substrate/substrate.service.ts b/src/common/modules/substrate/substrate.service.ts index 16c57066..a52c80a6 100644 --- a/src/common/modules/substrate/substrate.service.ts +++ b/src/common/modules/substrate/substrate.service.ts @@ -1,7 +1,6 @@ import { ApiPromise, Keyring, WsProvider } from '@polkadot/api'; import { Injectable, OnModuleInit, Logger } from '@nestjs/common'; import { waitReady } from '@polkadot/wasm-crypto'; -import { keyList } from '../../secrets'; import { config } from 'src/config'; @Injectable() @@ -12,8 +11,6 @@ export class SubstrateService implements OnModuleInit { private _listenStatus: boolean; private readonly _logger: Logger = new Logger(SubstrateService.name); - constructor() {} - get api(): ApiPromise { return this._api; } diff --git a/src/endpoints/cloud-storage/cloud-storage.module.ts b/src/endpoints/cloud-storage/cloud-storage.module.ts index 7ad056cb..cde4ef88 100644 --- a/src/endpoints/cloud-storage/cloud-storage.module.ts +++ b/src/endpoints/cloud-storage/cloud-storage.module.ts @@ -2,7 +2,6 @@ import { Module } from '@nestjs/common'; import { GCloudStorageModule } from '@debionetwork/nestjs-gcloud-storage'; import { CloudStorageController } from './cloud-storage.controller'; import { DateTimeModule } from '../../common'; -import { keyList } from '../../common/secrets'; import { config } from 'src/config'; @Module({ diff --git a/src/endpoints/email/email.controller.ts b/src/endpoints/email/email.controller.ts index a7ac318c..9e7a9be7 100644 --- a/src/endpoints/email/email.controller.ts +++ b/src/endpoints/email/email.controller.ts @@ -17,7 +17,6 @@ import { queryGeneticAnalystByAccountId, queryLabById, } from '@debionetwork/polkadot-provider'; -import { keyList } from '../../common/secrets'; import { queryHealthProfessionalById } from '@common/modules/polkadot-provider/query/health-professional'; import { config } from 'src/config'; diff --git a/src/endpoints/myriad/myriad.module.ts b/src/endpoints/myriad/myriad.module.ts index 4da1400e..98d29801 100644 --- a/src/endpoints/myriad/myriad.module.ts +++ b/src/endpoints/myriad/myriad.module.ts @@ -1,4 +1,3 @@ -import { keyList } from '@common/secrets'; import { CacheModule, Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { MyriadAccount } from './models/myriad-account.entity'; diff --git a/src/endpoints/myriad/myriad.service.ts b/src/endpoints/myriad/myriad.service.ts index 23868cd6..675e6863 100644 --- a/src/endpoints/myriad/myriad.service.ts +++ b/src/endpoints/myriad/myriad.service.ts @@ -1,4 +1,3 @@ -import { keyList } from '@common/secrets'; import { CACHE_MANAGER, Inject, @@ -515,7 +514,6 @@ export class MyriadService { rawText, selectedUserIds, jwt, - postType, timelineId, }: { createdBy: string; diff --git a/src/endpoints/pinata/pinata.service.ts b/src/endpoints/pinata/pinata.service.ts index b9cf1fff..4b7c4b41 100644 --- a/src/endpoints/pinata/pinata.service.ts +++ b/src/endpoints/pinata/pinata.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@nestjs/common'; -import { keyList } from '../../common/secrets'; import axios from 'axios'; import { AxiosRequestConfig } from 'axios'; import FormData from 'form-data'; @@ -7,7 +6,6 @@ import { config } from 'src/config'; @Injectable() export class PinataService { - constructor() {} async uploadToPinata(file: Express.Multer.File) { const options = { pinataMetadata: { diff --git a/src/endpoints/recaptcha/recaptcha.controller.ts b/src/endpoints/recaptcha/recaptcha.controller.ts index 44287e48..75fdb792 100644 --- a/src/endpoints/recaptcha/recaptcha.controller.ts +++ b/src/endpoints/recaptcha/recaptcha.controller.ts @@ -7,7 +7,6 @@ import { config } from 'src/config'; @UseInterceptors(SentryInterceptor) @Controller('recaptcha') export class RecaptchaController { - constructor() {} @Post() async recaptcha(@Body() payload: any, @Res() response: Response) { diff --git a/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts b/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts index 1063af11..96ee9f68 100644 --- a/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts +++ b/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts @@ -39,7 +39,6 @@ import { geneticAnalysisByTrakingIdResponse, geneticAnalysisOrderByGA, } from './models/response'; -import { keyList } from '../../common/secrets'; import { MenstrualSubscriptionService } from './services/menstrual-subscription.service'; import { config } from 'src/config'; diff --git a/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts b/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts index b2b87032..d41d4db9 100644 --- a/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts +++ b/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts @@ -14,7 +14,6 @@ import { ServiceRequestService } from './services/service-request.service'; import { LocationModule } from '../location/location.module'; import { GeneticAnalysisService } from './services/genetic-analysis.service'; import { GeneticAnalysisOrderService } from './services/genetic-analysis-order.service'; -import { keyList } from '../../common/secrets'; import { MenstrualCalendarService } from './services/menstrual-calendar.service'; import { MenstrualSubscriptionService } from './services/menstrual-subscription.service'; import { config } from 'src/config'; diff --git a/src/endpoints/transaction/transaction.module.ts b/src/endpoints/transaction/transaction.module.ts index af6bf1b3..f0a52e81 100644 --- a/src/endpoints/transaction/transaction.module.ts +++ b/src/endpoints/transaction/transaction.module.ts @@ -1,6 +1,5 @@ import { Module } from '@nestjs/common'; import { ElasticsearchModule } from '@nestjs/elasticsearch'; -import { keyList } from '../../common/secrets'; import { TransactionLoggingModule } from '../../common'; import { TransactionController } from './transaction.controller'; import { TransactionService } from './transaction.service'; diff --git a/src/endpoints/verification/verification.controller.ts b/src/endpoints/verification/verification.controller.ts index f4ef7ed5..94e25250 100644 --- a/src/endpoints/verification/verification.controller.ts +++ b/src/endpoints/verification/verification.controller.ts @@ -10,7 +10,6 @@ import { } from '@nestjs/common'; import { ApiBody, ApiOperation, ApiQuery } from '@nestjs/swagger'; import { Response } from 'express'; -import { keyList } from '../../common/secrets'; import { SentryInterceptor } from '../../common'; import { VerificationService } from './verification.service'; import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives'; From feb14ee09632cb401f40ad9125bc59da222d3f61 Mon Sep 17 00:00:00 2001 From: RXRD Date: Mon, 19 Feb 2024 09:29:14 +0700 Subject: [PATCH 08/18] fix --- src/common/modules/caches/index.ts | 2 +- .../modules/debio-conversion/debio-conversion.module.ts | 2 +- .../modules/debio-conversion/debio-conversion.service.ts | 2 +- src/common/modules/escrow/escrow.service.ts | 2 +- src/common/modules/ethereum/ethereum.service.ts | 2 +- .../health-indicators/elasticsearch.health/index.ts | 2 +- src/common/modules/mailer/mailer.manager.ts | 2 +- src/common/modules/mailer/mailer.module.ts | 2 +- src/common/modules/substrate/substrate.service.ts | 2 +- src/endpoints/bounty/bounty.module.ts | 2 +- src/endpoints/cloud-storage/cloud-storage.module.ts | 2 +- src/endpoints/conversion/conversion.module.ts | 2 +- src/endpoints/email/email.controller.ts | 2 +- src/endpoints/myriad/myriad.module.ts | 2 +- src/endpoints/myriad/myriad.service.ts | 2 +- src/endpoints/pinata/pinata.service.ts | 2 +- src/endpoints/recaptcha/recaptcha.controller.ts | 2 +- src/endpoints/second-opinion/second-opinion.module.ts | 2 +- .../substrate-endpoint/substrate-endpoint.controller.ts | 2 +- .../substrate-endpoint/substrate-endpoint.module.ts | 2 +- src/endpoints/transaction/transaction.module.ts | 2 +- src/endpoints/verification/verification.controller.ts | 2 +- src/endpoints/verification/verification.module.ts | 2 +- test/e2e/endpoints/recaptcha.spec.ts | 5 ----- .../debio-conversion/debio-conversion.service.spec.ts | 5 ----- test/unit/common/modules/escrow/escrow.service.spec.ts | 5 ----- .../unit/common/modules/ethereum/ethereum.service.spec.ts | 5 ----- test/unit/common/modules/mailer/mailer.manager.spec.ts | 5 ----- .../common/modules/substrate/substrate.service.spec.ts | 5 ----- test/unit/endpoints/email/email.controller.spec.ts | 6 ------ .../unit/endpoints/recaptcha/recaptcha.controller.spec.ts | 5 ----- .../substrate-endpoint.controller.spec.ts | 5 ----- .../verification/verification.controller.spec.ts | 5 ----- test/unit/mock.ts | 8 -------- 34 files changed, 23 insertions(+), 82 deletions(-) diff --git a/src/common/modules/caches/index.ts b/src/common/modules/caches/index.ts index c6df8e9d..fed0f44f 100644 --- a/src/common/modules/caches/index.ts +++ b/src/common/modules/caches/index.ts @@ -1,7 +1,7 @@ import { CacheModule, Module } from '@nestjs/common'; import { CachesService } from './caches.service'; import * as redisStore from 'cache-manager-redis-store'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Module({ imports: [ diff --git a/src/common/modules/debio-conversion/debio-conversion.module.ts b/src/common/modules/debio-conversion/debio-conversion.module.ts index fc73c520..0a08eb48 100644 --- a/src/common/modules/debio-conversion/debio-conversion.module.ts +++ b/src/common/modules/debio-conversion/debio-conversion.module.ts @@ -1,7 +1,7 @@ import { DebioConversionService } from './debio-conversion.service'; import { CacheModule, Module } from '@nestjs/common'; import * as redisStore from 'cache-manager-redis-store'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Module({ imports: [ diff --git a/src/common/modules/debio-conversion/debio-conversion.service.ts b/src/common/modules/debio-conversion/debio-conversion.service.ts index 43ff86c0..3695720e 100644 --- a/src/common/modules/debio-conversion/debio-conversion.service.ts +++ b/src/common/modules/debio-conversion/debio-conversion.service.ts @@ -8,7 +8,7 @@ import { estimateSwap, getExpectedOutputFromSwapTodos, } from '@ref-finance/ref-sdk'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Injectable() export class DebioConversionService { diff --git a/src/common/modules/escrow/escrow.service.ts b/src/common/modules/escrow/escrow.service.ts index 90fa8064..42a748e4 100644 --- a/src/common/modules/escrow/escrow.service.ts +++ b/src/common/modules/escrow/escrow.service.ts @@ -4,7 +4,7 @@ import { EthereumService, SubstrateService } from '../..'; import { setOrderPaid } from '@debionetwork/polkadot-provider'; import { ethers } from 'ethers'; import AsyncLock from 'async-lock'; -import { config } from 'src/config'; +import { config } from '../../../config'; const lock = new AsyncLock(); const ESCROW_WALLET_LOCK_KEY = 'escrow-wallet-lock'; diff --git a/src/common/modules/ethereum/ethereum.service.ts b/src/common/modules/ethereum/ethereum.service.ts index d8423258..c563c076 100644 --- a/src/common/modules/ethereum/ethereum.service.ts +++ b/src/common/modules/ethereum/ethereum.service.ts @@ -9,7 +9,7 @@ import ABI from './utils/ABI.json'; import escrowContract from './utils/Escrow.json'; import { ethers } from 'ethers'; import { CachesService } from '../caches'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Injectable() export class EthereumService { diff --git a/src/common/modules/health-indicators/elasticsearch.health/index.ts b/src/common/modules/health-indicators/elasticsearch.health/index.ts index 071ada61..bd5f1b99 100644 --- a/src/common/modules/health-indicators/elasticsearch.health/index.ts +++ b/src/common/modules/health-indicators/elasticsearch.health/index.ts @@ -2,7 +2,7 @@ import { Module } from '@nestjs/common'; import { ElasticsearchModule } from '@nestjs/elasticsearch'; import { TerminusModule } from '@nestjs/terminus'; import { ElasticsearchHealthIndicator } from './elasticsearch.health.indicator'; -import { config } from 'src/config'; +import { config } from '../../../../config'; @Module({ imports: [ diff --git a/src/common/modules/mailer/mailer.manager.ts b/src/common/modules/mailer/mailer.manager.ts index 41079fe0..bcafbbf7 100644 --- a/src/common/modules/mailer/mailer.manager.ts +++ b/src/common/modules/mailer/mailer.manager.ts @@ -6,7 +6,7 @@ import { LabRegister, } from './models'; import { HealthProfessionalRegister } from './models/health-professional.model'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Injectable() export class MailerManager { diff --git a/src/common/modules/mailer/mailer.module.ts b/src/common/modules/mailer/mailer.module.ts index 22bc3df3..2c7bf739 100644 --- a/src/common/modules/mailer/mailer.module.ts +++ b/src/common/modules/mailer/mailer.module.ts @@ -3,7 +3,7 @@ import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handleba import { Module } from '@nestjs/common'; import { join } from 'path'; import { MailerManager } from './mailer.manager'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Module({ imports: [ diff --git a/src/common/modules/substrate/substrate.service.ts b/src/common/modules/substrate/substrate.service.ts index a52c80a6..97e80610 100644 --- a/src/common/modules/substrate/substrate.service.ts +++ b/src/common/modules/substrate/substrate.service.ts @@ -1,7 +1,7 @@ import { ApiPromise, Keyring, WsProvider } from '@polkadot/api'; import { Injectable, OnModuleInit, Logger } from '@nestjs/common'; import { waitReady } from '@polkadot/wasm-crypto'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Injectable() export class SubstrateService implements OnModuleInit { diff --git a/src/endpoints/bounty/bounty.module.ts b/src/endpoints/bounty/bounty.module.ts index b7c07721..8e9cbfe1 100644 --- a/src/endpoints/bounty/bounty.module.ts +++ b/src/endpoints/bounty/bounty.module.ts @@ -5,7 +5,7 @@ import { DataStakingEvents } from './models/data-staking-events.entity'; import { DateTimeModule } from '../../common'; import { DataTokenToDatasetMapping } from './models/data-token-to-dataset-mapping.entity'; import { GCloudStorageModule } from '@debionetwork/nestjs-gcloud-storage'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Module({ imports: [ diff --git a/src/endpoints/cloud-storage/cloud-storage.module.ts b/src/endpoints/cloud-storage/cloud-storage.module.ts index cde4ef88..48089551 100644 --- a/src/endpoints/cloud-storage/cloud-storage.module.ts +++ b/src/endpoints/cloud-storage/cloud-storage.module.ts @@ -2,7 +2,7 @@ import { Module } from '@nestjs/common'; import { GCloudStorageModule } from '@debionetwork/nestjs-gcloud-storage'; import { CloudStorageController } from './cloud-storage.controller'; import { DateTimeModule } from '../../common'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Module({ imports: [ diff --git a/src/endpoints/conversion/conversion.module.ts b/src/endpoints/conversion/conversion.module.ts index 4e1647f0..575489c7 100644 --- a/src/endpoints/conversion/conversion.module.ts +++ b/src/endpoints/conversion/conversion.module.ts @@ -3,7 +3,7 @@ import { CacheModule, Module } from '@nestjs/common'; import * as redisStore from 'cache-manager-redis-store'; import { DebioConversionModule } from 'src/common'; import { CacheController } from './conversion.controller'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Module({ imports: [ diff --git a/src/endpoints/email/email.controller.ts b/src/endpoints/email/email.controller.ts index 9e7a9be7..c0adef8c 100644 --- a/src/endpoints/email/email.controller.ts +++ b/src/endpoints/email/email.controller.ts @@ -18,7 +18,7 @@ import { queryLabById, } from '@debionetwork/polkadot-provider'; import { queryHealthProfessionalById } from '@common/modules/polkadot-provider/query/health-professional'; -import { config } from 'src/config'; +import { config } from '../../config'; @Controller('email') export class EmailEndpointController { diff --git a/src/endpoints/myriad/myriad.module.ts b/src/endpoints/myriad/myriad.module.ts index 98d29801..266162e4 100644 --- a/src/endpoints/myriad/myriad.module.ts +++ b/src/endpoints/myriad/myriad.module.ts @@ -4,7 +4,7 @@ import { MyriadAccount } from './models/myriad-account.entity'; import { MyriadController } from './myriad.controller'; import { MyriadService } from './myriad.service'; import * as redisStore from 'cache-manager-redis-store'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Module({ imports: [ diff --git a/src/endpoints/myriad/myriad.service.ts b/src/endpoints/myriad/myriad.service.ts index 675e6863..9591cac5 100644 --- a/src/endpoints/myriad/myriad.service.ts +++ b/src/endpoints/myriad/myriad.service.ts @@ -21,7 +21,7 @@ import { UserMyriadInterface } from './interface/user'; import { UsernameCheckInterface } from './interface/username-check'; import { MyriadAccount } from './models/myriad-account.entity'; import { Cache } from 'cache-manager'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Injectable() export class MyriadService { diff --git a/src/endpoints/pinata/pinata.service.ts b/src/endpoints/pinata/pinata.service.ts index 4b7c4b41..7dbd5664 100644 --- a/src/endpoints/pinata/pinata.service.ts +++ b/src/endpoints/pinata/pinata.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import axios from 'axios'; import { AxiosRequestConfig } from 'axios'; import FormData from 'form-data'; -import { config } from 'src/config'; +import { config } from '../../config'; @Injectable() export class PinataService { diff --git a/src/endpoints/recaptcha/recaptcha.controller.ts b/src/endpoints/recaptcha/recaptcha.controller.ts index 75fdb792..a8f30364 100644 --- a/src/endpoints/recaptcha/recaptcha.controller.ts +++ b/src/endpoints/recaptcha/recaptcha.controller.ts @@ -2,7 +2,7 @@ import { Body, Controller, Post, Res, UseInterceptors } from '@nestjs/common'; import axios from 'axios'; import { Response } from 'express'; import { SentryInterceptor } from '../../common/interceptors'; -import { config } from 'src/config'; +import { config } from '../../config'; @UseInterceptors(SentryInterceptor) @Controller('recaptcha') diff --git a/src/endpoints/second-opinion/second-opinion.module.ts b/src/endpoints/second-opinion/second-opinion.module.ts index 5230ac5e..66dab43a 100644 --- a/src/endpoints/second-opinion/second-opinion.module.ts +++ b/src/endpoints/second-opinion/second-opinion.module.ts @@ -5,7 +5,7 @@ import { HealthProfessionalSpecialization } from './models/health-professional-s import { SecondOpinionController } from './second-opinion.controller'; import { SecondOpinionService } from './second-opinion.service'; import * as redisStore from 'cache-manager-redis-store'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Module({ imports: [ diff --git a/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts b/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts index 96ee9f68..316722b8 100644 --- a/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts +++ b/src/endpoints/substrate-endpoint/substrate-endpoint.controller.ts @@ -40,7 +40,7 @@ import { geneticAnalysisOrderByGA, } from './models/response'; import { MenstrualSubscriptionService } from './services/menstrual-subscription.service'; -import { config } from 'src/config'; +import { config } from '../../config'; @Controller('substrate') @UseInterceptors(SentryInterceptor) diff --git a/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts b/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts index d41d4db9..260aca5c 100644 --- a/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts +++ b/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts @@ -16,7 +16,7 @@ import { GeneticAnalysisService } from './services/genetic-analysis.service'; import { GeneticAnalysisOrderService } from './services/genetic-analysis-order.service'; import { MenstrualCalendarService } from './services/menstrual-calendar.service'; import { MenstrualSubscriptionService } from './services/menstrual-subscription.service'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Module({ imports: [ diff --git a/src/endpoints/transaction/transaction.module.ts b/src/endpoints/transaction/transaction.module.ts index f0a52e81..42084fcf 100644 --- a/src/endpoints/transaction/transaction.module.ts +++ b/src/endpoints/transaction/transaction.module.ts @@ -3,7 +3,7 @@ import { ElasticsearchModule } from '@nestjs/elasticsearch'; import { TransactionLoggingModule } from '../../common'; import { TransactionController } from './transaction.controller'; import { TransactionService } from './transaction.service'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Module({ imports: [ diff --git a/src/endpoints/verification/verification.controller.ts b/src/endpoints/verification/verification.controller.ts index 94e25250..39bc950a 100644 --- a/src/endpoints/verification/verification.controller.ts +++ b/src/endpoints/verification/verification.controller.ts @@ -14,7 +14,7 @@ import { SentryInterceptor } from '../../common'; import { VerificationService } from './verification.service'; import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives'; import { HealthProfessionalRegisterDTO } from './dto/health-professional.dto'; -import { config } from 'src/config'; +import { config } from '../../../config'; @UseInterceptors(SentryInterceptor) @Controller('verification') diff --git a/src/endpoints/verification/verification.module.ts b/src/endpoints/verification/verification.module.ts index 524b49ee..c52c80b8 100644 --- a/src/endpoints/verification/verification.module.ts +++ b/src/endpoints/verification/verification.module.ts @@ -8,7 +8,7 @@ import { TypeOrmModule } from '@nestjs/typeorm'; import { MyriadAccount } from '@endpoints/myriad/models/myriad-account.entity'; import * as redisStore from 'cache-manager-redis-store'; import { MyriadModule } from '@endpoints/myriad/myriad.module'; -import { config } from 'src/config'; +import { config } from '../../../config'; @Module({ imports: [ diff --git a/test/e2e/endpoints/recaptcha.spec.ts b/test/e2e/endpoints/recaptcha.spec.ts index 221ec5e9..92a78cc7 100644 --- a/test/e2e/endpoints/recaptcha.spec.ts +++ b/test/e2e/endpoints/recaptcha.spec.ts @@ -6,7 +6,6 @@ import { Response } from 'express'; import { INestApplication } from '@nestjs/common'; import { TestingModule, Test } from '@nestjs/testing'; import { RecaptchaController } from '../../../src/endpoints/recaptcha/recaptcha.controller'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; describe('Recaptcha Controller (e2e)', () => { const axiosMock = new MockAdapter(axios); @@ -34,10 +33,6 @@ describe('Recaptcha Controller (e2e)', () => { const module: TestingModule = await Test.createTestingModule({ controllers: [RecaptchaController], providers: [ - { - provide: GCloudSecretManagerService, - useClass: GoogleSecretManagerServiceMock, - }, ], }).compile(); diff --git a/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts b/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts index 3e140573..0c557814 100644 --- a/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts +++ b/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts @@ -2,7 +2,6 @@ import { Test, TestingModule } from '@nestjs/testing'; import { DebioConversionService } from '../../../../../src/common'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { CACHE_MANAGER } from '@nestjs/common'; import { Cache } from 'cache-manager'; import { when } from 'jest-when'; @@ -42,10 +41,6 @@ describe('Debio Conversion Service Unit Tests', () => { const module: TestingModule = await Test.createTestingModule({ providers: [ DebioConversionService, - { - provide: GCloudSecretManagerService, - useClass: GoogleSecretManagerServiceMock, - }, { provide: CACHE_MANAGER, useValue: { diff --git a/test/unit/common/modules/escrow/escrow.service.spec.ts b/test/unit/common/modules/escrow/escrow.service.spec.ts index 076716d7..0476e953 100644 --- a/test/unit/common/modules/escrow/escrow.service.spec.ts +++ b/test/unit/common/modules/escrow/escrow.service.spec.ts @@ -8,7 +8,6 @@ import { import { EscrowService } from '../../../../../src/common/modules/escrow/escrow.service'; import { ethers } from 'ethers'; import { setOrderPaid } from '@debionetwork/polkadot-provider'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; jest.mock('@debionetwork/polkadot-provider', () => ({ setOrderPaid: jest.fn(), @@ -59,10 +58,6 @@ describe('Escrow Service Unit Tests', () => { EscrowService, { provide: SubstrateService, useFactory: substrateServiceMockFactory }, { provide: EthereumService, useFactory: ethereumServiceMockFactory }, - { - provide: GCloudSecretManagerService, - useClass: GoogleSecretManagerServiceMock, - }, ], }).compile(); diff --git a/test/unit/common/modules/ethereum/ethereum.service.spec.ts b/test/unit/common/modules/ethereum/ethereum.service.spec.ts index 54111a58..054321a0 100644 --- a/test/unit/common/modules/ethereum/ethereum.service.spec.ts +++ b/test/unit/common/modules/ethereum/ethereum.service.spec.ts @@ -5,7 +5,6 @@ import { EthersContract, EthersSigner } from 'nestjs-ethers'; import ABI from '../../../../../src/common/modules/ethereum/utils/ABI.json'; import escrowContract from '../../../../../src/common/modules/ethereum/utils/Escrow.json'; import { ethers } from 'ethers'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; const PROVIDER_RESULT = 1; jest.mock('ethers', () => ({ @@ -66,10 +65,6 @@ describe.only('EthereumService', () => { { provide: CachesService, useFactory: cachesServiceMockFactory }, { provide: EthersContract, useFactory: ethersContractMockFactory }, { provide: EthersSigner, useFactory: ethersSignerMockFactory }, - { - provide: GCloudSecretManagerService, - useClass: GoogleSecretManagerServiceMock, - }, ], }).compile(); diff --git a/test/unit/common/modules/mailer/mailer.manager.spec.ts b/test/unit/common/modules/mailer/mailer.manager.spec.ts index bf0fd35a..3b73824d 100644 --- a/test/unit/common/modules/mailer/mailer.manager.spec.ts +++ b/test/unit/common/modules/mailer/mailer.manager.spec.ts @@ -3,7 +3,6 @@ import { mailerServiceMockFactory, MockType } from '../../../mock'; import { MailerService } from '@nestjs-modules/mailer'; import { MailerManager } from '../../../../../src/common'; import { customerStakingRequestService, labRegister } from './mailer.mock.data'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; describe('Mailer Manager Unit Tests', () => { let mailerManager: MailerManager; @@ -26,10 +25,6 @@ describe('Mailer Manager Unit Tests', () => { providers: [ MailerManager, { provide: MailerService, useFactory: mailerServiceMockFactory }, - { - provide: GCloudSecretManagerService, - useClass: GoogleSecretManagerServiceMock, - }, ], }).compile(); diff --git a/test/unit/common/modules/substrate/substrate.service.spec.ts b/test/unit/common/modules/substrate/substrate.service.spec.ts index 53e06aef..8cb4eb12 100644 --- a/test/unit/common/modules/substrate/substrate.service.spec.ts +++ b/test/unit/common/modules/substrate/substrate.service.spec.ts @@ -2,7 +2,6 @@ import { Test, TestingModule } from '@nestjs/testing'; import { mockFunction } from '../../../mock'; import { ProcessEnvProxy, SubstrateService } from '../../../../../src/common'; import { ApiPromise, Keyring } from '@polkadot/api'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; jest.mock('../../../mock', () => ({ mockFunction: jest.fn(), @@ -41,10 +40,6 @@ describe.only('Substrate Service Unit Test', () => { providers: [ SubstrateService, { provide: ProcessEnvProxy, useClass: ProcessEnvProxyMock }, - { - provide: GCloudSecretManagerService, - useClass: GoogleSecretManagerServiceMock, - }, ], }).compile(); diff --git a/test/unit/endpoints/email/email.controller.spec.ts b/test/unit/endpoints/email/email.controller.spec.ts index 4e30e830..cc869285 100644 --- a/test/unit/endpoints/email/email.controller.spec.ts +++ b/test/unit/endpoints/email/email.controller.spec.ts @@ -6,7 +6,6 @@ import { } from '../../../../src/common'; import { emailNotificationServiceMockFactory, - googleSecretManagerServiceMockFactory, mailerManagerMockFactory, MockType, substrateServiceMockFactory, @@ -16,7 +15,6 @@ import { Response } from 'express'; import { Test, TestingModule } from '@nestjs/testing'; import * as labQuery from '@debionetwork/polkadot-provider/lib/query/labs'; import { when } from 'jest-when'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; describe('Email Controller', () => { let emailEndpointControllerMock: EmailEndpointController; @@ -49,10 +47,6 @@ describe('Email Controller', () => { provide: EmailNotificationService, useFactory: emailNotificationServiceMockFactory, }, - { - provide: GCloudSecretManagerService, - useFactory: googleSecretManagerServiceMockFactory, - }, ], }).compile(); diff --git a/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts b/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts index 14500c5d..b98d53d6 100644 --- a/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts +++ b/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts @@ -3,7 +3,6 @@ import { Response } from 'express'; import MockAdapter from 'axios-mock-adapter'; import { TestingModule, Test } from '@nestjs/testing'; import { RecaptchaController } from '../../../../src/endpoints/recaptcha/recaptcha.controller'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; describe('Recaptcha Controller Unit Tests', () => { let recaptchaController: RecaptchaController; @@ -27,10 +26,6 @@ describe('Recaptcha Controller Unit Tests', () => { const module: TestingModule = await Test.createTestingModule({ controllers: [RecaptchaController], providers: [ - { - provide: GCloudSecretManagerService, - useClass: GoogleSecretManagerServiceMock, - }, ], }).compile(); diff --git a/test/unit/endpoints/substrate-endpoint/substrate-endpoint.controller.spec.ts b/test/unit/endpoints/substrate-endpoint/substrate-endpoint.controller.spec.ts index 01f2def7..d35b0cff 100644 --- a/test/unit/endpoints/substrate-endpoint/substrate-endpoint.controller.spec.ts +++ b/test/unit/endpoints/substrate-endpoint/substrate-endpoint.controller.spec.ts @@ -29,7 +29,6 @@ import { setGeneticAnalysisOrderPaid, adminSetEthAddress, } from '@debionetwork/polkadot-provider'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; jest.mock('@debionetwork/polkadot-provider', () => ({ queryAccountIdByEthAddress: jest.fn(), @@ -162,10 +161,6 @@ describe('Substrate Endpoint Controller Unit Tests', () => { useFactory: geneticAnalysisOrderMockfactory, }, { provide: DateTimeProxy, useFactory: dateTimeProxyMockFactory }, - { - provide: GCloudSecretManagerService, - useClass: GoogleSecretManagerServiceMock, - }, ], }).compile(); diff --git a/test/unit/endpoints/verification/verification.controller.spec.ts b/test/unit/endpoints/verification/verification.controller.spec.ts index a5d17d7e..20fc497b 100644 --- a/test/unit/endpoints/verification/verification.controller.spec.ts +++ b/test/unit/endpoints/verification/verification.controller.spec.ts @@ -3,7 +3,6 @@ import { MockType } from '../../mock'; import { VerificationService } from '../../../../src/endpoints/verification/verification.service'; import { VerificationController } from '../../../../src/endpoints/verification/verification.controller'; import httpMocks = require('node-mocks-http'); -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; describe('Verification Controller Unit Tests', () => { let verificationController: VerificationController; @@ -37,10 +36,6 @@ describe('Verification Controller Unit Tests', () => { provide: VerificationService, useFactory: verificationServiceMockFactory, }, - { - provide: GCloudSecretManagerService, - useClass: GoogleSecretManagerServiceMock, - }, ], }).compile(); diff --git a/test/unit/mock.ts b/test/unit/mock.ts index 9f5385c2..586bd483 100644 --- a/test/unit/mock.ts +++ b/test/unit/mock.ts @@ -23,7 +23,6 @@ import { CountryService } from '../../src/endpoints/location/country.service'; import { StateService } from '../../src/endpoints/location/state.service'; import { SchedulerRegistry } from '@nestjs/schedule'; import { NotificationService } from '../../src/common/modules/notification/notification.service'; -import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { keyList } from '../../src/common/secrets'; export function mockFunction(args) {} // eslint-disable-line @@ -373,10 +372,3 @@ export const schedulerRegistryMockFactory: () => MockType = jest.fn(() => ({ addInterval: jest.fn(), })); - -export const googleSecretManagerServiceMockFactory: () => MockType< - GCloudSecretManagerService -> = jest.fn(() => ({ - loadSecrets: jest.fn((entity) => entity), - getSecret: jest.fn((entity) => entity), -})); From 5df4d62f37d16cc6d842813d6d5512f0aeeaae45 Mon Sep 17 00:00:00 2001 From: RXRD Date: Mon, 19 Feb 2024 09:35:25 +0700 Subject: [PATCH 09/18] fix --- src/endpoints/bounty/bounty.module.ts | 2 +- src/endpoints/cloud-storage/cloud-storage.module.ts | 2 +- src/endpoints/conversion/conversion.module.ts | 2 +- src/endpoints/myriad/myriad.module.ts | 2 +- src/endpoints/myriad/myriad.service.ts | 2 +- src/endpoints/second-opinion/second-opinion.module.ts | 2 +- src/endpoints/substrate-endpoint/substrate-endpoint.module.ts | 2 +- src/endpoints/transaction/transaction.module.ts | 2 +- src/endpoints/verification/verification.controller.ts | 2 +- src/endpoints/verification/verification.module.ts | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/endpoints/bounty/bounty.module.ts b/src/endpoints/bounty/bounty.module.ts index 8e9cbfe1..6d09f7ed 100644 --- a/src/endpoints/bounty/bounty.module.ts +++ b/src/endpoints/bounty/bounty.module.ts @@ -5,7 +5,7 @@ import { DataStakingEvents } from './models/data-staking-events.entity'; import { DateTimeModule } from '../../common'; import { DataTokenToDatasetMapping } from './models/data-token-to-dataset-mapping.entity'; import { GCloudStorageModule } from '@debionetwork/nestjs-gcloud-storage'; -import { config } from '../../../config'; +import { config } from '../../config'; @Module({ imports: [ diff --git a/src/endpoints/cloud-storage/cloud-storage.module.ts b/src/endpoints/cloud-storage/cloud-storage.module.ts index 48089551..09b5ccd7 100644 --- a/src/endpoints/cloud-storage/cloud-storage.module.ts +++ b/src/endpoints/cloud-storage/cloud-storage.module.ts @@ -2,7 +2,7 @@ import { Module } from '@nestjs/common'; import { GCloudStorageModule } from '@debionetwork/nestjs-gcloud-storage'; import { CloudStorageController } from './cloud-storage.controller'; import { DateTimeModule } from '../../common'; -import { config } from '../../../config'; +import { config } from '../../config'; @Module({ imports: [ diff --git a/src/endpoints/conversion/conversion.module.ts b/src/endpoints/conversion/conversion.module.ts index 575489c7..437da348 100644 --- a/src/endpoints/conversion/conversion.module.ts +++ b/src/endpoints/conversion/conversion.module.ts @@ -3,7 +3,7 @@ import { CacheModule, Module } from '@nestjs/common'; import * as redisStore from 'cache-manager-redis-store'; import { DebioConversionModule } from 'src/common'; import { CacheController } from './conversion.controller'; -import { config } from '../../../config'; +import { config } from '../../config'; @Module({ imports: [ diff --git a/src/endpoints/myriad/myriad.module.ts b/src/endpoints/myriad/myriad.module.ts index 266162e4..4064d31b 100644 --- a/src/endpoints/myriad/myriad.module.ts +++ b/src/endpoints/myriad/myriad.module.ts @@ -4,7 +4,7 @@ import { MyriadAccount } from './models/myriad-account.entity'; import { MyriadController } from './myriad.controller'; import { MyriadService } from './myriad.service'; import * as redisStore from 'cache-manager-redis-store'; -import { config } from '../../../config'; +import { config } from '../../config'; @Module({ imports: [ diff --git a/src/endpoints/myriad/myriad.service.ts b/src/endpoints/myriad/myriad.service.ts index 9591cac5..eefedd6b 100644 --- a/src/endpoints/myriad/myriad.service.ts +++ b/src/endpoints/myriad/myriad.service.ts @@ -21,7 +21,7 @@ import { UserMyriadInterface } from './interface/user'; import { UsernameCheckInterface } from './interface/username-check'; import { MyriadAccount } from './models/myriad-account.entity'; import { Cache } from 'cache-manager'; -import { config } from '../../../config'; +import { config } from '../../config'; @Injectable() export class MyriadService { diff --git a/src/endpoints/second-opinion/second-opinion.module.ts b/src/endpoints/second-opinion/second-opinion.module.ts index 66dab43a..306308a4 100644 --- a/src/endpoints/second-opinion/second-opinion.module.ts +++ b/src/endpoints/second-opinion/second-opinion.module.ts @@ -5,7 +5,7 @@ import { HealthProfessionalSpecialization } from './models/health-professional-s import { SecondOpinionController } from './second-opinion.controller'; import { SecondOpinionService } from './second-opinion.service'; import * as redisStore from 'cache-manager-redis-store'; -import { config } from '../../../config'; +import { config } from '../../config'; @Module({ imports: [ diff --git a/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts b/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts index 260aca5c..aaffd03d 100644 --- a/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts +++ b/src/endpoints/substrate-endpoint/substrate-endpoint.module.ts @@ -16,7 +16,7 @@ import { GeneticAnalysisService } from './services/genetic-analysis.service'; import { GeneticAnalysisOrderService } from './services/genetic-analysis-order.service'; import { MenstrualCalendarService } from './services/menstrual-calendar.service'; import { MenstrualSubscriptionService } from './services/menstrual-subscription.service'; -import { config } from '../../../config'; +import { config } from '../../config'; @Module({ imports: [ diff --git a/src/endpoints/transaction/transaction.module.ts b/src/endpoints/transaction/transaction.module.ts index 42084fcf..ca8ba1ec 100644 --- a/src/endpoints/transaction/transaction.module.ts +++ b/src/endpoints/transaction/transaction.module.ts @@ -3,7 +3,7 @@ import { ElasticsearchModule } from '@nestjs/elasticsearch'; import { TransactionLoggingModule } from '../../common'; import { TransactionController } from './transaction.controller'; import { TransactionService } from './transaction.service'; -import { config } from '../../../config'; +import { config } from '../../config'; @Module({ imports: [ diff --git a/src/endpoints/verification/verification.controller.ts b/src/endpoints/verification/verification.controller.ts index 39bc950a..31b96dc1 100644 --- a/src/endpoints/verification/verification.controller.ts +++ b/src/endpoints/verification/verification.controller.ts @@ -14,7 +14,7 @@ import { SentryInterceptor } from '../../common'; import { VerificationService } from './verification.service'; import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives'; import { HealthProfessionalRegisterDTO } from './dto/health-professional.dto'; -import { config } from '../../../config'; +import { config } from '../../config'; @UseInterceptors(SentryInterceptor) @Controller('verification') diff --git a/src/endpoints/verification/verification.module.ts b/src/endpoints/verification/verification.module.ts index c52c80b8..d92c9cc2 100644 --- a/src/endpoints/verification/verification.module.ts +++ b/src/endpoints/verification/verification.module.ts @@ -8,7 +8,7 @@ import { TypeOrmModule } from '@nestjs/typeorm'; import { MyriadAccount } from '@endpoints/myriad/models/myriad-account.entity'; import * as redisStore from 'cache-manager-redis-store'; import { MyriadModule } from '@endpoints/myriad/myriad.module'; -import { config } from '../../../config'; +import { config } from '../../config'; @Module({ imports: [ From 1921a538b1f4dd95493c8a77619ef28c279d860d Mon Sep 17 00:00:00 2001 From: RXRD Date: Mon, 19 Feb 2024 09:46:32 +0700 Subject: [PATCH 10/18] fix --- src/endpoints/recaptcha/recaptcha.controller.ts | 1 - test/e2e/endpoints/recaptcha.spec.ts | 3 +-- test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/endpoints/recaptcha/recaptcha.controller.ts b/src/endpoints/recaptcha/recaptcha.controller.ts index a8f30364..8d1f7527 100644 --- a/src/endpoints/recaptcha/recaptcha.controller.ts +++ b/src/endpoints/recaptcha/recaptcha.controller.ts @@ -7,7 +7,6 @@ import { config } from '../../config'; @UseInterceptors(SentryInterceptor) @Controller('recaptcha') export class RecaptchaController { - @Post() async recaptcha(@Body() payload: any, @Res() response: Response) { const result = await axios.post( diff --git a/test/e2e/endpoints/recaptcha.spec.ts b/test/e2e/endpoints/recaptcha.spec.ts index 92a78cc7..80e10fbe 100644 --- a/test/e2e/endpoints/recaptcha.spec.ts +++ b/test/e2e/endpoints/recaptcha.spec.ts @@ -32,8 +32,7 @@ describe('Recaptcha Controller (e2e)', () => { beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ controllers: [RecaptchaController], - providers: [ - ], + providers: [], }).compile(); axiosMock.reset(); diff --git a/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts b/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts index b98d53d6..f6ed1018 100644 --- a/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts +++ b/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts @@ -25,8 +25,7 @@ describe('Recaptcha Controller Unit Tests', () => { beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ controllers: [RecaptchaController], - providers: [ - ], + providers: [], }).compile(); recaptchaController = module.get(RecaptchaController); From ec645a1842edbbb84a0421ff6f40a0ac7c43bf29 Mon Sep 17 00:00:00 2001 From: RXRD Date: Mon, 19 Feb 2024 10:15:05 +0700 Subject: [PATCH 11/18] fix --- src/config.ts | 6 +++--- test/unit/mock.ts | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/config.ts b/src/config.ts index 84cd5379..edfc62e7 100644 --- a/src/config.ts +++ b/src/config.ts @@ -9,9 +9,9 @@ export const config = { REDIS_PASSWORD: process.env.REDIS_PASSWORD ?? 'root', COINMARKETCAP_API_KEY: process.env.API_KEY_COINMARKETCAP ?? '', COINMARKETCAP_HOST: process.env.COINMARKETCAP_HOST ?? '', - DEBIO_ESCROW_PRIVATE_KEY: process.env.DEBIO_ESCROW_PRIVATE_KEY ?? '', + DEBIO_ESCROW_PRIVATE_KEY: process.env.DEBIO_ESCROW_PRIVATE_KEY ?? 'PRIVKEY', WEB3_RPC_HTTPS: process.env.WEB3_RPC_HTTPS ?? '', - ESCROW_CONTRACT_ADDRESS: process.env.ESCROW_CONTRACT_ADDRESS ?? '', + ESCROW_CONTRACT_ADDRESS: process.env.ESCROW_CONTRACT_ADDRESS ?? 'ADDR', ELASTICSEARCH_NODE: process.env.ELASTICSEARCH_NODE ?? '', ELASTICSEARCH_USERNAME: process.env.ELASTICSEARCH_USERNAME ?? '', ELASTICSEARCH_PASSWORD: process.env.ELASTICSEARCH_PASSWORD ?? '', @@ -21,7 +21,7 @@ export const config = { EMAIL: process.env.EMAIL ?? '', PASS_EMAIL: process.env.PASS_EMAIL ?? '', EMAILS: process.env.EMAILS ?? '', - SUBSTRATE_URL: process.env.SUBSTRATE_URL ?? '', + SUBSTRATE_URL: process.env.SUBSTRATE_URL ?? 'URL', ADMIN_SUBSTRATE_MNEMONIC: process.env.ADMIN_SUBSTRATE_MNEMONIC ?? '', BUCKET_NAME: process.env.BUCKET_NAME ?? '', STORAGE_BASE_URI: process.env.STORAGE_BASE_URI ?? '', diff --git a/test/unit/mock.ts b/test/unit/mock.ts index 586bd483..42aae5f4 100644 --- a/test/unit/mock.ts +++ b/test/unit/mock.ts @@ -23,7 +23,6 @@ import { CountryService } from '../../src/endpoints/location/country.service'; import { StateService } from '../../src/endpoints/location/state.service'; import { SchedulerRegistry } from '@nestjs/schedule'; import { NotificationService } from '../../src/common/modules/notification/notification.service'; -import { keyList } from '../../src/common/secrets'; export function mockFunction(args) {} // eslint-disable-line From 38dcab3b99b7893c9a5c64ce85a2485c54bd4842 Mon Sep 17 00:00:00 2001 From: RXRD Date: Mon, 19 Feb 2024 11:05:27 +0700 Subject: [PATCH 12/18] fix --- .../debio-conversion.service.spec.ts | 3 ++- .../common/modules/escrow/escrow.service.spec.ts | 5 +++-- .../modules/ethereum/ethereum.service.spec.ts | 5 +++-- .../modules/substrate/substrate.service.spec.ts | 5 +++-- .../substrate-endpoint.controller.spec.ts | 14 ++------------ .../verification/verification.controller.spec.ts | 9 +++++---- 6 files changed, 18 insertions(+), 23 deletions(-) diff --git a/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts b/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts index 0c557814..b6b095a2 100644 --- a/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts +++ b/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts @@ -5,6 +5,7 @@ import MockAdapter from 'axios-mock-adapter'; import { CACHE_MANAGER } from '@nestjs/common'; import { Cache } from 'cache-manager'; import { when } from 'jest-when'; +import { config } from '../../../../../src/config'; jest.mock('axios'); describe('Debio Conversion Service Unit Tests', () => { @@ -12,7 +13,7 @@ describe('Debio Conversion Service Unit Tests', () => { let cacheManager: Cache; const axiosMock = new MockAdapter(axios); - const API_KEY_COINMARKETCAP = 'API_KEY_COINMARKETCAP'; + const API_KEY_COINMARKETCAP = config.COINMARKETCAP_API_KEY; const SODAKI_HOST = 'SODAKI_HOST'; const COINMARKETCAP_HOST = 'COINMARKETCAP_HOST'; const REDIS_HOST = 'REDIS_HOST'; diff --git a/test/unit/common/modules/escrow/escrow.service.spec.ts b/test/unit/common/modules/escrow/escrow.service.spec.ts index 0476e953..89f2e569 100644 --- a/test/unit/common/modules/escrow/escrow.service.spec.ts +++ b/test/unit/common/modules/escrow/escrow.service.spec.ts @@ -8,12 +8,13 @@ import { import { EscrowService } from '../../../../../src/common/modules/escrow/escrow.service'; import { ethers } from 'ethers'; import { setOrderPaid } from '@debionetwork/polkadot-provider'; +import { config } from '../../../../../src/config'; jest.mock('@debionetwork/polkadot-provider', () => ({ setOrderPaid: jest.fn(), })); -const WALLET_ADDRESS = 'ADDR'; +const WALLET_ADDRESS = config.ESCROW_CONTRACT_ADDRESS; const ETHERS_PARSE_UNITS_MOCK = { tokenAmount: 'AMOUNT', }; @@ -38,7 +39,7 @@ describe('Escrow Service Unit Tests', () => { let substrateServiceMock: MockType; let ethereumServiceMock: MockType; - const DEBIO_ESCROW_PRIVATE_KEY = 'PRIVKEY'; + const DEBIO_ESCROW_PRIVATE_KEY = config.DEBIO_ESCROW_PRIVATE_KEY ; class GoogleSecretManagerServiceMock { _secretsList = new Map([ ['DEBIO_ESCROW_PRIVATE_KEY', DEBIO_ESCROW_PRIVATE_KEY], diff --git a/test/unit/common/modules/ethereum/ethereum.service.spec.ts b/test/unit/common/modules/ethereum/ethereum.service.spec.ts index 054321a0..464e6ab5 100644 --- a/test/unit/common/modules/ethereum/ethereum.service.spec.ts +++ b/test/unit/common/modules/ethereum/ethereum.service.spec.ts @@ -5,6 +5,7 @@ import { EthersContract, EthersSigner } from 'nestjs-ethers'; import ABI from '../../../../../src/common/modules/ethereum/utils/ABI.json'; import escrowContract from '../../../../../src/common/modules/ethereum/utils/Escrow.json'; import { ethers } from 'ethers'; +import { config } from '../../../../../src/config'; const PROVIDER_RESULT = 1; jest.mock('ethers', () => ({ @@ -41,8 +42,8 @@ describe.only('EthereumService', () => { createWallet: jest.fn(), })); - const WEB3_RPC_HTTPS = 'RPC'; - const ESCROW_CONTRACT_ADDRESS = 'ADDR'; + const WEB3_RPC_HTTPS = config.WEB3_RPC_HTTPS; + const ESCROW_CONTRACT_ADDRESS = config.ESCROW_CONTRACT_ADDRESS; class GoogleSecretManagerServiceMock { _secretsList = new Map([ diff --git a/test/unit/common/modules/substrate/substrate.service.spec.ts b/test/unit/common/modules/substrate/substrate.service.spec.ts index 8cb4eb12..909a0643 100644 --- a/test/unit/common/modules/substrate/substrate.service.spec.ts +++ b/test/unit/common/modules/substrate/substrate.service.spec.ts @@ -2,6 +2,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { mockFunction } from '../../../mock'; import { ProcessEnvProxy, SubstrateService } from '../../../../../src/common'; import { ApiPromise, Keyring } from '@polkadot/api'; +import { config } from '../../../../../src/config'; jest.mock('../../../mock', () => ({ mockFunction: jest.fn(), @@ -13,8 +14,8 @@ const keyringSpy = jest.spyOn(Keyring.prototype, 'addFromUri'); describe.only('Substrate Service Unit Test', () => { let substrateService: SubstrateService; - const SUBSTRATE_URL = 'URL'; - const ADMIN_SUBSTRATE_MNEMONIC = 'ADDR'; + const SUBSTRATE_URL = config.SUBSTRATE_URL; + const ADMIN_SUBSTRATE_MNEMONIC = config.ADMIN_SUBSTRATE_MNEMONIC; class GoogleSecretManagerServiceMock { _secretsList = new Map([ ['ADMIN_SUBSTRATE_MNEMONIC', ADMIN_SUBSTRATE_MNEMONIC], diff --git a/test/unit/endpoints/substrate-endpoint/substrate-endpoint.controller.spec.ts b/test/unit/endpoints/substrate-endpoint/substrate-endpoint.controller.spec.ts index d35b0cff..cb77f914 100644 --- a/test/unit/endpoints/substrate-endpoint/substrate-endpoint.controller.spec.ts +++ b/test/unit/endpoints/substrate-endpoint/substrate-endpoint.controller.spec.ts @@ -29,6 +29,7 @@ import { setGeneticAnalysisOrderPaid, adminSetEthAddress, } from '@debionetwork/polkadot-provider'; +import { config } from '../../../../src/config'; jest.mock('@debionetwork/polkadot-provider', () => ({ queryAccountIdByEthAddress: jest.fn(), @@ -53,7 +54,7 @@ describe('Substrate Endpoint Controller Unit Tests', () => { let geneticAnalysisMock: MockType; let geneticAnalysisOrderMock: MockType; - const DEBIO_API_KEY = 'KEY'; + const DEBIO_API_KEY = config.DEBIO_API_KEY.toString(); const labServiceMockFactory: () => MockType = jest.fn(() => ({ getByCountryCityCategory: jest.fn(), @@ -107,17 +108,6 @@ describe('Substrate Endpoint Controller Unit Tests', () => { getGeneticAnalysisOrderById: jest.fn(), })); - class GoogleSecretManagerServiceMock { - _secretsList = new Map([['DEBIO_API_KEY', DEBIO_API_KEY]]); - loadSecrets() { - return null; - } - - getSecret(key) { - return this._secretsList.get(key); - } - } - class SubstrateServiceMock { api = 'API'; pair = 'PAIR'; diff --git a/test/unit/endpoints/verification/verification.controller.spec.ts b/test/unit/endpoints/verification/verification.controller.spec.ts index 20fc497b..0db2823e 100644 --- a/test/unit/endpoints/verification/verification.controller.spec.ts +++ b/test/unit/endpoints/verification/verification.controller.spec.ts @@ -3,6 +3,7 @@ import { MockType } from '../../mock'; import { VerificationService } from '../../../../src/endpoints/verification/verification.service'; import { VerificationController } from '../../../../src/endpoints/verification/verification.controller'; import httpMocks = require('node-mocks-http'); +import { config } from '../../../../src/config'; describe('Verification Controller Unit Tests', () => { let verificationController: VerificationController; @@ -75,7 +76,7 @@ describe('Verification Controller Unit Tests', () => { // Arrange const EXPECTED_STATUS = 500; const EXPECTED_RESULT = "I just don't feel like it"; - const API_KEY = 'DEBIO_API_KEY'; + const API_KEY = config.DEBIO_API_KEY ; const ACCOUNT_ID = 'ACCOUT_ID'; const VERIFICATION_STATUS = 'VERIFICATION_STATUS'; verificationServiceMock.verificationLab.mockImplementation(() => @@ -101,7 +102,7 @@ describe('Verification Controller Unit Tests', () => { // Arrange const EXPECTED_STATUS = 500; const EXPECTED_RESULT = "I just don't feel like it"; - const API_KEY = 'DEBIO_API_KEY'; + const API_KEY = config.DEBIO_API_KEY ; const ACCOUNT_ID = 'ACCOUT_ID'; const VERIFICATION_STATUS = 'VERIFICATION_STATUS'; verificationServiceMock.verificationGeneticAnalyst.mockImplementation(() => @@ -127,7 +128,7 @@ describe('Verification Controller Unit Tests', () => { // Arrange const EXPECTED_STATUS = 200; const EXPECTED_RESULT = 'Verified, and Got Reward 2 DBIO'; - const API_KEY = 'DEBIO_API_KEY'; + const API_KEY = config.DEBIO_API_KEY ; const ACCOUNT_ID = 'ACCOUT_ID'; const VERIFICATION_STATUS = 'Verified'; @@ -150,7 +151,7 @@ describe('Verification Controller Unit Tests', () => { // Arrange const EXPECTED_STATUS = 200; const EXPECTED_RESULT = 'Verified'; - const API_KEY = 'DEBIO_API_KEY'; + const API_KEY = config.DEBIO_API_KEY; const ACCOUNT_ID = 'ACCOUT_ID'; const VERIFICATION_STATUS = 'Verified'; From 708bd4eeda89cb20ba58d6340a11a4966ef6775b Mon Sep 17 00:00:00 2001 From: RXRD Date: Mon, 19 Feb 2024 11:19:40 +0700 Subject: [PATCH 13/18] fix --- .../modules/debio-conversion/debio-conversion.service.spec.ts | 2 +- test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts b/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts index b6b095a2..9a127dbf 100644 --- a/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts +++ b/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts @@ -98,7 +98,7 @@ describe('Debio Conversion Service Unit Tests', () => { // Arrange const httpGetSpy = jest.spyOn(axios, 'get'); const RESULT = 1; - const API_KEY = 'KEY'; + const API_KEY = config.COINMARKETCAP_API_KEY; const BALANCE_AMOUNT = 1; const FROM = 'USN'; const TO = 'USDT'; diff --git a/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts b/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts index f6ed1018..26e081b5 100644 --- a/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts +++ b/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts @@ -3,12 +3,13 @@ import { Response } from 'express'; import MockAdapter from 'axios-mock-adapter'; import { TestingModule, Test } from '@nestjs/testing'; import { RecaptchaController } from '../../../../src/endpoints/recaptcha/recaptcha.controller'; +import { config } from '../../../../src/config'; describe('Recaptcha Controller Unit Tests', () => { let recaptchaController: RecaptchaController; const axiosMock = new MockAdapter(axios); - const RECAPTCHA_SECRET_KEY = 'KEY'; + const RECAPTCHA_SECRET_KEY = config.RECAPTCHA_SECRET_KEY; class GoogleSecretManagerServiceMock { _secretsList = new Map([ ['RECAPTCHA_SECRET_KEY', RECAPTCHA_SECRET_KEY], From 0409f12873782ce8edf0047effcdad8eb643cb12 Mon Sep 17 00:00:00 2001 From: RXRD Date: Mon, 19 Feb 2024 11:20:37 +0700 Subject: [PATCH 14/18] fix --- test/unit/common/modules/escrow/escrow.service.spec.ts | 2 +- .../endpoints/verification/verification.controller.spec.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unit/common/modules/escrow/escrow.service.spec.ts b/test/unit/common/modules/escrow/escrow.service.spec.ts index 89f2e569..254d3b50 100644 --- a/test/unit/common/modules/escrow/escrow.service.spec.ts +++ b/test/unit/common/modules/escrow/escrow.service.spec.ts @@ -39,7 +39,7 @@ describe('Escrow Service Unit Tests', () => { let substrateServiceMock: MockType; let ethereumServiceMock: MockType; - const DEBIO_ESCROW_PRIVATE_KEY = config.DEBIO_ESCROW_PRIVATE_KEY ; + const DEBIO_ESCROW_PRIVATE_KEY = config.DEBIO_ESCROW_PRIVATE_KEY; class GoogleSecretManagerServiceMock { _secretsList = new Map([ ['DEBIO_ESCROW_PRIVATE_KEY', DEBIO_ESCROW_PRIVATE_KEY], diff --git a/test/unit/endpoints/verification/verification.controller.spec.ts b/test/unit/endpoints/verification/verification.controller.spec.ts index 0db2823e..c924f3ee 100644 --- a/test/unit/endpoints/verification/verification.controller.spec.ts +++ b/test/unit/endpoints/verification/verification.controller.spec.ts @@ -76,7 +76,7 @@ describe('Verification Controller Unit Tests', () => { // Arrange const EXPECTED_STATUS = 500; const EXPECTED_RESULT = "I just don't feel like it"; - const API_KEY = config.DEBIO_API_KEY ; + const API_KEY = config.DEBIO_API_KEY; const ACCOUNT_ID = 'ACCOUT_ID'; const VERIFICATION_STATUS = 'VERIFICATION_STATUS'; verificationServiceMock.verificationLab.mockImplementation(() => @@ -102,7 +102,7 @@ describe('Verification Controller Unit Tests', () => { // Arrange const EXPECTED_STATUS = 500; const EXPECTED_RESULT = "I just don't feel like it"; - const API_KEY = config.DEBIO_API_KEY ; + const API_KEY = config.DEBIO_API_KEY; const ACCOUNT_ID = 'ACCOUT_ID'; const VERIFICATION_STATUS = 'VERIFICATION_STATUS'; verificationServiceMock.verificationGeneticAnalyst.mockImplementation(() => @@ -128,7 +128,7 @@ describe('Verification Controller Unit Tests', () => { // Arrange const EXPECTED_STATUS = 200; const EXPECTED_RESULT = 'Verified, and Got Reward 2 DBIO'; - const API_KEY = config.DEBIO_API_KEY ; + const API_KEY = config.DEBIO_API_KEY; const ACCOUNT_ID = 'ACCOUT_ID'; const VERIFICATION_STATUS = 'Verified'; From 19028b053c2d3fa9c034db344fc4bd9374de08ca Mon Sep 17 00:00:00 2001 From: RXRD Date: Tue, 20 Feb 2024 10:20:50 +0700 Subject: [PATCH 15/18] fix --- src/config.ts | 2 +- .../modules/debio-conversion/debio-conversion.service.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.ts b/src/config.ts index edfc62e7..6c7ecf46 100644 --- a/src/config.ts +++ b/src/config.ts @@ -8,7 +8,7 @@ export const config = { REDIS_PORT: process.env.PORT_REDIS ?? '6379', REDIS_PASSWORD: process.env.REDIS_PASSWORD ?? 'root', COINMARKETCAP_API_KEY: process.env.API_KEY_COINMARKETCAP ?? '', - COINMARKETCAP_HOST: process.env.COINMARKETCAP_HOST ?? '', + COINMARKETCAP_HOST: process.env.COINMARKETCAP_HOST ?? 'https://pro-api.coinmarketcap.com/v2', DEBIO_ESCROW_PRIVATE_KEY: process.env.DEBIO_ESCROW_PRIVATE_KEY ?? 'PRIVKEY', WEB3_RPC_HTTPS: process.env.WEB3_RPC_HTTPS ?? '', ESCROW_CONTRACT_ADDRESS: process.env.ESCROW_CONTRACT_ADDRESS ?? 'ADDR', diff --git a/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts b/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts index 9a127dbf..6809ddf6 100644 --- a/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts +++ b/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts @@ -15,7 +15,7 @@ describe('Debio Conversion Service Unit Tests', () => { const API_KEY_COINMARKETCAP = config.COINMARKETCAP_API_KEY; const SODAKI_HOST = 'SODAKI_HOST'; - const COINMARKETCAP_HOST = 'COINMARKETCAP_HOST'; + const COINMARKETCAP_HOST = config.COINMARKETCAP_HOST; const REDIS_HOST = 'REDIS_HOST'; const REDIS_PORT = 'REDIS_PORT'; const REDIS_PASSWORD = 'REDIS_PASSWORD'; From 023b314a7a4b6a6251979cc5bc467058297d5efc Mon Sep 17 00:00:00 2001 From: RXRD Date: Tue, 20 Feb 2024 10:21:20 +0700 Subject: [PATCH 16/18] Update debio-conversion.service.spec.ts --- .../debio-conversion.service.spec.ts | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts b/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts index 6809ddf6..e3df6047 100644 --- a/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts +++ b/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts @@ -19,23 +19,6 @@ describe('Debio Conversion Service Unit Tests', () => { const REDIS_HOST = 'REDIS_HOST'; const REDIS_PORT = 'REDIS_PORT'; const REDIS_PASSWORD = 'REDIS_PASSWORD'; - class GoogleSecretManagerServiceMock { - _secretsList = new Map([ - ['API_KEY_COINMARKETCAP', API_KEY_COINMARKETCAP], - ['SODAKI_HOST', SODAKI_HOST], - ['COINMARKETCAP_HOST', COINMARKETCAP_HOST], - ['REDIS_HOST', REDIS_HOST], - ['REDIS_PORT', REDIS_PORT], - ['REDIS_PASSWORD', REDIS_PASSWORD], - ]); - loadSecrets() { - return null; - } - - getSecret(key) { - return this._secretsList.get(key); - } - } // Arrange before each iteration beforeEach(async () => { From ee61e2d0d4a7d967bb5453f8919e84a18be4f02b Mon Sep 17 00:00:00 2001 From: RXRD Date: Tue, 20 Feb 2024 10:29:29 +0700 Subject: [PATCH 17/18] fix --- src/common/modules/mailer/mailer.manager.ts | 5 +---- src/config.ts | 3 ++- test/e2e/endpoints/recaptcha.spec.ts | 15 --------------- .../debio-conversion.service.spec.ts | 5 ----- .../common/modules/escrow/escrow.service.spec.ts | 12 ------------ .../modules/ethereum/ethereum.service.spec.ts | 14 -------------- .../common/modules/mailer/mailer.manager.spec.ts | 11 ----------- .../modules/substrate/substrate.service.spec.ts | 13 ------------- .../recaptcha/recaptcha.controller.spec.ts | 12 ------------ .../verification/verification.controller.spec.ts | 13 ------------- 10 files changed, 3 insertions(+), 100 deletions(-) diff --git a/src/common/modules/mailer/mailer.manager.ts b/src/common/modules/mailer/mailer.manager.ts index bcafbbf7..4dc4e459 100644 --- a/src/common/modules/mailer/mailer.manager.ts +++ b/src/common/modules/mailer/mailer.manager.ts @@ -17,10 +17,7 @@ export class MailerManager { to: string | string[], context: CustomerStakingRequestService, ) { - let subject = `New Service Request - ${context.service_name} - ${context.city}, ${context.state}, ${context.country}`; - if (config.POSTGRES_HOST == 'localhost') { - subject = `Testing New Service Request Email`; - } + const subject = `New Service Request - ${context.service_name} - ${context.city}, ${context.state}, ${context.country}`; this.mailerService.sendMail({ to: to, subject: subject, diff --git a/src/config.ts b/src/config.ts index 6c7ecf46..06d2ee94 100644 --- a/src/config.ts +++ b/src/config.ts @@ -8,7 +8,8 @@ export const config = { REDIS_PORT: process.env.PORT_REDIS ?? '6379', REDIS_PASSWORD: process.env.REDIS_PASSWORD ?? 'root', COINMARKETCAP_API_KEY: process.env.API_KEY_COINMARKETCAP ?? '', - COINMARKETCAP_HOST: process.env.COINMARKETCAP_HOST ?? 'https://pro-api.coinmarketcap.com/v2', + COINMARKETCAP_HOST: + process.env.COINMARKETCAP_HOST ?? 'https://pro-api.coinmarketcap.com/v2', DEBIO_ESCROW_PRIVATE_KEY: process.env.DEBIO_ESCROW_PRIVATE_KEY ?? 'PRIVKEY', WEB3_RPC_HTTPS: process.env.WEB3_RPC_HTTPS ?? '', ESCROW_CONTRACT_ADDRESS: process.env.ESCROW_CONTRACT_ADDRESS ?? 'ADDR', diff --git a/test/e2e/endpoints/recaptcha.spec.ts b/test/e2e/endpoints/recaptcha.spec.ts index 80e10fbe..b44479e3 100644 --- a/test/e2e/endpoints/recaptcha.spec.ts +++ b/test/e2e/endpoints/recaptcha.spec.ts @@ -13,21 +13,6 @@ describe('Recaptcha Controller (e2e)', () => { let app: INestApplication; const RECAPTCHA_SECRET_KEY = 'KEY'; - class GoogleSecretManagerServiceMock { - _secretsList = new Map([ - ['RECAPTCHA_SECRET_KEY', RECAPTCHA_SECRET_KEY], - ['REDIS_HOST', process.env.HOST_REDIS], - ['REDIS_PORT', process.env.PORT_REDIS], - ['REDIS_PASSWORD', process.env.REDIS_PASSWORD], - ]); - loadSecrets() { - return null; - } - - getSecret(key) { - return this._secretsList.get(key); - } - } beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ diff --git a/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts b/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts index e3df6047..3c893863 100644 --- a/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts +++ b/test/unit/common/modules/debio-conversion/debio-conversion.service.spec.ts @@ -13,12 +13,7 @@ describe('Debio Conversion Service Unit Tests', () => { let cacheManager: Cache; const axiosMock = new MockAdapter(axios); - const API_KEY_COINMARKETCAP = config.COINMARKETCAP_API_KEY; - const SODAKI_HOST = 'SODAKI_HOST'; const COINMARKETCAP_HOST = config.COINMARKETCAP_HOST; - const REDIS_HOST = 'REDIS_HOST'; - const REDIS_PORT = 'REDIS_PORT'; - const REDIS_PASSWORD = 'REDIS_PASSWORD'; // Arrange before each iteration beforeEach(async () => { diff --git a/test/unit/common/modules/escrow/escrow.service.spec.ts b/test/unit/common/modules/escrow/escrow.service.spec.ts index 254d3b50..1bf7d04f 100644 --- a/test/unit/common/modules/escrow/escrow.service.spec.ts +++ b/test/unit/common/modules/escrow/escrow.service.spec.ts @@ -40,18 +40,6 @@ describe('Escrow Service Unit Tests', () => { let ethereumServiceMock: MockType; const DEBIO_ESCROW_PRIVATE_KEY = config.DEBIO_ESCROW_PRIVATE_KEY; - class GoogleSecretManagerServiceMock { - _secretsList = new Map([ - ['DEBIO_ESCROW_PRIVATE_KEY', DEBIO_ESCROW_PRIVATE_KEY], - ]); - loadSecrets() { - return null; - } - - getSecret(key) { - return this._secretsList.get(key); - } - } beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ diff --git a/test/unit/common/modules/ethereum/ethereum.service.spec.ts b/test/unit/common/modules/ethereum/ethereum.service.spec.ts index 464e6ab5..0d315b8e 100644 --- a/test/unit/common/modules/ethereum/ethereum.service.spec.ts +++ b/test/unit/common/modules/ethereum/ethereum.service.spec.ts @@ -45,20 +45,6 @@ describe.only('EthereumService', () => { const WEB3_RPC_HTTPS = config.WEB3_RPC_HTTPS; const ESCROW_CONTRACT_ADDRESS = config.ESCROW_CONTRACT_ADDRESS; - class GoogleSecretManagerServiceMock { - _secretsList = new Map([ - ['WEB3_RPC_HTTPS', WEB3_RPC_HTTPS], - ['ESCROW_CONTRACT_ADDRESS', ESCROW_CONTRACT_ADDRESS], - ]); - loadSecrets() { - return null; - } - - getSecret(key) { - return this._secretsList.get(key); - } - } - beforeAll(async () => { const module: TestingModule = await Test.createTestingModule({ providers: [ diff --git a/test/unit/common/modules/mailer/mailer.manager.spec.ts b/test/unit/common/modules/mailer/mailer.manager.spec.ts index 3b73824d..af7fa73f 100644 --- a/test/unit/common/modules/mailer/mailer.manager.spec.ts +++ b/test/unit/common/modules/mailer/mailer.manager.spec.ts @@ -8,17 +8,6 @@ describe('Mailer Manager Unit Tests', () => { let mailerManager: MailerManager; let mailerServiceMock: MockType; - class GoogleSecretManagerServiceMock { - _secretsList = new Map([['POSTGRES_HOST', '']]); - loadSecrets() { - return null; - } - - getSecret(key) { - return this._secretsList.get(key); - } - } - // Arrange before each iteration beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ diff --git a/test/unit/common/modules/substrate/substrate.service.spec.ts b/test/unit/common/modules/substrate/substrate.service.spec.ts index 909a0643..a3edb049 100644 --- a/test/unit/common/modules/substrate/substrate.service.spec.ts +++ b/test/unit/common/modules/substrate/substrate.service.spec.ts @@ -16,19 +16,6 @@ describe.only('Substrate Service Unit Test', () => { const SUBSTRATE_URL = config.SUBSTRATE_URL; const ADMIN_SUBSTRATE_MNEMONIC = config.ADMIN_SUBSTRATE_MNEMONIC; - class GoogleSecretManagerServiceMock { - _secretsList = new Map([ - ['ADMIN_SUBSTRATE_MNEMONIC', ADMIN_SUBSTRATE_MNEMONIC], - ['SUBSTRATE_URL', SUBSTRATE_URL], - ]); - loadSecrets() { - return null; - } - - getSecret(key) { - return this._secretsList.get(key); - } - } class ProcessEnvProxyMock { env = { diff --git a/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts b/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts index 26e081b5..c4655f4c 100644 --- a/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts +++ b/test/unit/endpoints/recaptcha/recaptcha.controller.spec.ts @@ -10,18 +10,6 @@ describe('Recaptcha Controller Unit Tests', () => { const axiosMock = new MockAdapter(axios); const RECAPTCHA_SECRET_KEY = config.RECAPTCHA_SECRET_KEY; - class GoogleSecretManagerServiceMock { - _secretsList = new Map([ - ['RECAPTCHA_SECRET_KEY', RECAPTCHA_SECRET_KEY], - ]); - loadSecrets() { - return null; - } - - getSecret(key) { - return this._secretsList.get(key); - } - } beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ diff --git a/test/unit/endpoints/verification/verification.controller.spec.ts b/test/unit/endpoints/verification/verification.controller.spec.ts index c924f3ee..2697e1a1 100644 --- a/test/unit/endpoints/verification/verification.controller.spec.ts +++ b/test/unit/endpoints/verification/verification.controller.spec.ts @@ -15,19 +15,6 @@ describe('Verification Controller Unit Tests', () => { })); let verificationServiceMock: MockType; - class GoogleSecretManagerServiceMock { - _secretsList = new Map([ - ['DEBIO_API_KEY', 'DEBIO_API_KEY'], - ]); - loadSecrets() { - return null; - } - - getSecret(key) { - return this._secretsList.get(key); - } - } - // Arrange before each iteration beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ From d08e7b679f2c0b778caf80f6837d3f55ce02caa4 Mon Sep 17 00:00:00 2001 From: RXRD Date: Tue, 20 Feb 2024 10:32:04 +0700 Subject: [PATCH 18/18] Update mailer.manager.ts --- src/common/modules/mailer/mailer.manager.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/common/modules/mailer/mailer.manager.ts b/src/common/modules/mailer/mailer.manager.ts index 4dc4e459..e4ee85a9 100644 --- a/src/common/modules/mailer/mailer.manager.ts +++ b/src/common/modules/mailer/mailer.manager.ts @@ -67,10 +67,7 @@ export class MailerManager { } async sendLabRegistrationEmail(to: string | string[], context: LabRegister) { - let subject = `New Lab Register – ${context.lab_name} - ${context.city}, ${context.state}, ${context.country}`; - if (config.POSTGRES_HOST == 'localhost') { - subject = `Testing New Lab Register Email`; - } + const subject = `New Lab Register – ${context.lab_name} - ${context.city}, ${context.state}, ${context.country}`; const files: any[] = []; context.certifications.forEach((val, idx) => { files.push({