Merge pull request #84 from JustaName-id/staging

Staging

Author: Ghadi8

apps/vc-api/Dockerfile

@@ -2,7 +2,7 @@
 FROM node:18.18.0-alpine as deps
 WORKDIR /usr/src/app
 COPY dist/apps/vc-api/package.json dist/apps/vc-api/yarn.lock ./
-RUN apk add --no-cache --virtual .build-deps python3 make g++ && \
+RUN apk add --no-cache --virtual .build-deps python3 make g++ git && \
     echo "@community http://dl-cdn.alpinelinux.org/alpine/v3.18/community" >> /etc/apk/repositories && \
     yarn install --production && \
     apk del .build-deps

apps/vc-api/package.json

@@ -6,20 +6,13 @@
     "node": ">=18.12.0 <=18.18.0"
   },
   "dependencies": {
-    "@nestjs/axios": "^3.0.3",
-    "@nestjs/common": "^10.0.2",
-    "@nestjs/config": "^3.2.3",
-    "@nestjs/core": "^10.0.2",
-    "@nestjs/platform-express": "^10.0.2",
     "@nx/webpack": "19.7.2",
     "@veramo/core": "^6.0.0",
     "@veramo/credential-eip712": "^6.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "did-resolver": "4.1.0",
-    "ethers": "^6.13.2",
     "ethr-did-resolver": "^10.1.10",
-    "express": "4.21.1",
     "moment": "^2.30.1",
     "@nestjs/swagger": "^7.4.0",
     "@veramo/did-manager": "^6.0.0",
@@ -32,15 +25,22 @@
     "@nestjs/jwt": "^10.2.0",
     "uuid": "^10.0.0",
     "rxjs": "^7.8.0",
-    "@react-email/components": "0.0.15",
     "react": "18.3.1",
     "resend": "^4.0.0",
     "react-dom": "18.3.1",
-    "@nestjs/testing": "^10.0.2",
     "@golevelup/ts-jest": "^0.5.6",
     "supertest": "^7.0.0",
-    "@justaname.id/sdk": "0.2.105",
-    "@ensdomains/ensjs": "^4.0.0",
-    "viem": "^2.21.7"
+    "@nestjs/common": "^10.0.2",
+    "express": "4.21.1",
+    "@nestjs/core": "^10.0.2",
+    "ethers": "^6.13.2",
+    "@nestjs/axios": "^3.0.3",
+    "@nestjs/config": "^3.2.3",
+    "@react-email/components": "0.0.15",
+    "@ensdomains/ensjs": "4.0.0",
+    "viem": "^2.21.7",
+    "@nestjs/platform-express": "^10.0.2",
+    "@nestjs/testing": "^10.0.2",
+    "@justaname.id/sdk": "^0.2.146"
   }
 }

apps/vc-api/src/api/auth/auth.controller.ts

@@ -57,7 +57,6 @@ export class AuthController {
     }catch (e) {
       res.status(422).send({message: e.message});
     }
-
   }
 
   @UseGuards(JwtGuard)

apps/vc-api/src/api/filters/vc.api.filters.ts

@@ -5,6 +5,7 @@ import { SocialResolverNotFoundExceptionFilter } from './credentials/social-reso
 import { CredentialsExceptionFilter } from './credentials/credentials.filter';
 import { AuthenticationExceptionFilter } from './auth/authentication.filter';
 import { JustaNameInitializerExceptionFilter } from './auth/justaName-intializer.filter';
+import { Web3ProviderExceptionFilter } from './web3-provider/web3-provider.filter';
 
 export const VCManagementApiFilters = [
   OTPExceptionFilter,
@@ -14,4 +15,5 @@ export const VCManagementApiFilters = [
   ChainIdInvalidExceptionFilter,
   CredentialsExceptionFilter,
   SocialResolverNotFoundExceptionFilter,
+  Web3ProviderExceptionFilter,
 ];

apps/vc-api/src/api/filters/web3-provider/web3-provider.filter.ts

@@ -0,0 +1,16 @@
+import { ArgumentsHost, Catch, HttpStatus } from '@nestjs/common';
+import { BaseExceptionFilter } from '@nestjs/core';
+import { Web3ProviderException } from '../../../core/domain/exceptions/Web3Provider.exception';
+
+@Catch(Web3ProviderException)
+export class Web3ProviderExceptionFilter extends BaseExceptionFilter {
+  catch(exception: Web3ProviderException, host: ArgumentsHost) {
+    const context = host.switchToHttp();
+    const response = context.getResponse();
+    const httpStatus = HttpStatus.BAD_REQUEST;
+
+    response.status(httpStatus).json({
+      message: exception.message,
+    });
+  }
+}

apps/vc-api/src/api/verify-records/mapper/iverify-records.controller.mapper.ts

@@ -10,7 +10,7 @@ export interface IVerifyRecordsControllerMapper {
     verifyRecordsApiRequest: VerifyRecordsApiRequest,
   ): VerifyRecordsRequest;
 
-  mapVerifyRecordsResponseToVerifyRecordsApiResponse(
-    verifyRecordsResponse: VerifyRecordsResponse
-  ): VerifyRecordsApiResponse;
+  mapVerifyRecordsResponsesToVerifyRecordsApiResponses(
+    verifyRecordsResponses: VerifyRecordsResponse[]
+  ): VerifyRecordsApiResponse[];
 }

apps/vc-api/src/api/verify-records/mapper/verify-records.controller.mapper.ts

