chore: merge develop

.changeset/calm-icons-develop.md

@@ -0,0 +1,5 @@
+---
+"@blockchain-lab-um/masca": patch
+---
+
+Use external verification for verifyData rpc.

.changeset/eleven-eyes-hide.md

@@ -0,0 +1,5 @@
+---
+"@blockchain-lab-um/dapp": patch
+---
+
+Replaced shared presentation verifying lib.

packages/dapp/package.json

@@ -20,6 +20,7 @@
   },
   "dependencies": {
     "@blockchain-lab-um/did-provider-key": "1.0.8",
+    "@blockchain-lab-um/extended-verification": "0.1.2",
     "@blockchain-lab-um/masca-connector": "1.3.2",
     "@blockchain-lab-um/oidc-types": "0.0.8",
     "@headlessui/react": "^1.7.18",

packages/dapp/src/app/api/share/presentation/route.ts

@@ -1,8 +1,13 @@
 import jwt from 'jsonwebtoken';
 import { type NextRequest, NextResponse } from 'next/server';
+import {
+  type VerificationResult,
+  VerificationService,
+} from '@blockchain-lab-um/extended-verification';
 
-import { getAgent } from '../../veramoSetup';
 import { supabaseServiceRoleClient } from '@/utils/supabase/supabaseServiceRoleClient';
+import type { W3CVerifiablePresentation } from '@veramo/core';
+import { isError, type Result } from '@blockchain-lab-um/masca-connector';
 
 const CORS_HEADERS = {
   'Access-Control-Allow-Origin': '*',
@@ -54,20 +59,36 @@ export async function POST(request: NextRequest) {
       });
     }
 
-    const agent = await getAgent();
-    const { verified } = await agent.verifyPresentation({
-      presentation,
-    });
+    await VerificationService.init();
+    const verifiedResult: Result<VerificationResult> =
+      await VerificationService.verify(
+        presentation as W3CVerifiablePresentation
+      );
 
