seems to work

nevermined-io · Aug 31, 2022 · 8f03e98 · 8f03e98
1 parent cfd4d5d
commit 8f03e98
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/access/access.controller.ts b/src/access/access.controller.ts
@@ -113,6 +113,25 @@ export class AccessController {
     return (await getAssetUrl(req.user.did, index)).url;
   }
 
+  @Get('nft-access-proof/:agreement_id/:index')
+  @ApiOperation({
+    description: 'NFT Access asset w/ DTP proof',
+    summary: 'Public',
+  })
+  @ApiResponse({
+    status: 200,
+    description: 'Return the url of asset',
+    type: String,
+  })
+  @ApiBearerAuth('Authorization')
+  async doNFTAccessProof(
+    @Req() req: Request<unknown>,
+    @Response({ passthrough: true }) res,
+    @Param('index') index: number,
+  ): Promise<string> {
+    return (await getAssetUrl(req.user.did, index)).url;
+  }
+
   @Get('nft-access/:agreement_id/:index')
   @ApiOperation({
     description: 'Access asset',

diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
@@ -238,6 +238,7 @@ export class AuthService {
     const ddo = await nevermined.assets.resolve(did);
     const service = ddo.findServiceByType('nft-access-proof');
     if (!service) {
+      // console.log('its 721');
       await this.validateNft721AccessProof(agreement_id, did, consumer_address, buyer, babysig);
       return;
     }
@@ -247,6 +248,7 @@ export class AuthService {
       if (await nevermined.keeper.nftUpgradeable.balance(consumer_address, did) < numberNfts) {
         throw new UnauthorizedException(`Address ${consumer_address} hasn't enough ${did} NFT balance, ${numberNfts.toString()} required`);
       }
+      // console.log('no agreement?');
       return;
     }
     const instanceConfig = {
@@ -266,11 +268,13 @@ export class AuthService {
       throw new UnauthorizedException(`Bad signature for address ${consumer_address}`);
     }
 
+    // console.log('number', numberNfts.toNumber());
     const params = dtp.nftAccessProofTemplate.params(consumer, consumer_address, numberNfts.toNumber());
     const conditions = [
       {name: 'holder', fulfill: false},
       {name: 'access', fulfill: true, condition: dtp.accessProofCondition, extra},
     ];
+    // console.log('going to validate', consumer_address);
     await validateAgreement({
       agreement_id,
       did,
@@ -305,7 +309,7 @@ export class AuthService {
         await this.validateAccess(payload.sub, payload.did as string, payload.iss);
       } else if (payload.aud === BASE_URL + 'access-proof') {
         await this.validateAccessProof(payload.sub, payload.did as string, payload.iss, payload.buyer as string, payload.babysig as Babysig);
-      } else if (payload.aud === BASE_URL + 'access-proof') {
+      } else if (payload.aud === BASE_URL + 'nft-access-proof') {
         await this.validateNftAccessProof(payload.sub, payload.did as string, payload.iss, payload.buyer as string, payload.babysig as Babysig);
       } else if (payload.aud === BASE_URL + 'nft-transfer-proof') {
         await this.validateTransferProof(payload.sub, payload.did as string, payload.iss, payload.buyer as string, payload.babysig as Babysig);