@@ -13,19 +13,20 @@ export class VerifyRecordsControllerMapper implements IVerifyRecordsControllerMa
     verifyRecordsApiRequest: VerifyRecordsApiRequest,
   ): VerifyRecordsRequest {
     return {
+      providerUrl: verifyRecordsApiRequest.providerUrl,
       ens: verifyRecordsApiRequest.ens,
-      chainId: verifyRecordsApiRequest.chainId,
       credentials: verifyRecordsApiRequest.credentials,
       issuer: verifyRecordsApiRequest.issuer,
       matchStandard: verifyRecordsApiRequest.matchStandard
     };
   }
 
-  mapVerifyRecordsResponseToVerifyRecordsApiResponse(verifyRecordsResponses: VerifyRecordsResponse): VerifyRecordsApiResponse {
-    return {
-      records: {
-        ...verifyRecordsResponses
-      }
-    };
+  mapVerifyRecordsResponsesToVerifyRecordsApiResponses(verifyRecordsResponses: VerifyRecordsResponse[]): VerifyRecordsApiResponse[] {
+    return verifyRecordsResponses.map((response) => {
+      return {
+        ens: response.subname,
+        credentials: response.records
+      };
+    });
   }
 }

apps/vc-api/src/api/verify-records/requests/verify-records.api.request.ts

@@ -1,21 +1,23 @@
-import { IsArray, IsInt, IsOptional, IsString } from 'class-validator';
+import { IsArray, IsOptional, IsString } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
-import { Transform, Type } from 'class-transformer';
-import {ChainId} from "@justaname.id/sdk";
-import {Credentials} from "../../../core/domain/entities/credentials";
+import { Transform } from 'class-transformer';
+import { Credentials } from '../../../core/domain/entities/credentials';
 
 export class VerifyRecordsApiRequest {
   @ApiProperty()
   @IsString()
-  ens: string;
+  providerUrl: string;
 
   @ApiProperty()
-  @Type(() => Number)
-  @IsInt()
-  chainId: ChainId;
+  @IsArray()
+  @IsString({ each: true })
+  @Transform(({ value }) => (Array.isArray(value) ? value : [value]))
+  ens: string[];
 
   @ApiProperty()
   @IsArray()
+  @IsString({ each: true })
+  @Transform(({ value }) => (Array.isArray(value) ? value : [value]))
   credentials: Credentials[];
 
   @ApiProperty()

apps/vc-api/src/api/verify-records/responses/verify-records.api.response.ts

@@ -1,6 +1,13 @@
 import { ApiProperty } from '@nestjs/swagger';
 
 export class VerifyRecordsApiResponse {
+  @ApiProperty({
+    type: 'string',
+    example: 'subname.domain.eth'
+  })
+  ens: string;
+
+
   @ApiProperty({
     type: 'object',
     additionalProperties: {
@@ -11,5 +18,5 @@ export class VerifyRecordsApiResponse {
       record2: false
     }
   })
-  records: { [key: string]: boolean };
+  credentials: { [key: string]: boolean };
 }

apps/vc-api/src/api/verify-records/verify-records.controller.ts

@@ -1,29 +1,36 @@
-import { Controller, Get, Inject, Param, Query } from '@nestjs/common';
+import { Controller, Get, Inject, Query } from '@nestjs/common';
+import { VerifyRecordsApiRequest } from './requests/verify-records.api.request';
+import { VerifyRecordsApiResponse } from './responses/verify-records.api.response';
 import {
   IVerifyRecordsService,
-  VERIFY_RECORDS_SERVICE
+  VERIFY_RECORDS_SERVICE,
 } from '../../core/applications/verify-records/iverify-records.service';
-import { VerifyRecordsApiRequest } from './requests/verify-records.api.request';
-import { IVerifyRecordsControllerMapper } from './mapper/iverify-records.controller.mapper';
-import {VerifyRecordsApiResponse} from "./responses/verify-records.api.response";
+import {
+  IVerifyRecordsControllerMapper,
+  VERIFY_RECORDS_CONTROLLER_MAPPER,
+} from './mapper/iverify-records.controller.mapper';
 
 @Controller('verify-records')
 export class VerifyRecordsController {
-
   constructor(
-    @Inject(VERIFY_RECORDS_SERVICE) private readonly verifyRecordsService: IVerifyRecordsService,
-    @Inject('VERIFY_RECORDS_CONTROLLER_MAPPER') private readonly verifyRecordsControllerMapper: IVerifyRecordsControllerMapper
+    @Inject(VERIFY_RECORDS_SERVICE)
+    private readonly verifyRecordsService: IVerifyRecordsService,
+    @Inject(VERIFY_RECORDS_CONTROLLER_MAPPER)
+    private readonly verifyRecordsControllerMapper: IVerifyRecordsControllerMapper
   ) {}
+
   @Get('')
   async verifyRecords(
     @Query() query: VerifyRecordsApiRequest
-  ): Promise<VerifyRecordsApiResponse> {
+  ): Promise<VerifyRecordsApiResponse[]> {
     const response = await this.verifyRecordsService.verifyRecords(
       this.verifyRecordsControllerMapper.mapVerifyRecordsApiRequestToVerifyRecordsRequest(
         query
       )
     );
 
-    return this.verifyRecordsControllerMapper.mapVerifyRecordsResponseToVerifyRecordsApiResponse(response);
+    return this.verifyRecordsControllerMapper.mapVerifyRecordsResponsesToVerifyRecordsApiResponses(
+      response
+    );
   }
 }