updated api path and updated dto

hypersign-protocol · Sep 19, 2024 · 2f62188 · 2f62188
1 parent 7461529
commit 2f62188
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 35 deletions.
diff --git a/src/did/controllers/did.controller.ts b/src/did/controllers/did.controller.ts
@@ -224,7 +224,7 @@ export class DidController {
     return this.didService.addVerificationMethod(addVm);
   }
 
-  @Post('/sign')
+  @Post('/auth/sign')
   @ApiOkResponse({
     description: 'DidDocument is signed successfully',
     type: SignedDidDocument,
@@ -254,7 +254,7 @@ export class DidController {
     Logger.log('SignDidDocument() method: starts', 'DidController');
     return this.didService.SignDidDocument(signDidDocDto, req.user);
   }
-  @Post('/verify')
+  @Post('/auth/verify')
   @ApiOkResponse({
     description: 'DidDocument is verified successfully',
     type: VerifyDidDocResponseDto,
@@ -275,7 +275,6 @@ export class DidController {
     required: false,
   })
   @UsePipes(ValidationPipe)
-  @UsePipes(new AtLeastOneParamPipe(['did', 'didDocument']))
   VerifyDidDocument(
     @Headers('Authorization') authorization: string,
     @Req() req: any,

diff --git a/src/did/dto/verify-did.dto.ts b/src/did/dto/verify-did.dto.ts
@@ -15,37 +15,15 @@ import { ValidateVerificationMethodId } from 'src/utils/customDecorator/vmId.dec
 
 export class VerifyDidDto {
   @ApiProperty({
-    name: 'didDocument',
-    description: 'didDocument',
-    type: DidDoc,
+    name: 'signedDidDocument',
+    description: 'signedDidDocument',
+    type: SignedDidDocument,
   })
   @IsOptional()
   @IsNotEmptyObject()
   @Type(() => SignedDidDocument)
   @ValidateNested({ each: true })
-  didDocument: SignedDidDocument;
-  @ApiProperty({
-    description: 'Verification Method id for did registration',
-    example: 'did:hid:testnet:........#key-${idx}',
-    required: true,
-  })
-  @ValidateVerificationMethodId()
-  @IsString()
-  @Matches(/^[a-zA-Z0-9\:]*testnet[a-zA-Z0-9\-:#]*$/, {
-    message: "Did's namespace should be testnet",
-  }) // this is to validate if did is generated using empty namespace
-  verificationMethodId: string;
-
-  @ApiProperty({
-    name: 'options',
-    description: 'optional parameter',
-    type: DidSignOption,
-    required: false,
-  })
-  @IsOptional()
-  @Type(() => DidSignOption)
-  @ValidateNested({ each: true })
-  options?: DidSignOption;
+  signedDidDocument: SignedDidDocument;
 }
 
 export class Controller {

diff --git a/src/did/services/did.service.ts b/src/did/services/did.service.ts
@@ -826,13 +826,14 @@ export class DidService {
       appMenemonic,
       namespace,
     );
-    const purpose =
-      verifyDidDto?.options?.purpose || SupportedPurpose.assertionMethod;
-    const domain = verifyDidDto?.options?.domain;
-    const challenge = verifyDidDto?.options?.challenge;
+    const purpose = verifyDidDto.signedDidDocument.proof
+      .proofPurpose as SupportedPurpose;
+    const domain = verifyDidDto?.signedDidDocument.proof?.domain;
+    const challenge = verifyDidDto?.signedDidDocument.proof?.challenge;
     const params = {
-      didDocument: verifyDidDto.didDocument,
-      verificationMethodId: verifyDidDto.verificationMethodId,
+      didDocument: verifyDidDto.signedDidDocument,
+      verificationMethodId:
+        verifyDidDto.signedDidDocument.proof.verificationMethod,
       domain,
       challenge,
       purpose,