-    if (!verified) {
-      return new NextResponse('Presentation not valid', {
-        status: 400,
+    if (isError(verifiedResult)) {
+      return new NextResponse('Failed to verify presentation', {
+        status: 500,
         headers: {
           ...CORS_HEADERS,
         },
       });
     }
 
+    if (!verifiedResult.data.verified) {
+      return NextResponse.json(
+        {
+          message: 'Invalid presentation',
+          details: verifiedResult.data.details,
+        },
+        {
+          status: 400,
+          headers: {
+            ...CORS_HEADERS,
+          },
+        }
+      );
+    }
+
     const supabase = supabaseServiceRoleClient();
 
     const { data, error } = await supabase

packages/dapp/src/components/CampaignsDisplay/RequirementDisplay.tsx

@@ -112,7 +112,7 @@ export const RequirementDisplay = ({
         if (!issuer) return acc;
 
         if (
-          !issuer.includes('did:poylgonid') &&
+          !issuer.includes('did:polygonid') &&
           !issuer.includes('did:iden3')
         ) {
           acc.push(credential);

packages/dapp/src/components/CampaignsDisplay/index.tsx

@@ -1,6 +1,5 @@
 'use client';
 
-import React from 'react';
 import { CampaignDisplay } from './CampaignDisplay';
 import { useCampaigns } from '@/hooks';
 import { Spinner } from '@nextui-org/react';

packages/dapp/src/components/ShareCredentialModal/index.tsx

@@ -155,8 +155,13 @@ export const ShareCredentialModal = () => {
     try {
       const result = await shareResponse.json();
 
-      if (!result.presentationId)
-        throw new Error('Failed to share presentation');
+      if (!result.presentationId) {
+        throw new Error(
+          result.message === 'Invalid presentation'
+            ? 'Invalid presentation'
+            : 'Failed to share presentation'
+        );
+      }
 
       setShareLink(
         `${window.location.origin}/app/share-presentation/${result.presentationId}`
@@ -165,7 +170,10 @@ export const ShareCredentialModal = () => {
       setTimeout(() => {
         useToastStore.setState({
           open: true,
-          title: t('share-presentation-error'),
+          title:
+            (e as Error).message === 'Invalid presentation'
+              ? t('share-error-invalid')
+              : t('share-presentation-error'),
           type: 'error',
           loading: false,
           link: null,
@@ -183,6 +191,7 @@ export const ShareCredentialModal = () => {
       backdrop="blur"
       size="4xl"
       isOpen={isOpen}
+      isDismissable={false}
       onClose={() => setIsOpen(false)}
       hideCloseButton={true}
       placement="center"

packages/dapp/src/hooks/useCampaignClaims.ts

@@ -18,11 +18,12 @@ export type Campaigns = Campaign[];
 export const useCampaignClaims = (token: string | null) => {
   return useQuery({
     queryKey: ['claims'],
+    enabled: !!token,
     queryFn: async () => {
       const res = await fetch('/api/campaigns/claims', {
         headers: {
           'Content-Type': 'application/json',
-          Authorization: `Bearer ${token}`,
+          ...(token && { Authorization: `Bearer ${token}` }),
         },
         cache: 'no-store',
       });

packages/dapp/src/messages/en.json

@@ -604,6 +604,7 @@
     "placeholder": "Enter a title for the presentation. This can't be changed later.",
     "please-sign-in": "Please sign in to share your credentials",
     "selected": "Selected Credentials",
+    "share-error-invalid": "One or more credentials in the presentation are invalid.",
     "share-presentation-error": "Failed to share presentation",
     "share-presentation-success": "Successfully shared presentation",
     "share-link-description": "Share your credential:",

packages/snap/package.json

@@ -56,6 +56,7 @@
   "dependencies": {
     "@0xpolygonid/js-sdk": "1.10.4",
     "@blockchain-lab-um/did-provider-key": "1.0.8",
+    "@blockchain-lab-um/extended-verification": "0.1.2",
     "@blockchain-lab-um/masca-types": "1.3.2",
     "@blockchain-lab-um/oidc-client-plugin": "0.3.1",
     "@blockchain-lab-um/oidc-types": "0.0.8",

packages/snap/snap.manifest.json

@@ -26,7 +26,7 @@
       "./files/circuits/credentialAtomicQuerySigV2/circuit_final.zkey",
       "./files/circuits/credentialAtomicQuerySigV2/verification_key.json"
     ],
-    "shasum": "RytAvQQBPXQc6700bTYaN/kV4WO0i6s+gkRoJuBKcQQ="
+    "shasum": "ZUSWLDLE5CPcpB41V3aqEuQY96qKaQJTEBbwB2SNpPk="
   },
   "initialPermissions": {
     "endowment:ethereum-provider": {},

packages/snap/src/Snap.service.ts

@@ -330,7 +330,6 @@ class SnapService {
 
     const res = await VeramoService.verifyData(params);
 
-    if (res.error) throw new Error(res.error.message);
     return verbose ? res : res.verified;
   }
 

packages/snap/src/veramo/Veramo.service.ts

@@ -1,3 +1,7 @@
+import {
+  type VerificationResult,
+  VerificationService,
+} from '@blockchain-lab-um/extended-verification';
 import {
   KeyDIDProvider,
   getDidKeyResolver as keyDidResolver,
@@ -111,6 +115,7 @@ class VeramoService {
 
   static async init(): Promise<void> {
     VeramoService.instance = await VeramoService.createAgent();
+    await VerificationService.init();
   }
 
   /**
@@ -516,28 +521,22 @@ class VeramoService {
   static async verifyData(
     params: VerifyDataRequestParams
   ): Promise<IVerifyResult> {
-    try {
-      const { credential, presentation } = params;
+    const { credential, presentation } = params;
 
-      if (credential) {
-        const vcResult = await VeramoService.instance.verifyCredential({
-          credential,
-        });
-        return JSON.parse(JSON.stringify(vcResult)) as IVerifyResult;
-      }
-      if (presentation) {
-        const vpResult = await VeramoService.instance.verifyPresentation({
-          presentation,
-        });
-        return JSON.parse(JSON.stringify(vpResult)) as IVerifyResult;
-      }
-      return {
-        verified: false,
-        error: new Error('No valid credential or presentation.'),
-      } as IVerifyResult;
-    } catch (error: unknown) {
-      return { verified: false, error: error as Error } as IVerifyResult;
+    let result: Result<VerificationResult> | undefined = undefined;
+    if (credential) {
+      result = await VerificationService.verify(credential);
+    } else if (presentation) {
+      result = await VerificationService.verify(presentation);
     }
+
+    if (!result) throw new Error('No valid credential or presentation.');
+
+    if (isError(result)) {
+      throw new Error(result.error);
+    }
+
+    return result.data as IVerifyResult;
   }
 
   static async handleOIDCCredentialOffer(params: {