From 17bb07b05ff5fb98879dd3b8699c81bdd0780798 Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Wed, 19 Jun 2024 17:47:03 +0530 Subject: [PATCH 01/11] wip: nats configuration Signed-off-by: bhavanakarwade --- libs/common/src/nats.config.ts | 38 ++++++++++++++++++++++++++++------ libs/enum/src/enum.ts | 5 +++++ 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/libs/common/src/nats.config.ts b/libs/common/src/nats.config.ts index 3af2b867f..1504c11bf 100644 --- a/libs/common/src/nats.config.ts +++ b/libs/common/src/nats.config.ts @@ -1,13 +1,39 @@ +import { NATSReconnects } from '@credebl/enum/enum'; import { Authenticator, nkeyAuthenticator } from 'nats'; +// export const getNatsOptions = ( +// nkeySeed?: string +// ): { +// servers: string[]; +// authenticator?: Authenticator; +// } => nkeySeed +// ? { +// servers: [`${process.env.NATS_URL}`], +// authenticator: nkeyAuthenticator(new TextEncoder().encode(nkeySeed)) +// } +// : { servers: [`${process.env.NATS_URL}`] }; + + export const getNatsOptions = ( nkeySeed?: string ): { servers: string[]; authenticator?: Authenticator; -} => nkeySeed -? { - servers: [`${process.env.NATS_URL}`], - authenticator: nkeyAuthenticator(new TextEncoder().encode(nkeySeed)) - } - : { servers: [`${process.env.NATS_URL}`] }; + maxReconnectAttempts: NATSReconnects; + reconnectTimeWait: NATSReconnects; +} => { + const baseOptions = { + servers: [`${process.env.NATS_URL}`], + maxReconnectAttempts: NATSReconnects.maxReconnectAttempts, + reconnectTimeWait: NATSReconnects.reconnectTimeWait + }; + + if (nkeySeed) { + return { + ...baseOptions, + authenticator: nkeyAuthenticator(new TextEncoder().encode(nkeySeed)) + }; + } + + return baseOptions; +}; \ No newline at end of file diff --git a/libs/enum/src/enum.ts b/libs/enum/src/enum.ts index 6452092e0..cc0b5399d 100644 --- a/libs/enum/src/enum.ts +++ b/libs/enum/src/enum.ts @@ -1,3 +1,8 @@ +export enum NATSReconnects { + maxReconnectAttempts = (10 * 60) / 5, // 110 minutes with a reconnection attempt every 5 seconds + reconnectTimeWait = 5000 // 5 second delay between reconnection attempts +} + export enum SortValue { ASC = 'asc', DESC = 'desc' From cb44956f22e4c7a0f5b66e209c4cc8e1302e4c25 Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Thu, 20 Jun 2024 10:41:08 +0530 Subject: [PATCH 02/11] refactor: nats config function Signed-off-by: bhavanakarwade --- libs/common/src/nats.config.ts | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/libs/common/src/nats.config.ts b/libs/common/src/nats.config.ts index 1504c11bf..41f02891e 100644 --- a/libs/common/src/nats.config.ts +++ b/libs/common/src/nats.config.ts @@ -1,19 +1,6 @@ import { NATSReconnects } from '@credebl/enum/enum'; import { Authenticator, nkeyAuthenticator } from 'nats'; -// export const getNatsOptions = ( -// nkeySeed?: string -// ): { -// servers: string[]; -// authenticator?: Authenticator; -// } => nkeySeed -// ? { -// servers: [`${process.env.NATS_URL}`], -// authenticator: nkeyAuthenticator(new TextEncoder().encode(nkeySeed)) -// } -// : { servers: [`${process.env.NATS_URL}`] }; - - export const getNatsOptions = ( nkeySeed?: string ): { @@ -23,7 +10,7 @@ export const getNatsOptions = ( reconnectTimeWait: NATSReconnects; } => { const baseOptions = { - servers: [`${process.env.NATS_URL}`], + servers: `${process.env.NATS_URL}`.split(','), maxReconnectAttempts: NATSReconnects.maxReconnectAttempts, reconnectTimeWait: NATSReconnects.reconnectTimeWait }; @@ -36,4 +23,5 @@ export const getNatsOptions = ( } return baseOptions; -}; \ No newline at end of file +}; + From c265b0102e7bcf9bfdfd5c14ec4502233b021780 Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Thu, 20 Jun 2024 15:12:57 +0530 Subject: [PATCH 03/11] wip: implemented nats queue functionality Signed-off-by: bhavanakarwade --- .../src/agent-provisioning.module.ts | 3 ++- apps/agent-provisioning/src/main.ts | 3 ++- apps/api-gateway/src/main.ts | 3 ++- apps/connection/src/main.ts | 3 ++- apps/ecosystem/src/main.ts | 3 ++- apps/issuance/src/main.ts | 3 ++- apps/ledger/src/main.ts | 3 ++- apps/notification/src/main.ts | 3 ++- apps/organization/src/main.ts | 3 ++- apps/utility/src/main.ts | 3 ++- apps/verification/src/main.ts | 3 ++- apps/webhook/src/main.ts | 3 ++- libs/common/src/common.constant.ts | 17 ++++++++++++++++- libs/common/src/nats.config.ts | 6 ++++-- libs/enum/src/enum.ts | 2 +- 15 files changed, 45 insertions(+), 16 deletions(-) diff --git a/apps/agent-provisioning/src/agent-provisioning.module.ts b/apps/agent-provisioning/src/agent-provisioning.module.ts index ba467e06d..7df02d00a 100644 --- a/apps/agent-provisioning/src/agent-provisioning.module.ts +++ b/apps/agent-provisioning/src/agent-provisioning.module.ts @@ -4,6 +4,7 @@ import { AgentProvisioningService } from './agent-provisioning.service'; import { ClientsModule, Transport } from '@nestjs/microservices'; import { ConfigModule } from '@nestjs/config'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ ConfigModule.forRoot(), @@ -11,7 +12,7 @@ import { getNatsOptions } from '@credebl/common/nats.config'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.AGENT_PROVISIONING_NKEY_SEED) + options: getNatsOptions(process.env.AGENT_PROVISIONING_NKEY_SEED, CommonConstants.AGENT_PROVISIONING) } ]) diff --git a/apps/agent-provisioning/src/main.ts b/apps/agent-provisioning/src/main.ts index f0c623640..820fb2533 100644 --- a/apps/agent-provisioning/src/main.ts +++ b/apps/agent-provisioning/src/main.ts @@ -4,13 +4,14 @@ import { Logger } from '@nestjs/common'; import { MicroserviceOptions, Transport } from '@nestjs/microservices'; import { AgentProvisioningModule } from './agent-provisioning.module'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; const logger = new Logger(); async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(AgentProvisioningModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.AGENT_PROVISIONING_NKEY_SEED) + options: getNatsOptions(process.env.AGENT_PROVISIONING_NKEY_SEED, CommonConstants.AGENT_PROVISIONING) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/api-gateway/src/main.ts b/apps/api-gateway/src/main.ts index aafe38b14..e615f7d34 100644 --- a/apps/api-gateway/src/main.ts +++ b/apps/api-gateway/src/main.ts @@ -12,6 +12,7 @@ import { getNatsOptions } from '@credebl/common/nats.config'; import helmet from 'helmet'; import { NodeEnvironment } from '@credebl/enum/enum'; +import { CommonConstants } from '@credebl/common/common.constant'; dotenv.config(); async function bootstrap(): Promise { @@ -24,7 +25,7 @@ async function bootstrap(): Promise { app.connectMicroservice({ transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.API_GATEWAY_SERVICE) }); const expressApp = app.getHttpAdapter().getInstance(); diff --git a/apps/connection/src/main.ts b/apps/connection/src/main.ts index b92f88d1e..8b26a9c2a 100644 --- a/apps/connection/src/main.ts +++ b/apps/connection/src/main.ts @@ -4,6 +4,7 @@ import { HttpExceptionFilter } from 'libs/http-exception.filter'; import { Logger } from '@nestjs/common'; import { MicroserviceOptions, Transport } from '@nestjs/microservices'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; const logger = new Logger(); @@ -11,7 +12,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(ConnectionModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.CONNECTION_NKEY_SEED) + options: getNatsOptions(process.env.CONNECTION_NKEY_SEED, CommonConstants.CONNECTION_SERVICE) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/ecosystem/src/main.ts b/apps/ecosystem/src/main.ts index 47a5e9775..7336d201b 100644 --- a/apps/ecosystem/src/main.ts +++ b/apps/ecosystem/src/main.ts @@ -4,6 +4,7 @@ import { HttpExceptionFilter } from 'libs/http-exception.filter'; import { Logger } from '@nestjs/common'; import { MicroserviceOptions, Transport } from '@nestjs/microservices'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; const logger = new Logger(); @@ -11,7 +12,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(EcosystemModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.ECOSYSTEM_NKEY_SEED) + options: getNatsOptions(process.env.ECOSYSTEM_NKEY_SEED, CommonConstants.ECOSYSTEM_SERVICE) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/issuance/src/main.ts b/apps/issuance/src/main.ts index d48f23f02..5acf82785 100644 --- a/apps/issuance/src/main.ts +++ b/apps/issuance/src/main.ts @@ -4,6 +4,7 @@ import { Logger } from '@nestjs/common'; import { MicroserviceOptions, Transport } from '@nestjs/microservices'; import { IssuanceModule } from '../src/issuance.module'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; const logger = new Logger(); @@ -11,7 +12,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(IssuanceModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.ISSUANCE_NKEY_SEED) + options: getNatsOptions(process.env.ISSUANCE_NKEY_SEED, CommonConstants.ISSUANCE_SERVICE) }); diff --git a/apps/ledger/src/main.ts b/apps/ledger/src/main.ts index 00d5623f1..14b01b8d6 100644 --- a/apps/ledger/src/main.ts +++ b/apps/ledger/src/main.ts @@ -4,12 +4,13 @@ import { HttpExceptionFilter } from 'libs/http-exception.filter'; import { Logger } from '@nestjs/common'; import { MicroserviceOptions, Transport } from '@nestjs/microservices'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(LedgerModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.LEDGER_NKEY_SEED) + options: getNatsOptions(process.env.LEDGER_NKEY_SEED, CommonConstants.LEDGER_SERVICE) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/notification/src/main.ts b/apps/notification/src/main.ts index 0b4b87bf8..df74164ed 100644 --- a/apps/notification/src/main.ts +++ b/apps/notification/src/main.ts @@ -4,6 +4,7 @@ import { Logger } from '@nestjs/common'; import { MicroserviceOptions, Transport } from '@nestjs/microservices'; import { NotificationModule } from '../src/notification.module'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; const logger = new Logger(); @@ -11,7 +12,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(NotificationModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.NOTIFICATION_NKEY_SEED) + options: getNatsOptions(process.env.NOTIFICATION_NKEY_SEED, CommonConstants.NOTIFICATION_SERVICE) }); diff --git a/apps/organization/src/main.ts b/apps/organization/src/main.ts index c23f7e9f1..1efd06a6b 100644 --- a/apps/organization/src/main.ts +++ b/apps/organization/src/main.ts @@ -5,6 +5,7 @@ import { OrganizationModule } from './organization.module'; import { MicroserviceOptions, Transport } from '@nestjs/microservices'; // import { nkeyAuthenticator } from 'nats'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; const logger = new Logger(); @@ -12,7 +13,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(OrganizationModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.ORGANIZATION_NKEY_SEED) + options: getNatsOptions(process.env.ORGANIZATION_NKEY_SEED, CommonConstants.ORGANIZATION_SERVICE) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/utility/src/main.ts b/apps/utility/src/main.ts index 4de5fd578..c4ad00d6e 100644 --- a/apps/utility/src/main.ts +++ b/apps/utility/src/main.ts @@ -4,6 +4,7 @@ import { NestFactory } from '@nestjs/core'; import { MicroserviceOptions, Transport } from '@nestjs/microservices'; import { getNatsOptions } from '@credebl/common/nats.config'; import { UtilitiesModule } from './utilities.module'; +import { CommonConstants } from '@credebl/common/common.constant'; const logger = new Logger(); @@ -11,7 +12,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(UtilitiesModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.UTILITIES_NKEY_SEED) + options: getNatsOptions(process.env.UTILITIES_NKEY_SEED, CommonConstants.UTILITY_SERVICE) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/verification/src/main.ts b/apps/verification/src/main.ts index 7c0bcf689..493bb5ca3 100644 --- a/apps/verification/src/main.ts +++ b/apps/verification/src/main.ts @@ -4,6 +4,7 @@ import { Logger } from '@nestjs/common'; import { MicroserviceOptions, Transport } from '@nestjs/microservices'; import { VerificationModule } from './verification.module'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; const logger = new Logger(); @@ -11,7 +12,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(VerificationModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.VERIFICATION_NKEY_SEED) + options: getNatsOptions(process.env.VERIFICATION_NKEY_SEED, CommonConstants.VERIFICATION_SERVICE) }); diff --git a/apps/webhook/src/main.ts b/apps/webhook/src/main.ts index d5a7010a9..789ed2e3f 100644 --- a/apps/webhook/src/main.ts +++ b/apps/webhook/src/main.ts @@ -4,6 +4,7 @@ import { Logger } from '@nestjs/common'; import { MicroserviceOptions, Transport } from '@nestjs/microservices'; import { WebhookModule } from '../src/webhook.module'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; const logger = new Logger(); @@ -11,7 +12,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(WebhookModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.ISSUANCE_NKEY_SEED) + options: getNatsOptions(process.env.ISSUANCE_NKEY_SEED, CommonConstants.WEBHOOK_SERVICE) }); diff --git a/libs/common/src/common.constant.ts b/libs/common/src/common.constant.ts index 63734592f..ac74dfd31 100644 --- a/libs/common/src/common.constant.ts +++ b/libs/common/src/common.constant.ts @@ -323,7 +323,22 @@ export enum CommonConstants { //CacheInfo CACHE_SHARED_APIKEY_KEY = "dedicatedApiKey", CACHE_APIKEY_KEY = "sharedApiKey", -CACHE_TTL_SECONDS = 604800 +CACHE_TTL_SECONDS = 604800, + +// MICROSERVICES NAMES +API_GATEWAY_SERVICE = 'api-gateway', +ORGANIZATION_SERVICE = 'organization', +USER_SERVICE = 'user', +UTILITY_SERVICE = 'utilitites', +CONNECTION_SERVICE = 'connection', +LEDGER_SERVICE = 'ledger', +AGENT_SERVICE = 'agent-service', +AGENT_PROVISIONING = 'agent-provisioning', +ISSUANCE_SERVICE = 'issuance', +VERIFICATION_SERVICE = 'verification', +ECOSYSTEM_SERVICE = 'ecosystem', +WEBHOOK_SERVICE = 'webhook', +NOTIFICATION_SERVICE = 'notification' } export const postgresqlErrorCodes = []; diff --git a/libs/common/src/nats.config.ts b/libs/common/src/nats.config.ts index 41f02891e..c3e2a5ca1 100644 --- a/libs/common/src/nats.config.ts +++ b/libs/common/src/nats.config.ts @@ -2,12 +2,13 @@ import { NATSReconnects } from '@credebl/enum/enum'; import { Authenticator, nkeyAuthenticator } from 'nats'; export const getNatsOptions = ( - nkeySeed?: string + nkeySeed?: string, serviceName?: string ): { servers: string[]; authenticator?: Authenticator; maxReconnectAttempts: NATSReconnects; reconnectTimeWait: NATSReconnects; + queue?: string; } => { const baseOptions = { servers: `${process.env.NATS_URL}`.split(','), @@ -18,7 +19,8 @@ export const getNatsOptions = ( if (nkeySeed) { return { ...baseOptions, - authenticator: nkeyAuthenticator(new TextEncoder().encode(nkeySeed)) + authenticator: nkeyAuthenticator(new TextEncoder().encode(nkeySeed)), + queue: serviceName }; } diff --git a/libs/enum/src/enum.ts b/libs/enum/src/enum.ts index 119743b8b..16525d32e 100644 --- a/libs/enum/src/enum.ts +++ b/libs/enum/src/enum.ts @@ -1,5 +1,5 @@ export enum NATSReconnects { - maxReconnectAttempts = (10 * 60) / 5, // 110 minutes with a reconnection attempt every 5 seconds + maxReconnectAttempts = (10 * 60) / 5, // 10 minutes with a reconnection attempt every 5 seconds reconnectTimeWait = 5000 // 5 second delay between reconnection attempts } From 5f5f1c07f873c90df6f0cd79a2dcef2720a30138 Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Thu, 20 Jun 2024 19:44:05 +0530 Subject: [PATCH 04/11] wip: implemented nats queue functionality Signed-off-by: bhavanakarwade --- apps/agent-service/src/agent-service.module.ts | 3 ++- apps/agent-service/src/main.ts | 2 +- .../src/agent-service/agent-service.module.ts | 3 ++- apps/api-gateway/src/authz/authz.module.ts | 3 ++- .../src/connection/connection.module.ts | 3 ++- .../credential-definition.module.ts | 3 ++- .../src/ecosystem/ecosystem.module.ts | 3 ++- apps/api-gateway/src/fido/fido.module.ts | 3 ++- .../src/issuance/issuance.module.ts | 3 ++- .../src/notification/notification.module.ts | 3 ++- .../src/organization/organization.module.ts | 3 ++- .../src/platform/platform.module.ts | 3 ++- apps/api-gateway/src/schema/schema.module.ts | 3 ++- apps/api-gateway/src/user/user.module.ts | 3 ++- .../src/utilities/utilities.module.ts | 3 ++- .../src/verification/verification.module.ts | 3 ++- apps/api-gateway/src/webhook/webhook.module.ts | 3 ++- apps/connection/src/connection.module.ts | 3 ++- apps/ecosystem/src/ecosystem.module.ts | 3 ++- apps/issuance/src/issuance.module.ts | 3 ++- .../credential-definition.module.ts | 3 ++- apps/ledger/src/ledger.module.ts | 3 ++- apps/ledger/src/main.ts | 2 +- apps/ledger/src/schema/schema.module.ts | 3 ++- apps/notification/src/notification.module.ts | 3 ++- apps/organization/src/organization.module.ts | 3 ++- apps/user/src/main.ts | 3 ++- apps/user/src/user.module.ts | 3 ++- apps/utility/src/utilities.module.ts | 3 ++- apps/verification/src/verification.module.ts | 3 ++- apps/webhook/src/webhook.module.ts | 3 ++- libs/common/src/common.constant.ts | 5 +++++ libs/common/src/nats.config.ts | 18 ++++++++++++++---- 33 files changed, 79 insertions(+), 35 deletions(-) diff --git a/apps/agent-service/src/agent-service.module.ts b/apps/agent-service/src/agent-service.module.ts index 413b8d1c3..a7c32dfc6 100644 --- a/apps/agent-service/src/agent-service.module.ts +++ b/apps/agent-service/src/agent-service.module.ts @@ -11,6 +11,7 @@ import { ConnectionRepository } from 'apps/connection/src/connection.repository' import { CacheModule } from '@nestjs/cache-manager'; import { getNatsOptions } from '@credebl/common/nats.config'; import { UserActivityRepository } from 'libs/user-activity/repositories'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -19,7 +20,7 @@ import { UserActivityRepository } from 'libs/user-activity/repositories'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.AGENT_SERVICE_NKEY_SEED) + options: getNatsOptions(process.env.AGENT_SERVICE_NKEY_SEED, CommonConstants.AGENT_SERVICE) } ]), CommonModule, diff --git a/apps/agent-service/src/main.ts b/apps/agent-service/src/main.ts index efafbfbc4..7fec608b9 100644 --- a/apps/agent-service/src/main.ts +++ b/apps/agent-service/src/main.ts @@ -15,7 +15,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(AgentServiceModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.AGENT_SERVICE_NKEY_SEED) + options: getNatsOptions(process.env.AGENT_SERVICE_NKEY_SEED, CommonConstants.AGENT_SERVICE) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/api-gateway/src/agent-service/agent-service.module.ts b/apps/api-gateway/src/agent-service/agent-service.module.ts index 0c3484cc7..b083b0b97 100644 --- a/apps/api-gateway/src/agent-service/agent-service.module.ts +++ b/apps/api-gateway/src/agent-service/agent-service.module.ts @@ -7,6 +7,7 @@ import { ConfigModule } from '@nestjs/config'; import { AgentController } from './agent-service.controller'; import { AgentService } from './agent-service.service'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -16,7 +17,7 @@ import { getNatsOptions } from '@credebl/common/nats.config'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.AGENT_SERVICE) }, CommonModule diff --git a/apps/api-gateway/src/authz/authz.module.ts b/apps/api-gateway/src/authz/authz.module.ts index 7c1a03779..878ca3697 100644 --- a/apps/api-gateway/src/authz/authz.module.ts +++ b/apps/api-gateway/src/authz/authz.module.ts @@ -19,6 +19,7 @@ import { VerificationService } from '../verification/verification.service'; import { EcosystemService } from '../ecosystem/ecosystem.service'; import { getNatsOptions } from '@credebl/common/nats.config'; import { OrganizationService } from '../organization/organization.service'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -31,7 +32,7 @@ import { OrganizationService } from '../organization/organization.service'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.AUTH_SERVICE) }, CommonModule ]), diff --git a/apps/api-gateway/src/connection/connection.module.ts b/apps/api-gateway/src/connection/connection.module.ts index bc2b5be51..6ae7443d9 100644 --- a/apps/api-gateway/src/connection/connection.module.ts +++ b/apps/api-gateway/src/connection/connection.module.ts @@ -3,6 +3,7 @@ import { ConnectionController } from './connection.controller'; import { ConnectionService } from './connection.service'; import { Module } from '@nestjs/common'; import { ClientsModule, Transport } from '@nestjs/microservices'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -11,7 +12,7 @@ import { ClientsModule, Transport } from '@nestjs/microservices'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.CONNECTION_SERVICE) } ]) ], diff --git a/apps/api-gateway/src/credential-definition/credential-definition.module.ts b/apps/api-gateway/src/credential-definition/credential-definition.module.ts index f7c2ac8a3..8a5247621 100644 --- a/apps/api-gateway/src/credential-definition/credential-definition.module.ts +++ b/apps/api-gateway/src/credential-definition/credential-definition.module.ts @@ -4,6 +4,7 @@ import { Logger, Module } from '@nestjs/common'; import { CredentialDefinitionController } from './credential-definition.controller'; import { CredentialDefinitionService } from './credential-definition.service'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports:[ @@ -11,7 +12,7 @@ import { getNatsOptions } from '@credebl/common/nats.config'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.CREDENTIAL_DEFINITION_SERVICE) } ]) ], diff --git a/apps/api-gateway/src/ecosystem/ecosystem.module.ts b/apps/api-gateway/src/ecosystem/ecosystem.module.ts index 91146eb15..6093e3f85 100644 --- a/apps/api-gateway/src/ecosystem/ecosystem.module.ts +++ b/apps/api-gateway/src/ecosystem/ecosystem.module.ts @@ -7,6 +7,7 @@ import { Module } from '@nestjs/common'; import { EcosystemController } from './ecosystem.controller'; import { EcosystemService } from './ecosystem.service'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -16,7 +17,7 @@ import { getNatsOptions } from '@credebl/common/nats.config'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.ECOSYSTEM_SERVICE) }, CommonModule ]) diff --git a/apps/api-gateway/src/fido/fido.module.ts b/apps/api-gateway/src/fido/fido.module.ts index e6bd502f9..f80bcabe9 100644 --- a/apps/api-gateway/src/fido/fido.module.ts +++ b/apps/api-gateway/src/fido/fido.module.ts @@ -3,6 +3,7 @@ import { ClientsModule, Transport } from '@nestjs/microservices'; import { FidoController } from './fido.controller'; import { FidoService } from './fido.service'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports:[ @@ -10,7 +11,7 @@ import { getNatsOptions } from '@credebl/common/nats.config'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.FIDO_SERVICE) } ]) diff --git a/apps/api-gateway/src/issuance/issuance.module.ts b/apps/api-gateway/src/issuance/issuance.module.ts index ffec09e8b..b66c6d728 100644 --- a/apps/api-gateway/src/issuance/issuance.module.ts +++ b/apps/api-gateway/src/issuance/issuance.module.ts @@ -7,6 +7,7 @@ import { HttpModule } from '@nestjs/axios'; import { getNatsOptions } from '@credebl/common/nats.config'; import { ImageServiceService } from '@credebl/image-service'; import { AwsService } from '@credebl/aws'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -15,7 +16,7 @@ import { AwsService } from '@credebl/aws'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.ISSUANCE_SERVICE) } ]) ], diff --git a/apps/api-gateway/src/notification/notification.module.ts b/apps/api-gateway/src/notification/notification.module.ts index bc3bc7706..3ce0653e2 100644 --- a/apps/api-gateway/src/notification/notification.module.ts +++ b/apps/api-gateway/src/notification/notification.module.ts @@ -7,6 +7,7 @@ import { Module } from '@nestjs/common'; import { getNatsOptions } from '@credebl/common/nats.config'; import { NotificationController } from './notification.controller'; import { NotificationService } from './notification.service'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -16,7 +17,7 @@ import { NotificationService } from './notification.service'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.NOTIFICATION_SERVICE) }, CommonModule diff --git a/apps/api-gateway/src/organization/organization.module.ts b/apps/api-gateway/src/organization/organization.module.ts index b257653fd..f6322d9e2 100644 --- a/apps/api-gateway/src/organization/organization.module.ts +++ b/apps/api-gateway/src/organization/organization.module.ts @@ -9,6 +9,7 @@ import { OrganizationService } from './organization.service'; import { getNatsOptions } from '@credebl/common/nats.config'; import { ImageServiceService } from '@credebl/image-service'; import { AwsService } from '@credebl/aws'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ HttpModule, @@ -17,7 +18,7 @@ import { AwsService } from '@credebl/aws'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.ORGANIZATION_SERVICE) }, CommonModule diff --git a/apps/api-gateway/src/platform/platform.module.ts b/apps/api-gateway/src/platform/platform.module.ts index 817f7db0a..6901a296b 100644 --- a/apps/api-gateway/src/platform/platform.module.ts +++ b/apps/api-gateway/src/platform/platform.module.ts @@ -4,6 +4,7 @@ import { PlatformService } from './platform.service'; import { ClientsModule, Transport } from '@nestjs/microservices'; import { ConfigModule } from '@nestjs/config'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -12,7 +13,7 @@ import { getNatsOptions } from '@credebl/common/nats.config'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.PLATFORM_SERVICE) } ]) ], diff --git a/apps/api-gateway/src/schema/schema.module.ts b/apps/api-gateway/src/schema/schema.module.ts index b584a1c26..fd20a02da 100644 --- a/apps/api-gateway/src/schema/schema.module.ts +++ b/apps/api-gateway/src/schema/schema.module.ts @@ -5,6 +5,7 @@ import { Module } from '@nestjs/common'; import { SchemaController } from './schema.controller'; import { SchemaService } from './schema.service'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -13,7 +14,7 @@ import { getNatsOptions } from '@credebl/common/nats.config'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.SCHEMA_SERVICE) } ]) diff --git a/apps/api-gateway/src/user/user.module.ts b/apps/api-gateway/src/user/user.module.ts index 9c805028d..da0e77557 100644 --- a/apps/api-gateway/src/user/user.module.ts +++ b/apps/api-gateway/src/user/user.module.ts @@ -7,6 +7,7 @@ import { UserController } from './user.controller'; import { UserService } from './user.service'; import { getNatsOptions } from '@credebl/common/nats.config'; import { AwsService } from '@credebl/aws'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -16,7 +17,7 @@ import { AwsService } from '@credebl/aws'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.USER_SERVICE) } ]) diff --git a/apps/api-gateway/src/utilities/utilities.module.ts b/apps/api-gateway/src/utilities/utilities.module.ts index 9aa55503c..9a272cd1b 100644 --- a/apps/api-gateway/src/utilities/utilities.module.ts +++ b/apps/api-gateway/src/utilities/utilities.module.ts @@ -8,6 +8,7 @@ import { getNatsOptions } from '@credebl/common/nats.config'; import { ImageServiceService } from '@credebl/image-service'; import { UtilitiesController } from './utilities.controller'; import { UtilitiesService } from './utilities.service'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -17,7 +18,7 @@ import { UtilitiesService } from './utilities.service'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.UTILITY_SERVICE) }, CommonModule diff --git a/apps/api-gateway/src/verification/verification.module.ts b/apps/api-gateway/src/verification/verification.module.ts index cf6097cf0..c3813a36c 100644 --- a/apps/api-gateway/src/verification/verification.module.ts +++ b/apps/api-gateway/src/verification/verification.module.ts @@ -6,6 +6,7 @@ import { VerificationController } from './verification.controller'; import { VerificationService } from './verification.service'; import { getNatsOptions } from '@credebl/common/nats.config'; import { ImageServiceService } from '@credebl/image-service'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -14,7 +15,7 @@ import { ImageServiceService } from '@credebl/image-service'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.VERIFICATION_SERVICE) } ]) ], diff --git a/apps/api-gateway/src/webhook/webhook.module.ts b/apps/api-gateway/src/webhook/webhook.module.ts index b0140ce6a..5cd1fb5ef 100644 --- a/apps/api-gateway/src/webhook/webhook.module.ts +++ b/apps/api-gateway/src/webhook/webhook.module.ts @@ -6,6 +6,7 @@ import { CommonService } from '@credebl/common'; import { HttpModule } from '@nestjs/axios'; import { getNatsOptions } from '@credebl/common/nats.config'; import { AwsService } from '@credebl/aws'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -14,7 +15,7 @@ import { AwsService } from '@credebl/aws'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.WEBHOOK_SERVICE) } ]) ], diff --git a/apps/connection/src/connection.module.ts b/apps/connection/src/connection.module.ts index 4fa3b7abe..f042ee2d0 100644 --- a/apps/connection/src/connection.module.ts +++ b/apps/connection/src/connection.module.ts @@ -9,6 +9,7 @@ import { PrismaService } from '@credebl/prisma-service'; import { CacheModule } from '@nestjs/cache-manager'; import { getNatsOptions } from '@credebl/common/nats.config'; import { UserActivityRepository } from 'libs/user-activity/repositories'; +import { CommonConstants } from '@credebl/common/common.constant'; // import { nkeyAuthenticator } from 'nats'; @Module({ @@ -17,7 +18,7 @@ import { UserActivityRepository } from 'libs/user-activity/repositories'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.CONNECTION_NKEY_SEED) + options: getNatsOptions(process.env.CONNECTION_NKEY_SEED, CommonConstants.CONNECTION_SERVICE) } ]), diff --git a/apps/ecosystem/src/ecosystem.module.ts b/apps/ecosystem/src/ecosystem.module.ts index 91db49725..75d495e68 100644 --- a/apps/ecosystem/src/ecosystem.module.ts +++ b/apps/ecosystem/src/ecosystem.module.ts @@ -8,6 +8,7 @@ import { PrismaService } from '@credebl/prisma-service'; import { CacheModule } from '@nestjs/cache-manager'; import { getNatsOptions } from '@credebl/common/nats.config'; import { UserActivityRepository } from 'libs/user-activity/repositories'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -15,7 +16,7 @@ import { UserActivityRepository } from 'libs/user-activity/repositories'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.ECOSYSTEM_NKEY_SEED) + options: getNatsOptions(process.env.ECOSYSTEM_NKEY_SEED, CommonConstants.ECOSYSTEM_SERVICE) } ]), diff --git a/apps/issuance/src/issuance.module.ts b/apps/issuance/src/issuance.module.ts index 62b90d820..a0b4f50f3 100644 --- a/apps/issuance/src/issuance.module.ts +++ b/apps/issuance/src/issuance.module.ts @@ -15,6 +15,7 @@ import * as redisStore from 'cache-manager-redis-store'; import { BulkIssuanceProcessor } from './issuance.processor'; import { AwsService } from '@credebl/aws'; import { UserActivityRepository } from 'libs/user-activity/repositories'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -23,7 +24,7 @@ import { UserActivityRepository } from 'libs/user-activity/repositories'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.ISSUANCE_NKEY_SEED) + options: getNatsOptions(process.env.ISSUANCE_NKEY_SEED, CommonConstants.ISSUANCE_SERVICE) } ]), CommonModule, diff --git a/apps/ledger/src/credential-definition/credential-definition.module.ts b/apps/ledger/src/credential-definition/credential-definition.module.ts index f65424046..9e936a814 100644 --- a/apps/ledger/src/credential-definition/credential-definition.module.ts +++ b/apps/ledger/src/credential-definition/credential-definition.module.ts @@ -9,13 +9,14 @@ import { HttpModule } from '@nestjs/axios'; import { PrismaService } from '@credebl/prisma-service'; import { CacheModule } from '@nestjs/cache-manager'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ ClientsModule.register([ { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.CREDENTAILDEFINITION_NKEY_SEED) + options: getNatsOptions(process.env.CREDENTAILDEFINITION_NKEY_SEED, CommonConstants.CREDENTIAL_DEFINITION_SERVICE) } ]), HttpModule, diff --git a/apps/ledger/src/ledger.module.ts b/apps/ledger/src/ledger.module.ts index 14e7abb9f..d6ccdafdb 100644 --- a/apps/ledger/src/ledger.module.ts +++ b/apps/ledger/src/ledger.module.ts @@ -7,6 +7,7 @@ import { CredentialDefinitionModule } from './credential-definition/credential-d import { ClientsModule, Transport } from '@nestjs/microservices'; import { LedgerRepository } from './repositories/ledger.repository'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -14,7 +15,7 @@ import { getNatsOptions } from '@credebl/common/nats.config'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.LEDGER_NKEY_SEED) + options: getNatsOptions(process.env.LEDGER_NKEY_SEED, CommonConstants.LEDGER_SERVICE) } ]), diff --git a/apps/ledger/src/main.ts b/apps/ledger/src/main.ts index 14b01b8d6..ef50eb08c 100644 --- a/apps/ledger/src/main.ts +++ b/apps/ledger/src/main.ts @@ -16,6 +16,6 @@ async function bootstrap(): Promise { app.useGlobalFilters(new HttpExceptionFilter()); await app.listen(); - Logger.log('Ladger-Service Microservice is listening to NATS '); + Logger.log('Ledger-Service Microservice is listening to NATS '); } bootstrap(); diff --git a/apps/ledger/src/schema/schema.module.ts b/apps/ledger/src/schema/schema.module.ts index 49b99df38..77611b4ee 100644 --- a/apps/ledger/src/schema/schema.module.ts +++ b/apps/ledger/src/schema/schema.module.ts @@ -9,13 +9,14 @@ import { HttpModule } from '@nestjs/axios'; import { PrismaService } from '@credebl/prisma-service'; import { CacheModule } from '@nestjs/cache-manager'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ ClientsModule.register([ { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.SCHEMA_NKEY_SEED) + options: getNatsOptions(process.env.SCHEMA_NKEY_SEED, CommonConstants.SCHEMA_SERVICE) } ]), diff --git a/apps/notification/src/notification.module.ts b/apps/notification/src/notification.module.ts index 658d3a736..61baa6ab8 100644 --- a/apps/notification/src/notification.module.ts +++ b/apps/notification/src/notification.module.ts @@ -8,6 +8,7 @@ import { NotificationController } from './notification.controller'; import { NotificationService } from './notification.service'; import { PrismaService } from '@credebl/prisma-service'; import { NotificationRepository } from './notification.repository'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -16,7 +17,7 @@ import { NotificationRepository } from './notification.repository'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.NOTIFICATION_NKEY_SEED) + options: getNatsOptions(process.env.NOTIFICATION_NKEY_SEED, CommonConstants.NOTIFICATION_SERVICE) } ]), CommonModule, diff --git a/apps/organization/src/organization.module.ts b/apps/organization/src/organization.module.ts index 9fe9c7350..413aea46d 100644 --- a/apps/organization/src/organization.module.ts +++ b/apps/organization/src/organization.module.ts @@ -19,13 +19,14 @@ import { ClientRegistrationService } from '@credebl/client-registration'; import { KeycloakUrlService } from '@credebl/keycloak-url'; import { AwsService } from '@credebl/aws'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ ClientsModule.register([ { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.ORGANIZATION_NKEY_SEED) + options: getNatsOptions(process.env.ORGANIZATION_NKEY_SEED, CommonConstants.ORGANIZATION_SERVICE) } ]), CommonModule, diff --git a/apps/user/src/main.ts b/apps/user/src/main.ts index 4acd6ddeb..1b8c32abf 100644 --- a/apps/user/src/main.ts +++ b/apps/user/src/main.ts @@ -4,13 +4,14 @@ import { NestFactory } from '@nestjs/core'; import { UserModule } from './user.module'; import { MicroserviceOptions, Transport } from '@nestjs/microservices'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; const logger = new Logger(); async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(UserModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.USER_NKEY_SEED) + options: getNatsOptions(process.env.USER_NKEY_SEED, CommonConstants.USER_SERVICE) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/user/src/user.module.ts b/apps/user/src/user.module.ts index 3a1097d69..5593ae97d 100644 --- a/apps/user/src/user.module.ts +++ b/apps/user/src/user.module.ts @@ -19,6 +19,7 @@ import { UserService } from './user.service'; import { UserDevicesRepository } from '../repositories/user-device.repository'; import { getNatsOptions } from '@credebl/common/nats.config'; import { AwsService } from '@credebl/aws'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -26,7 +27,7 @@ import { AwsService } from '@credebl/aws'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.USER_NKEY_SEED) + options: getNatsOptions(process.env.USER_NKEY_SEED, CommonConstants.USER_SERVICE) } ]), diff --git a/apps/utility/src/utilities.module.ts b/apps/utility/src/utilities.module.ts index 5048add05..a9a4006f2 100644 --- a/apps/utility/src/utilities.module.ts +++ b/apps/utility/src/utilities.module.ts @@ -8,6 +8,7 @@ import { UtilitiesController } from './utilities.controller'; import { UtilitiesService } from './utilities.service'; import { UtilitiesRepository } from './utilities.repository'; import { AwsService } from '@credebl/aws'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -15,7 +16,7 @@ import { AwsService } from '@credebl/aws'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.UTILITIES_NKEY_SEED) + options: getNatsOptions(process.env.UTILITIES_NKEY_SEED, CommonConstants.UTILITY_SERVICE) } ]), CommonModule, diff --git a/apps/verification/src/verification.module.ts b/apps/verification/src/verification.module.ts index 27a5cfaa6..8efef35c2 100644 --- a/apps/verification/src/verification.module.ts +++ b/apps/verification/src/verification.module.ts @@ -11,13 +11,14 @@ import { EmailDto } from '@credebl/common/dtos/email.dto'; import { CacheModule } from '@nestjs/cache-manager'; import { UserActivityService } from '@credebl/user-activity'; import { UserActivityRepository } from 'libs/user-activity/repositories'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ ClientsModule.register([ { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.VERIFICATION_NKEY_SEED) + options: getNatsOptions(process.env.VERIFICATION_NKEY_SEED, CommonConstants.VERIFICATION_SERVICE) } ]), diff --git a/apps/webhook/src/webhook.module.ts b/apps/webhook/src/webhook.module.ts index b8bf50c54..630ad459f 100644 --- a/apps/webhook/src/webhook.module.ts +++ b/apps/webhook/src/webhook.module.ts @@ -7,6 +7,7 @@ import { WebhookController } from './webhook.controller'; import { WebhookRepository } from './webhook.repository'; import { WebhookService } from './webhook.service'; import { getNatsOptions } from '@credebl/common/nats.config'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -15,7 +16,7 @@ import { getNatsOptions } from '@credebl/common/nats.config'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.ISSUANCE_NKEY_SEED) + options: getNatsOptions(process.env.ISSUANCE_NKEY_SEED, CommonConstants.WEBHOOK_SERVICE) } ]), CommonModule diff --git a/libs/common/src/common.constant.ts b/libs/common/src/common.constant.ts index ac74dfd31..82c3671f4 100644 --- a/libs/common/src/common.constant.ts +++ b/libs/common/src/common.constant.ts @@ -329,9 +329,14 @@ CACHE_TTL_SECONDS = 604800, API_GATEWAY_SERVICE = 'api-gateway', ORGANIZATION_SERVICE = 'organization', USER_SERVICE = 'user', +AUTH_SERVICE = 'authz', +FIDO_SERVICE = 'fido', UTILITY_SERVICE = 'utilitites', CONNECTION_SERVICE = 'connection', LEDGER_SERVICE = 'ledger', +PLATFORM_SERVICE = 'platform', +SCHEMA_SERVICE = 'schema', +CREDENTIAL_DEFINITION_SERVICE = 'credential-definition', AGENT_SERVICE = 'agent-service', AGENT_PROVISIONING = 'agent-provisioning', ISSUANCE_SERVICE = 'issuance', diff --git a/libs/common/src/nats.config.ts b/libs/common/src/nats.config.ts index c3e2a5ca1..d6f42f1cc 100644 --- a/libs/common/src/nats.config.ts +++ b/libs/common/src/nats.config.ts @@ -1,5 +1,6 @@ import { NATSReconnects } from '@credebl/enum/enum'; import { Authenticator, nkeyAuthenticator } from 'nats'; +import { CommonConstants } from './common.constant'; export const getNatsOptions = ( nkeySeed?: string, serviceName?: string @@ -13,16 +14,25 @@ export const getNatsOptions = ( const baseOptions = { servers: `${process.env.NATS_URL}`.split(','), maxReconnectAttempts: NATSReconnects.maxReconnectAttempts, - reconnectTimeWait: NATSReconnects.reconnectTimeWait + reconnectTimeWait: NATSReconnects.reconnectTimeWait, + queue: `${CommonConstants.API_GATEWAY_SERVICE}` }; if (nkeySeed) { return { ...baseOptions, - authenticator: nkeyAuthenticator(new TextEncoder().encode(nkeySeed)), - queue: serviceName + authenticator: nkeyAuthenticator(new TextEncoder().encode(nkeySeed)) + // queue: `${CommonConstants.API_GATEWAY_SERVICE}` }; - } + } + // else if (nkeySeed && serviceName) { + // return { + // ...baseOptions, + // authenticator: nkeyAuthenticator(new TextEncoder().encode(nkeySeed)), + // queue: serviceName + // }; + + // } return baseOptions; }; From f830fff8b6c501b88efc238924ffbf1cdcf870fe Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Fri, 21 Jun 2024 11:22:01 +0530 Subject: [PATCH 05/11] wip: nats queue configurations Signed-off-by: bhavanakarwade --- libs/common/src/nats.config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/common/src/nats.config.ts b/libs/common/src/nats.config.ts index d6f42f1cc..ba6bd57f1 100644 --- a/libs/common/src/nats.config.ts +++ b/libs/common/src/nats.config.ts @@ -1,6 +1,5 @@ import { NATSReconnects } from '@credebl/enum/enum'; import { Authenticator, nkeyAuthenticator } from 'nats'; -import { CommonConstants } from './common.constant'; export const getNatsOptions = ( nkeySeed?: string, serviceName?: string @@ -15,7 +14,8 @@ export const getNatsOptions = ( servers: `${process.env.NATS_URL}`.split(','), maxReconnectAttempts: NATSReconnects.maxReconnectAttempts, reconnectTimeWait: NATSReconnects.reconnectTimeWait, - queue: `${CommonConstants.API_GATEWAY_SERVICE}` + // queue: `${CommonConstants.API_GATEWAY_SERVICE}` + queue: serviceName }; if (nkeySeed) { From c0255d40f6633554c42019eeea0b2170da557f36 Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Fri, 21 Jun 2024 20:26:30 +0530 Subject: [PATCH 06/11] feat: support nats queue Signed-off-by: bhavanakarwade --- apps/api-gateway/src/app.module.ts | 3 ++- libs/common/src/nats.config.ts | 13 +------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/apps/api-gateway/src/app.module.ts b/apps/api-gateway/src/app.module.ts index 167b19ae9..e6f30ed65 100644 --- a/apps/api-gateway/src/app.module.ts +++ b/apps/api-gateway/src/app.module.ts @@ -26,6 +26,7 @@ import * as redisStore from 'cache-manager-redis-store'; import { WebhookModule } from './webhook/webhook.module'; import { UtilitiesModule } from './utilities/utilities.module'; import { NotificationModule } from './notification/notification.module'; +import { CommonConstants } from '@credebl/common/common.constant'; @Module({ imports: [ @@ -34,7 +35,7 @@ import { NotificationModule } from './notification/notification.module'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED) + options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.API_GATEWAY_SERVICE) } ]), AgentModule, diff --git a/libs/common/src/nats.config.ts b/libs/common/src/nats.config.ts index ba6bd57f1..bdc3958aa 100644 --- a/libs/common/src/nats.config.ts +++ b/libs/common/src/nats.config.ts @@ -2,7 +2,7 @@ import { NATSReconnects } from '@credebl/enum/enum'; import { Authenticator, nkeyAuthenticator } from 'nats'; export const getNatsOptions = ( - nkeySeed?: string, serviceName?: string + nkeySeed: string, serviceName: string ): { servers: string[]; authenticator?: Authenticator; @@ -14,7 +14,6 @@ export const getNatsOptions = ( servers: `${process.env.NATS_URL}`.split(','), maxReconnectAttempts: NATSReconnects.maxReconnectAttempts, reconnectTimeWait: NATSReconnects.reconnectTimeWait, - // queue: `${CommonConstants.API_GATEWAY_SERVICE}` queue: serviceName }; @@ -22,18 +21,8 @@ export const getNatsOptions = ( return { ...baseOptions, authenticator: nkeyAuthenticator(new TextEncoder().encode(nkeySeed)) - // queue: `${CommonConstants.API_GATEWAY_SERVICE}` }; } - // else if (nkeySeed && serviceName) { - // return { - // ...baseOptions, - // authenticator: nkeyAuthenticator(new TextEncoder().encode(nkeySeed)), - // queue: serviceName - // }; - - // } - return baseOptions; }; From 7731b3600be9021fd077d32e5bc7ae77b5d54cbd Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Fri, 21 Jun 2024 20:32:30 +0530 Subject: [PATCH 07/11] fix: add logger Signed-off-by: bhavanakarwade --- apps/agent-service/src/agent-service.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/agent-service/src/agent-service.service.ts b/apps/agent-service/src/agent-service.service.ts index 8c9690edd..67415d5b2 100644 --- a/apps/agent-service/src/agent-service.service.ts +++ b/apps/agent-service/src/agent-service.service.ts @@ -975,6 +975,7 @@ export class AgentServiceService { userId: user.id }; const storeDidDetails = await this.storeDid(createdDidDetails); + this.logger.debug('${storeDidDetails}::::', storeDidDetails); if (isPrimaryDid) { await this.setPrimaryDidAndLedger(orgId, storeDidDetails, createDidPayload.network, createDidPayload.method); From f10f152f6485640b226156adf53fb98c00884675 Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Fri, 21 Jun 2024 20:36:46 +0530 Subject: [PATCH 08/11] refactor: added logger Signed-off-by: bhavanakarwade --- apps/agent-service/src/agent-service.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/agent-service/src/agent-service.service.ts b/apps/agent-service/src/agent-service.service.ts index 67415d5b2..3b2ab4fc7 100644 --- a/apps/agent-service/src/agent-service.service.ts +++ b/apps/agent-service/src/agent-service.service.ts @@ -975,7 +975,7 @@ export class AgentServiceService { userId: user.id }; const storeDidDetails = await this.storeDid(createdDidDetails); - this.logger.debug('${storeDidDetails}::::', storeDidDetails); + this.logger.debug(`storeDidDetails:: ${storeDidDetails}`); if (isPrimaryDid) { await this.setPrimaryDidAndLedger(orgId, storeDidDetails, createDidPayload.network, createDidPayload.method); From 1efbb4d602b41f5582b451184d69f45c61c31f76 Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Fri, 21 Jun 2024 20:39:42 +0530 Subject: [PATCH 09/11] fix: remove unnecessary logs Signed-off-by: bhavanakarwade --- apps/agent-service/src/agent-service.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/agent-service/src/agent-service.service.ts b/apps/agent-service/src/agent-service.service.ts index 3b2ab4fc7..8c9690edd 100644 --- a/apps/agent-service/src/agent-service.service.ts +++ b/apps/agent-service/src/agent-service.service.ts @@ -975,7 +975,6 @@ export class AgentServiceService { userId: user.id }; const storeDidDetails = await this.storeDid(createdDidDetails); - this.logger.debug(`storeDidDetails:: ${storeDidDetails}`); if (isPrimaryDid) { await this.setPrimaryDidAndLedger(orgId, storeDidDetails, createDidPayload.network, createDidPayload.method); From 8d9fe6942b72d17dcd901ce76e1387acbf93e536 Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Fri, 21 Jun 2024 20:42:20 +0530 Subject: [PATCH 10/11] fix: added optional parameter Signed-off-by: bhavanakarwade --- libs/common/src/nats.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common/src/nats.config.ts b/libs/common/src/nats.config.ts index bdc3958aa..331256866 100644 --- a/libs/common/src/nats.config.ts +++ b/libs/common/src/nats.config.ts @@ -2,7 +2,7 @@ import { NATSReconnects } from '@credebl/enum/enum'; import { Authenticator, nkeyAuthenticator } from 'nats'; export const getNatsOptions = ( - nkeySeed: string, serviceName: string + serviceName: string, nkeySeed?: string ): { servers: string[]; authenticator?: Authenticator; From 781ed9fe81373005d745a9f240c83cc4f301c623 Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Sat, 22 Jun 2024 11:22:00 +0530 Subject: [PATCH 11/11] feat: implement nats queue Signed-off-by: bhavanakarwade --- apps/agent-provisioning/src/agent-provisioning.module.ts | 2 +- apps/agent-provisioning/src/main.ts | 2 +- apps/agent-service/src/agent-service.module.ts | 2 +- apps/agent-service/src/main.ts | 2 +- apps/api-gateway/src/agent-service/agent-service.module.ts | 2 +- apps/api-gateway/src/app.module.ts | 2 +- apps/api-gateway/src/authz/authz.module.ts | 2 +- apps/api-gateway/src/connection/connection.module.ts | 2 +- .../src/credential-definition/credential-definition.module.ts | 2 +- apps/api-gateway/src/ecosystem/ecosystem.module.ts | 2 +- apps/api-gateway/src/fido/fido.module.ts | 2 +- apps/api-gateway/src/issuance/issuance.module.ts | 2 +- apps/api-gateway/src/main.ts | 2 +- apps/api-gateway/src/notification/notification.module.ts | 2 +- apps/api-gateway/src/organization/organization.module.ts | 2 +- apps/api-gateway/src/platform/platform.module.ts | 2 +- apps/api-gateway/src/schema/schema.module.ts | 2 +- apps/api-gateway/src/user/user.module.ts | 2 +- apps/api-gateway/src/utilities/utilities.module.ts | 2 +- apps/api-gateway/src/verification/verification.module.ts | 2 +- apps/api-gateway/src/webhook/webhook.module.ts | 2 +- apps/connection/src/connection.module.ts | 2 +- apps/connection/src/main.ts | 2 +- apps/ecosystem/src/ecosystem.module.ts | 2 +- apps/ecosystem/src/main.ts | 2 +- apps/issuance/src/issuance.module.ts | 2 +- apps/issuance/src/main.ts | 2 +- .../src/credential-definition/credential-definition.module.ts | 2 +- apps/ledger/src/ledger.module.ts | 2 +- apps/ledger/src/main.ts | 2 +- apps/ledger/src/schema/schema.module.ts | 2 +- apps/notification/src/main.ts | 2 +- apps/notification/src/notification.module.ts | 2 +- apps/organization/src/main.ts | 2 +- apps/organization/src/organization.module.ts | 2 +- apps/user/src/main.ts | 2 +- apps/user/src/user.module.ts | 2 +- apps/utility/src/main.ts | 2 +- apps/utility/src/utilities.module.ts | 2 +- apps/verification/src/main.ts | 2 +- apps/verification/src/verification.module.ts | 2 +- apps/webhook/src/main.ts | 2 +- apps/webhook/src/webhook.module.ts | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/apps/agent-provisioning/src/agent-provisioning.module.ts b/apps/agent-provisioning/src/agent-provisioning.module.ts index 7df02d00a..c088be39f 100644 --- a/apps/agent-provisioning/src/agent-provisioning.module.ts +++ b/apps/agent-provisioning/src/agent-provisioning.module.ts @@ -12,7 +12,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.AGENT_PROVISIONING_NKEY_SEED, CommonConstants.AGENT_PROVISIONING) + options: getNatsOptions(CommonConstants.AGENT_PROVISIONING, process.env.AGENT_PROVISIONING_NKEY_SEED) } ]) diff --git a/apps/agent-provisioning/src/main.ts b/apps/agent-provisioning/src/main.ts index 820fb2533..4002bc54c 100644 --- a/apps/agent-provisioning/src/main.ts +++ b/apps/agent-provisioning/src/main.ts @@ -11,7 +11,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(AgentProvisioningModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.AGENT_PROVISIONING_NKEY_SEED, CommonConstants.AGENT_PROVISIONING) + options: getNatsOptions(CommonConstants.AGENT_PROVISIONING, process.env.AGENT_PROVISIONING_NKEY_SEED) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/agent-service/src/agent-service.module.ts b/apps/agent-service/src/agent-service.module.ts index a7c32dfc6..c2fca43bd 100644 --- a/apps/agent-service/src/agent-service.module.ts +++ b/apps/agent-service/src/agent-service.module.ts @@ -20,7 +20,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.AGENT_SERVICE_NKEY_SEED, CommonConstants.AGENT_SERVICE) + options: getNatsOptions(CommonConstants.AGENT_SERVICE, process.env.AGENT_SERVICE_NKEY_SEED) } ]), CommonModule, diff --git a/apps/agent-service/src/main.ts b/apps/agent-service/src/main.ts index 7fec608b9..8b8b7441f 100644 --- a/apps/agent-service/src/main.ts +++ b/apps/agent-service/src/main.ts @@ -15,7 +15,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(AgentServiceModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.AGENT_SERVICE_NKEY_SEED, CommonConstants.AGENT_SERVICE) + options: getNatsOptions(CommonConstants.AGENT_SERVICE, process.env.AGENT_SERVICE_NKEY_SEED) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/api-gateway/src/agent-service/agent-service.module.ts b/apps/api-gateway/src/agent-service/agent-service.module.ts index b083b0b97..0d24cd9da 100644 --- a/apps/api-gateway/src/agent-service/agent-service.module.ts +++ b/apps/api-gateway/src/agent-service/agent-service.module.ts @@ -17,7 +17,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.AGENT_SERVICE) + options: getNatsOptions(CommonConstants.AGENT_SERVICE, process.env.API_GATEWAY_NKEY_SEED) }, CommonModule diff --git a/apps/api-gateway/src/app.module.ts b/apps/api-gateway/src/app.module.ts index e6f30ed65..e2bf20040 100644 --- a/apps/api-gateway/src/app.module.ts +++ b/apps/api-gateway/src/app.module.ts @@ -35,7 +35,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.API_GATEWAY_SERVICE) + options: getNatsOptions(CommonConstants.API_GATEWAY_SERVICE, process.env.API_GATEWAY_NKEY_SEED) } ]), AgentModule, diff --git a/apps/api-gateway/src/authz/authz.module.ts b/apps/api-gateway/src/authz/authz.module.ts index 878ca3697..bcaca9b44 100644 --- a/apps/api-gateway/src/authz/authz.module.ts +++ b/apps/api-gateway/src/authz/authz.module.ts @@ -32,7 +32,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.AUTH_SERVICE) + options: getNatsOptions(CommonConstants.AUTH_SERVICE, process.env.API_GATEWAY_NKEY_SEED) }, CommonModule ]), diff --git a/apps/api-gateway/src/connection/connection.module.ts b/apps/api-gateway/src/connection/connection.module.ts index 6ae7443d9..f8047bfd3 100644 --- a/apps/api-gateway/src/connection/connection.module.ts +++ b/apps/api-gateway/src/connection/connection.module.ts @@ -12,7 +12,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.CONNECTION_SERVICE) + options: getNatsOptions(CommonConstants.CONNECTION_SERVICE, process.env.API_GATEWAY_NKEY_SEED) } ]) ], diff --git a/apps/api-gateway/src/credential-definition/credential-definition.module.ts b/apps/api-gateway/src/credential-definition/credential-definition.module.ts index 8a5247621..769b72109 100644 --- a/apps/api-gateway/src/credential-definition/credential-definition.module.ts +++ b/apps/api-gateway/src/credential-definition/credential-definition.module.ts @@ -12,7 +12,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.CREDENTIAL_DEFINITION_SERVICE) + options: getNatsOptions(CommonConstants.CREDENTIAL_DEFINITION_SERVICE, process.env.API_GATEWAY_NKEY_SEED) } ]) ], diff --git a/apps/api-gateway/src/ecosystem/ecosystem.module.ts b/apps/api-gateway/src/ecosystem/ecosystem.module.ts index 6093e3f85..1a25f8ea0 100644 --- a/apps/api-gateway/src/ecosystem/ecosystem.module.ts +++ b/apps/api-gateway/src/ecosystem/ecosystem.module.ts @@ -17,7 +17,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.ECOSYSTEM_SERVICE) + options: getNatsOptions(CommonConstants.ECOSYSTEM_SERVICE, process.env.API_GATEWAY_NKEY_SEED) }, CommonModule ]) diff --git a/apps/api-gateway/src/fido/fido.module.ts b/apps/api-gateway/src/fido/fido.module.ts index f80bcabe9..7805e7cbb 100644 --- a/apps/api-gateway/src/fido/fido.module.ts +++ b/apps/api-gateway/src/fido/fido.module.ts @@ -11,7 +11,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.FIDO_SERVICE) + options: getNatsOptions(CommonConstants.FIDO_SERVICE, process.env.API_GATEWAY_NKEY_SEED) } ]) diff --git a/apps/api-gateway/src/issuance/issuance.module.ts b/apps/api-gateway/src/issuance/issuance.module.ts index b66c6d728..ff92a8c87 100644 --- a/apps/api-gateway/src/issuance/issuance.module.ts +++ b/apps/api-gateway/src/issuance/issuance.module.ts @@ -16,7 +16,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.ISSUANCE_SERVICE) + options: getNatsOptions(CommonConstants.ISSUANCE_SERVICE, process.env.API_GATEWAY_NKEY_SEED) } ]) ], diff --git a/apps/api-gateway/src/main.ts b/apps/api-gateway/src/main.ts index e615f7d34..002ef8530 100644 --- a/apps/api-gateway/src/main.ts +++ b/apps/api-gateway/src/main.ts @@ -25,7 +25,7 @@ async function bootstrap(): Promise { app.connectMicroservice({ transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.API_GATEWAY_SERVICE) + options: getNatsOptions(CommonConstants.API_GATEWAY_SERVICE, process.env.API_GATEWAY_NKEY_SEED) }); const expressApp = app.getHttpAdapter().getInstance(); diff --git a/apps/api-gateway/src/notification/notification.module.ts b/apps/api-gateway/src/notification/notification.module.ts index 3ce0653e2..d368a572b 100644 --- a/apps/api-gateway/src/notification/notification.module.ts +++ b/apps/api-gateway/src/notification/notification.module.ts @@ -17,7 +17,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.NOTIFICATION_SERVICE) + options: getNatsOptions(CommonConstants.NOTIFICATION_SERVICE, process.env.API_GATEWAY_NKEY_SEED) }, CommonModule diff --git a/apps/api-gateway/src/organization/organization.module.ts b/apps/api-gateway/src/organization/organization.module.ts index f6322d9e2..bcf2f6c53 100644 --- a/apps/api-gateway/src/organization/organization.module.ts +++ b/apps/api-gateway/src/organization/organization.module.ts @@ -18,7 +18,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.ORGANIZATION_SERVICE) + options: getNatsOptions(CommonConstants.ORGANIZATION_SERVICE, process.env.API_GATEWAY_NKEY_SEED) }, CommonModule diff --git a/apps/api-gateway/src/platform/platform.module.ts b/apps/api-gateway/src/platform/platform.module.ts index 6901a296b..f5b3119c1 100644 --- a/apps/api-gateway/src/platform/platform.module.ts +++ b/apps/api-gateway/src/platform/platform.module.ts @@ -13,7 +13,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.PLATFORM_SERVICE) + options: getNatsOptions(CommonConstants.PLATFORM_SERVICE, process.env.API_GATEWAY_NKEY_SEED) } ]) ], diff --git a/apps/api-gateway/src/schema/schema.module.ts b/apps/api-gateway/src/schema/schema.module.ts index fd20a02da..268e35021 100644 --- a/apps/api-gateway/src/schema/schema.module.ts +++ b/apps/api-gateway/src/schema/schema.module.ts @@ -14,7 +14,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.SCHEMA_SERVICE) + options: getNatsOptions(CommonConstants.SCHEMA_SERVICE, process.env.API_GATEWAY_NKEY_SEED) } ]) diff --git a/apps/api-gateway/src/user/user.module.ts b/apps/api-gateway/src/user/user.module.ts index da0e77557..cae3713ae 100644 --- a/apps/api-gateway/src/user/user.module.ts +++ b/apps/api-gateway/src/user/user.module.ts @@ -17,7 +17,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.USER_SERVICE) + options: getNatsOptions(CommonConstants.USER_SERVICE, process.env.API_GATEWAY_NKEY_SEED) } ]) diff --git a/apps/api-gateway/src/utilities/utilities.module.ts b/apps/api-gateway/src/utilities/utilities.module.ts index 9a272cd1b..7dda4be54 100644 --- a/apps/api-gateway/src/utilities/utilities.module.ts +++ b/apps/api-gateway/src/utilities/utilities.module.ts @@ -18,7 +18,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.UTILITY_SERVICE) + options: getNatsOptions(CommonConstants.UTILITY_SERVICE, process.env.API_GATEWAY_NKEY_SEED) }, CommonModule diff --git a/apps/api-gateway/src/verification/verification.module.ts b/apps/api-gateway/src/verification/verification.module.ts index c3813a36c..d2769ff6f 100644 --- a/apps/api-gateway/src/verification/verification.module.ts +++ b/apps/api-gateway/src/verification/verification.module.ts @@ -15,7 +15,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.VERIFICATION_SERVICE) + options: getNatsOptions(CommonConstants.VERIFICATION_SERVICE, process.env.API_GATEWAY_NKEY_SEED) } ]) ], diff --git a/apps/api-gateway/src/webhook/webhook.module.ts b/apps/api-gateway/src/webhook/webhook.module.ts index 5cd1fb5ef..db38e1f7e 100644 --- a/apps/api-gateway/src/webhook/webhook.module.ts +++ b/apps/api-gateway/src/webhook/webhook.module.ts @@ -15,7 +15,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.API_GATEWAY_NKEY_SEED, CommonConstants.WEBHOOK_SERVICE) + options: getNatsOptions(CommonConstants.WEBHOOK_SERVICE, process.env.API_GATEWAY_NKEY_SEED) } ]) ], diff --git a/apps/connection/src/connection.module.ts b/apps/connection/src/connection.module.ts index f042ee2d0..bd711711c 100644 --- a/apps/connection/src/connection.module.ts +++ b/apps/connection/src/connection.module.ts @@ -18,7 +18,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.CONNECTION_NKEY_SEED, CommonConstants.CONNECTION_SERVICE) + options: getNatsOptions(CommonConstants.CONNECTION_SERVICE, process.env.CONNECTION_NKEY_SEED) } ]), diff --git a/apps/connection/src/main.ts b/apps/connection/src/main.ts index 8b26a9c2a..22c572fd3 100644 --- a/apps/connection/src/main.ts +++ b/apps/connection/src/main.ts @@ -12,7 +12,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(ConnectionModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.CONNECTION_NKEY_SEED, CommonConstants.CONNECTION_SERVICE) + options: getNatsOptions(CommonConstants.CONNECTION_SERVICE, process.env.CONNECTION_NKEY_SEED) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/ecosystem/src/ecosystem.module.ts b/apps/ecosystem/src/ecosystem.module.ts index 75d495e68..82cf3eb4d 100644 --- a/apps/ecosystem/src/ecosystem.module.ts +++ b/apps/ecosystem/src/ecosystem.module.ts @@ -16,7 +16,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.ECOSYSTEM_NKEY_SEED, CommonConstants.ECOSYSTEM_SERVICE) + options: getNatsOptions(CommonConstants.ECOSYSTEM_SERVICE, process.env.ECOSYSTEM_NKEY_SEED) } ]), diff --git a/apps/ecosystem/src/main.ts b/apps/ecosystem/src/main.ts index 7336d201b..1ca9c8acf 100644 --- a/apps/ecosystem/src/main.ts +++ b/apps/ecosystem/src/main.ts @@ -12,7 +12,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(EcosystemModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.ECOSYSTEM_NKEY_SEED, CommonConstants.ECOSYSTEM_SERVICE) + options: getNatsOptions(CommonConstants.ECOSYSTEM_SERVICE, process.env.ECOSYSTEM_NKEY_SEED) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/issuance/src/issuance.module.ts b/apps/issuance/src/issuance.module.ts index a0b4f50f3..fd5fc0152 100644 --- a/apps/issuance/src/issuance.module.ts +++ b/apps/issuance/src/issuance.module.ts @@ -24,7 +24,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.ISSUANCE_NKEY_SEED, CommonConstants.ISSUANCE_SERVICE) + options: getNatsOptions(CommonConstants.ISSUANCE_SERVICE, process.env.ISSUANCE_NKEY_SEED) } ]), CommonModule, diff --git a/apps/issuance/src/main.ts b/apps/issuance/src/main.ts index 5acf82785..cacad1b16 100644 --- a/apps/issuance/src/main.ts +++ b/apps/issuance/src/main.ts @@ -12,7 +12,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(IssuanceModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.ISSUANCE_NKEY_SEED, CommonConstants.ISSUANCE_SERVICE) + options: getNatsOptions(CommonConstants.ISSUANCE_SERVICE, process.env.ISSUANCE_NKEY_SEED) }); diff --git a/apps/ledger/src/credential-definition/credential-definition.module.ts b/apps/ledger/src/credential-definition/credential-definition.module.ts index 9e936a814..d01b67179 100644 --- a/apps/ledger/src/credential-definition/credential-definition.module.ts +++ b/apps/ledger/src/credential-definition/credential-definition.module.ts @@ -16,7 +16,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.CREDENTAILDEFINITION_NKEY_SEED, CommonConstants.CREDENTIAL_DEFINITION_SERVICE) + options: getNatsOptions(CommonConstants.CREDENTIAL_DEFINITION_SERVICE, process.env.CREDENTAILDEFINITION_NKEY_SEED) } ]), HttpModule, diff --git a/apps/ledger/src/ledger.module.ts b/apps/ledger/src/ledger.module.ts index d6ccdafdb..770f578ea 100644 --- a/apps/ledger/src/ledger.module.ts +++ b/apps/ledger/src/ledger.module.ts @@ -15,7 +15,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.LEDGER_NKEY_SEED, CommonConstants.LEDGER_SERVICE) + options: getNatsOptions(CommonConstants.LEDGER_SERVICE, process.env.LEDGER_NKEY_SEED) } ]), diff --git a/apps/ledger/src/main.ts b/apps/ledger/src/main.ts index ef50eb08c..178ab7b6a 100644 --- a/apps/ledger/src/main.ts +++ b/apps/ledger/src/main.ts @@ -10,7 +10,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(LedgerModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.LEDGER_NKEY_SEED, CommonConstants.LEDGER_SERVICE) + options: getNatsOptions(CommonConstants.LEDGER_SERVICE, process.env.LEDGER_NKEY_SEED) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/ledger/src/schema/schema.module.ts b/apps/ledger/src/schema/schema.module.ts index 77611b4ee..795783bef 100644 --- a/apps/ledger/src/schema/schema.module.ts +++ b/apps/ledger/src/schema/schema.module.ts @@ -16,7 +16,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.SCHEMA_NKEY_SEED, CommonConstants.SCHEMA_SERVICE) + options: getNatsOptions(CommonConstants.SCHEMA_SERVICE, process.env.SCHEMA_NKEY_SEED) } ]), diff --git a/apps/notification/src/main.ts b/apps/notification/src/main.ts index df74164ed..cc1d43d0b 100644 --- a/apps/notification/src/main.ts +++ b/apps/notification/src/main.ts @@ -12,7 +12,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(NotificationModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.NOTIFICATION_NKEY_SEED, CommonConstants.NOTIFICATION_SERVICE) + options: getNatsOptions(CommonConstants.NOTIFICATION_SERVICE, process.env.NOTIFICATION_NKEY_SEED) }); diff --git a/apps/notification/src/notification.module.ts b/apps/notification/src/notification.module.ts index 61baa6ab8..66a6f151d 100644 --- a/apps/notification/src/notification.module.ts +++ b/apps/notification/src/notification.module.ts @@ -17,7 +17,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.NOTIFICATION_NKEY_SEED, CommonConstants.NOTIFICATION_SERVICE) + options: getNatsOptions(CommonConstants.NOTIFICATION_SERVICE, process.env.NOTIFICATION_NKEY_SEED) } ]), CommonModule, diff --git a/apps/organization/src/main.ts b/apps/organization/src/main.ts index 1efd06a6b..1ee87db06 100644 --- a/apps/organization/src/main.ts +++ b/apps/organization/src/main.ts @@ -13,7 +13,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(OrganizationModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.ORGANIZATION_NKEY_SEED, CommonConstants.ORGANIZATION_SERVICE) + options: getNatsOptions(CommonConstants.ORGANIZATION_SERVICE, process.env.ORGANIZATION_NKEY_SEED) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/organization/src/organization.module.ts b/apps/organization/src/organization.module.ts index 413aea46d..70041fc6d 100644 --- a/apps/organization/src/organization.module.ts +++ b/apps/organization/src/organization.module.ts @@ -26,7 +26,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.ORGANIZATION_NKEY_SEED, CommonConstants.ORGANIZATION_SERVICE) + options: getNatsOptions(CommonConstants.ORGANIZATION_SERVICE, process.env.ORGANIZATION_NKEY_SEED) } ]), CommonModule, diff --git a/apps/user/src/main.ts b/apps/user/src/main.ts index 1b8c32abf..8c3df1edc 100644 --- a/apps/user/src/main.ts +++ b/apps/user/src/main.ts @@ -11,7 +11,7 @@ const logger = new Logger(); async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(UserModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.USER_NKEY_SEED, CommonConstants.USER_SERVICE) + options: getNatsOptions(CommonConstants.USER_SERVICE, process.env.USER_NKEY_SEED) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/user/src/user.module.ts b/apps/user/src/user.module.ts index 5593ae97d..7ecead247 100644 --- a/apps/user/src/user.module.ts +++ b/apps/user/src/user.module.ts @@ -27,7 +27,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.USER_NKEY_SEED, CommonConstants.USER_SERVICE) + options: getNatsOptions(CommonConstants.USER_SERVICE, process.env.USER_NKEY_SEED) } ]), diff --git a/apps/utility/src/main.ts b/apps/utility/src/main.ts index c4ad00d6e..ee165502d 100644 --- a/apps/utility/src/main.ts +++ b/apps/utility/src/main.ts @@ -12,7 +12,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(UtilitiesModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.UTILITIES_NKEY_SEED, CommonConstants.UTILITY_SERVICE) + options: getNatsOptions(CommonConstants.UTILITY_SERVICE, process.env.UTILITIES_NKEY_SEED) }); app.useGlobalFilters(new HttpExceptionFilter()); diff --git a/apps/utility/src/utilities.module.ts b/apps/utility/src/utilities.module.ts index a9a4006f2..51c31d6dd 100644 --- a/apps/utility/src/utilities.module.ts +++ b/apps/utility/src/utilities.module.ts @@ -16,7 +16,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.UTILITIES_NKEY_SEED, CommonConstants.UTILITY_SERVICE) + options: getNatsOptions(CommonConstants.UTILITY_SERVICE, process.env.UTILITIES_NKEY_SEED) } ]), CommonModule, diff --git a/apps/verification/src/main.ts b/apps/verification/src/main.ts index 493bb5ca3..b8ff0ea23 100644 --- a/apps/verification/src/main.ts +++ b/apps/verification/src/main.ts @@ -12,7 +12,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(VerificationModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.VERIFICATION_NKEY_SEED, CommonConstants.VERIFICATION_SERVICE) + options: getNatsOptions(CommonConstants.VERIFICATION_SERVICE, process.env.VERIFICATION_NKEY_SEED) }); diff --git a/apps/verification/src/verification.module.ts b/apps/verification/src/verification.module.ts index 8efef35c2..7444a03e6 100644 --- a/apps/verification/src/verification.module.ts +++ b/apps/verification/src/verification.module.ts @@ -18,7 +18,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.VERIFICATION_NKEY_SEED, CommonConstants.VERIFICATION_SERVICE) + options: getNatsOptions(CommonConstants.VERIFICATION_SERVICE, process.env.VERIFICATION_NKEY_SEED) } ]), diff --git a/apps/webhook/src/main.ts b/apps/webhook/src/main.ts index 789ed2e3f..2048425a5 100644 --- a/apps/webhook/src/main.ts +++ b/apps/webhook/src/main.ts @@ -12,7 +12,7 @@ async function bootstrap(): Promise { const app = await NestFactory.createMicroservice(WebhookModule, { transport: Transport.NATS, - options: getNatsOptions(process.env.ISSUANCE_NKEY_SEED, CommonConstants.WEBHOOK_SERVICE) + options: getNatsOptions(CommonConstants.WEBHOOK_SERVICE, process.env.ISSUANCE_NKEY_SEED) }); diff --git a/apps/webhook/src/webhook.module.ts b/apps/webhook/src/webhook.module.ts index 630ad459f..229a7dd68 100644 --- a/apps/webhook/src/webhook.module.ts +++ b/apps/webhook/src/webhook.module.ts @@ -16,7 +16,7 @@ import { CommonConstants } from '@credebl/common/common.constant'; { name: 'NATS_CLIENT', transport: Transport.NATS, - options: getNatsOptions(process.env.ISSUANCE_NKEY_SEED, CommonConstants.WEBHOOK_SERVICE) + options: getNatsOptions(CommonConstants.WEBHOOK_SERVICE, process.env.ISSUANCE_NKEY_SEED) } ]), CommonModule