Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ uploadedFles/exports
uploadedFles/import
uploadedFles/export
nats-server.conf
temp
4 changes: 2 additions & 2 deletions apps/agent-provisioning/src/agent-provisioning.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { AgentProvisioningController } from './agent-provisioning.controller';
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 { getNatsOptions } from '@credebl/common/nats/nats.config';
import { CommonConstants, MICRO_SERVICE_NAME } from '@credebl/common/common.constant';
import { GlobalConfigModule } from '@credebl/config/global-config.module';
import { LoggerModule } from '@credebl/logger/logger.module';
import { ContextInterceptorModule } from '@credebl/context/contextInterceptorModule';
import { ContextInterceptorModule } from '@credebl/common/utils/context/contextInterceptorModule';
import { ConfigModule as PlatformConfig } from '@credebl/config/config.module';
@Module({
imports: [
Expand Down
2 changes: 1 addition & 1 deletion apps/agent-provisioning/src/agent-provisioning.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Injectable, Logger, NotFoundException } from '@nestjs/common';
import { RpcException } from '@nestjs/microservices';
import { IWalletProvision } from './interface/agent-provisioning.interfaces';
import * as dotenv from 'dotenv';
import { AgentType } from '@credebl/enum/enum';
import { AgentType } from '@credebl/common/enum/enum';
import * as fs from 'fs';
import { exec } from 'child_process';
dotenv.config();
Expand Down
4 changes: 4 additions & 0 deletions apps/agent-provisioning/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export * from './agent-provisioning.controller';
export * from './agent-provisioning.module';
export * from './agent-provisioning.service';
export * from './main';
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable quotes */
import { AgentType } from "@credebl/enum/enum";
import { AgentType } from "@credebl/common/enum/enum";

export interface IWalletProvision {
orgId: string;
Expand Down
1 change: 1 addition & 0 deletions apps/agent-provisioning/src/interface/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './agent-provisioning.interfaces';
6 changes: 3 additions & 3 deletions apps/agent-provisioning/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { NestFactory } from '@nestjs/core';
import { HttpExceptionFilter } from 'libs/http-exception.filter';
import { HttpExceptionFilter } from '@credebl/common/utils/handlers/http-exception.filter';
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 { getNatsOptions } from '@credebl/common/nats/nats.config';
import { CommonConstants } from '@credebl/common/common.constant';
import NestjsLoggerServiceAdapter from '@credebl/logger/nestjsLoggerServiceAdapter';
import { NestjsLoggerServiceAdapter } from '@credebl/logger/nestjsLoggerServiceAdapter';
const logger = new Logger();

async function bootstrap(): Promise<void> {
Expand Down
1 change: 1 addition & 0 deletions apps/agent-provisioning/test/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './app.e2e-spec';
3 changes: 1 addition & 2 deletions apps/agent-provisioning/tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"declaration": false,
"outDir": "../../dist/apps/agent-provisioning"
"outDir": "./dist/apps/", //agent-provisioning/"
},
"include": ["src/**/*"],
"exclude": ["node_modules", "dist", "test", "**/*spec.ts"]
Expand Down
2 changes: 1 addition & 1 deletion apps/agent-service/src/agent-service.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import {
} from './interface/agent-service.interface';
import { user } from '@prisma/client';
import { InvitationMessage } from '@credebl/common/interfaces/agent-service.interface';
import { AgentSpinUpStatus } from '@credebl/enum/enum';
import { SignDataDto } from '../../api-gateway/src/agent-service/dto/agent-service.dto';
import { AgentSpinUpStatus } from '@credebl/common/enum/enum';

@Controller()
export class AgentServiceController {
Expand Down
8 changes: 4 additions & 4 deletions apps/agent-service/src/agent-service.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import { ConfigModule } from '@nestjs/config';
import { ConnectionService } from 'apps/connection/src/connection.service';
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 { getNatsOptions } from '@credebl/common/nats/nats.config';
import { UserActivityRepository } from '@credebl/user-activity/repositories';
import { CommonConstants, MICRO_SERVICE_NAME } from '@credebl/common/common.constant';
import { LoggerModule } from '@credebl/logger/logger.module';
import { ConfigModule as PlatformConfig } from '@credebl/config/config.module';
import { GlobalConfigModule } from '@credebl/config/global-config.module';
import { ContextInterceptorModule } from '@credebl/context/contextInterceptorModule';
import { NATSClient } from '@credebl/common/NATSClient';
import { ContextInterceptorModule } from '@credebl/common/utils/context/contextInterceptorModule';
import { NATSClient } from '@credebl/common/nats/NATSClient';


@Module({
Expand Down
15 changes: 10 additions & 5 deletions apps/agent-service/src/agent-service.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,28 +56,33 @@ import {
OrgDid,
IBasicMessage
} from './interface/agent-service.interface';
import { AgentSpinUpStatus, AgentType, DidMethod, Ledgers, OrgAgentType, PromiseResult } from '@credebl/enum/enum';
import { AgentSpinUpStatus, AgentType, DidMethod, Ledgers, OrgAgentType, PromiseResult } from '@credebl/common/enum/enum';
import { AgentServiceRepository } from './repositories/agent-service.repository';
import { Prisma, RecordType, ledgers, org_agents, organisation, platform_config, user } from '@prisma/client';
import { CommonConstants } from '@credebl/common/common.constant';
import { CommonService } from '@credebl/common';
import { GetSchemaAgentRedirection } from 'apps/ledger/src/schema/schema.interface';
import { GetSchemaAgentRedirection } from '@credebl/ledger/src/schema/schema.interface';
import { ConnectionService } from 'apps/connection/src/connection.service';
import { ResponseMessages } from '@credebl/common/response-messages';
import { ResponseMessages } from '@credebl/common/utils/response-messages';
import { Socket, io } from 'socket.io-client';
import { WebSocketGateway } from '@nestjs/websockets';
import * as retry from 'async-retry';
import retry from 'async-retry';
import { Cache } from 'cache-manager';
import { CACHE_MANAGER } from '@nestjs/cache-manager';
import { ledgerName } from '@credebl/common/cast.helper';
import { IProofPresentationDetails } from '@credebl/common/interfaces/verification.interface';
import { IConnectionDetailsById } from 'apps/api-gateway/src/interfaces/IConnectionSearch.interface';
import { ledgerName } from '@credebl/common/utils/helpers/cast.helper';
import { InvitationMessage } from '@credebl/common/interfaces/agent-service.interface';
import * as CryptoJS from 'crypto-js';
import { UserActivityRepository } from 'libs/user-activity/repositories';
import { UserActivityRepository } from '@credebl/user-activity/repositories';
import { PrismaService } from '@credebl/prisma-service';
import { from } from 'rxjs';
import { NATSClient } from '@credebl/common/NATSClient';
import { SignDataDto } from '../../api-gateway/src/agent-service/dto/agent-service.dto';
import { IVerificationMethod } from 'apps/organization/interfaces/organization.interface';
import { NATSClient } from '@credebl/common/nats/NATSClient';

@Injectable()
@WebSocketGateway()
export class AgentServiceService {
Expand Down
4 changes: 4 additions & 0 deletions apps/agent-service/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export * from './agent-service.controller';
export * from './agent-service.module';
export * from './agent-service.service';
export * from './main';
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AgentSpinUpStatus } from '@credebl/enum/enum';
import { AgentSpinUpStatus } from '@credebl/common/enum/enum';
import { Prisma } from '@prisma/client';
import { UserRoleOrgPermsDto } from 'apps/api-gateway/src/dtos/user-role-org-perms.dto';

Expand Down
1 change: 1 addition & 0 deletions apps/agent-service/src/interface/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './agent-service.interface';
8 changes: 4 additions & 4 deletions apps/agent-service/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { HttpExceptionFilter } from 'libs/http-exception.filter';
import { HttpExceptionFilter } from '@credebl/common/utils/handlers/http-exception.filter';
import { Logger } from '@nestjs/common';
import { NestFactory } from '@nestjs/core';
import { AgentServiceModule } from './agent-service.module';
import { AgentServiceService } from './agent-service.service';
import { IAgentSpinupDto, IUserRequestInterface } from './interface/agent-service.interface';
import { MicroserviceOptions, Transport } from '@nestjs/microservices';
import { getNatsOptions } from '@credebl/common/nats.config';
import { getNatsOptions } from '@credebl/common/nats/nats.config';
import { CommonConstants } from '@credebl/common/common.constant';
import { Ledgers } from '@credebl/enum/enum';
import NestjsLoggerServiceAdapter from '@credebl/logger/nestjsLoggerServiceAdapter';
import { Ledgers } from '@credebl/common/enum/enum';
import { NestjsLoggerServiceAdapter } from '@credebl/logger/nestjsLoggerServiceAdapter';

const logger = new Logger();

Expand Down
1 change: 1 addition & 0 deletions apps/agent-service/src/repositories/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './agent-service.repository';
1 change: 1 addition & 0 deletions apps/agent-service/test/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './app.e2e-spec';
4 changes: 2 additions & 2 deletions apps/agent-service/tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"declaration": false,
"outDir": "../../dist/apps/agent-service"

"outDir": "./dist/apps/", //agent-service/"
},
"include": ["src/**/*"],
"exclude": ["node_modules", "dist", "test", "**/*spec.ts"]
Expand Down
59 changes: 59 additions & 0 deletions apps/api-gateway/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"name": "@credebl/api-gateway",
"version": "2.0.0",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"license": "Apache-2.0",
"files": [
"dist"
],
"scripts": {
"start": "ts-node src/main.ts",
"clean": "rimraf ./dist",
"compile": "tsc -p tsconfig.app.json",
"build": "pnpm run clean && pnpm run compile",
"generate": "npx prisma generate --schema=node_modules/@credebl/prisma-service/prisma/schema.prisma",
"cleanup": "rm -rf node_modules dist pnpm-lock.yaml && rm -rf ~/.cache/prisma ~/.pnpm-store"
},
"peerDependencies": {
"@prisma/client": "^5.22.0"
},
"dependencies": {
"@credebl/aws": "file:../../credebl-aws-2.0.0.tgz",
"@credebl/common": "file:../../credebl-common-2.0.0.tgz",
"@credebl/logger": "file:../../credebl-logger-2.0.0.tgz",
"@credebl/prisma-service": "file:../../credebl-prisma-service-2.0.0.tgz",
"@credebl/user-management": "file:../../credebl-user-management-2.0.0.tgz",
"@nestjs/common": "^10.4.20",
"@nestjs/core": "^10.4.20",
"@nestjs/microservices": "^10.4.20",
"@nestjs/passport": "^10.0.3",
"@nestjs/platform-socket.io": "^10.4.20",
"@nestjs/websockets": "^10.4.20",
"cache-manager-redis-store": "^2.0.0",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.2",
"dotenv": "^16.6.1",
"express": "^4.21.2",
"fs": "0.0.1-security",
"@nestjs/swagger": "^7.4.2",
"swagger-ui-express": "^5.0.1",
"helmet": "^7.2.0",
"jsonwebtoken": "^9.0.2",
"jwks-rsa": "^3.2.0",
"nats": "^2.29.3",
"nestjs-rate-limiter": "^3.1.0",
"passport-jwt": "^4.0.1",
"path": "^0.12.7",
"qrcode": "^1.5.4",
"rxjs": "^7.8.2",
"uuid": "^9.0.1"
},
"resolutions": {
"@credebl/aws": "file:../../credebl-aws-2.0.0.tgz",
"@credebl/common": "file:../../credebl-common-2.0.0.tgz",
"@credebl/logger": "file:../../credebl-logger-2.0.0.tgz",
"@credebl/prisma-service": "file:../../credebl-prisma-service-2.0.0.tgz",
"@credebl/user-management": "file:../../credebl-user-management-2.0.0.tgz"
}
}

This file was deleted.

20 changes: 10 additions & 10 deletions apps/api-gateway/src/agent-service/agent-service.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,23 @@ import {
import { AuthGuard } from '@nestjs/passport';
import { ApiResponseDto } from '../dtos/apiResponse.dto';
import { ForbiddenErrorDto } from '../dtos/forbidden-error.dto';
import { ResponseMessages } from '@credebl/common/response-messages';
import { AgentService } from './agent-service.service';
import IResponseType, { IResponse } from '@credebl/common/interfaces/response.interface';
import { ResponseMessages } from '@credebl/common';
import { AgentServiceService } from './agent-service.service';
import { IResponseType, IResponse } from '@credebl/common';
import { AgentSpinupDto, SignDataDto, VerifySignatureDto } from './dto/agent-service.dto';
import { Response } from 'express';
// eslint-disable-next-line @typescript-eslint/no-unused-vars
import { user } from '@prisma/client';
import { user } from '@credebl/prisma-service';
import { CreateTenantDto } from './dto/create-tenant.dto';
import { User } from '../authz/decorators/user.decorator';
import { CustomExceptionFilter } from 'apps/api-gateway/common/exception-handler';
import { CustomExceptionFilter } from '../common';
import { Roles } from '../authz/decorators/roles.decorator';
import { OrgRoles } from 'libs/org-roles/enums';
import { OrgRoles } from '@credebl/common';
import { OrgRolesGuard } from '../authz/guards/org-roles.guard';
import { Validator } from '@credebl/common/validator';
import { Validator } from '@credebl/common';
import { CreateWalletDto } from './dto/create-wallet.dto';
import { CreateNewDidDto } from './dto/create-new-did.dto';
import { AgentSpinupValidator, TrimStringParamPipe } from '@credebl/common/cast.helper';
import { AgentSpinupValidator, TrimStringParamPipe } from '@credebl/common';
import { AgentConfigureDto } from './dto/agent-configure.dto';
import { UnauthorizedErrorDto } from '../dtos/unauthorized-error.dto';
import { IVerifySignature } from './interface/agent-service.interface';
Expand All @@ -57,8 +57,8 @@ const seedLength = 32;
@ApiBearerAuth()
@ApiUnauthorizedResponse({ status: HttpStatus.UNAUTHORIZED, description: 'Unauthorized', type: UnauthorizedErrorDto })
@ApiForbiddenResponse({ status: HttpStatus.FORBIDDEN, description: 'Forbidden', type: ForbiddenErrorDto })
export class AgentController {
constructor(private readonly agentService: AgentService) {}
export class AgentServiceController {
constructor(private readonly agentService: AgentServiceService) {}
private readonly logger = new Logger();

/**
Expand Down
48 changes: 36 additions & 12 deletions apps/api-gateway/src/agent-service/agent-service.module.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import { Module } from '@nestjs/common';
import { Module, DynamicModule, Provider } from '@nestjs/common';
import { HttpModule } from '@nestjs/axios';
import { ClientsModule, Transport } from '@nestjs/microservices';
import { CommonModule } from '../../../../libs/common/src/common.module';
import { CommonService } from '../../../../libs/common/src/common.service';
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';
import { NATSClient } from '@credebl/common/NATSClient';
import { AgentServiceController } from './agent-service.controller';
import { AgentServiceService } from './agent-service.service';
import { CommonModule, CommonService, getNatsOptions } from '@credebl/common';
import { CommonConstants } from '@credebl/common';
import { NATSClient } from '@credebl/common';

@Module({
imports: [
Expand All @@ -19,12 +17,38 @@ import { NATSClient } from '@credebl/common/NATSClient';
name: 'NATS_CLIENT',
transport: Transport.NATS,
options: getNatsOptions(CommonConstants.AGENT_SERVICE, process.env.API_GATEWAY_NKEY_SEED)

},
CommonModule
])
],
controllers: [AgentController],
providers: [AgentService, CommonService, NATSClient]
controllers: [AgentServiceController],
providers: [AgentServiceService, CommonService, NATSClient]
})
export class AgentModule { }
export class AgentServiceModule {
static register(
overrides: Provider[] = [],
// eslint-disable-next-line @typescript-eslint/no-explicit-any
controllerOverrides: any[] = [],
// eslint-disable-next-line @typescript-eslint/no-explicit-any
importedModules: any[] = []
): DynamicModule {
return {
module: AgentServiceModule,
imports: [
HttpModule,
ConfigModule.forRoot(),
ClientsModule.register([
{
name: 'NATS_CLIENT',
transport: Transport.NATS,
options: getNatsOptions(CommonConstants.AGENT_SERVICE, process.env.API_GATEWAY_NKEY_SEED)
},
CommonModule
]),
...importedModules
],
controllers: controllerOverrides.length ? controllerOverrides : [AgentServiceController],
providers: [AgentServiceService, CommonService, NATSClient, ...overrides]
};
}
}
8 changes: 4 additions & 4 deletions apps/api-gateway/src/agent-service/agent-service.service.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import { Injectable, Inject } from '@nestjs/common';
import { ClientProxy } from '@nestjs/microservices';
import { user } from '@prisma/client';
import { BaseService } from 'libs/service/base.service';
import { user } from '@credebl/prisma-service';
import { BaseService } from '@credebl/common';
import { AgentSpinupDto } from './dto/agent-service.dto';
import { CreateTenantDto } from './dto/create-tenant.dto';
import { AgentSpinUpSatus, IWalletRecord } from './interface/agent-service.interface';
import { AgentStatus } from './interface/agent-service.interface';
import { CreateDidDto } from './dto/create-did.dto';
import { CreateWalletDto } from './dto/create-wallet.dto';
import { AgentConfigureDto } from './dto/agent-configure.dto';
import { NATSClient } from '@credebl/common/NATSClient';
import { NATSClient } from '@credebl/common';

@Injectable()
export class AgentService extends BaseService {
export class AgentServiceService extends BaseService {
constructor(
@Inject('NATS_CLIENT') private readonly agentServiceProxy: ClientProxy,
private readonly natsClient: NATSClient
Expand Down
Loading
Loading