update passport iam

Author: 0xKurt

packages/common/src/services/passport/credentialVerifier.ts

@@ -40,6 +40,8 @@ export class PassportVerifierWithExpiration {
     // const { expirationDate, proof } = credential;
     const { proof } = credential;
 
+    console.log("proof", proof);
+
     // check that the credential is still valid (not expired)
     // if (new Date(expirationDate) > new Date()) {
     try {
@@ -51,6 +53,9 @@ export class PassportVerifierWithExpiration {
         )
       ) as { checks: string[]; warnings: string[]; errors: string[] };
 
+      console.log("verify", verify);
+      console.log("verify.errors", verify.errors.length === 0);
+
       // did we get any errors when we attempted to verify?
       return verify.errors.length === 0;
     } catch (e) {

packages/common/src/services/passport/passportCredentials.ts

@@ -5,9 +5,10 @@ import { VerifiableCredential } from "@gitcoinco/passport-sdk-types";
 import { debounce } from "ts-debounce";
 import { PassportVerifierWithExpiration } from "./credentialVerifier";
 
-const IAM_SERVER =
-  process.env.REACT_APP_PASSPORT_IAM_SERVER ||
-  "did:key:z6MkghvGHLobLEdj1bgRLhS4LPGJAvbMA1tn2zcRyqmYU5LC";
+const IAM_SERVER = [
+  "did:key:z6MkghvGHLobLEdj1bgRLhS4LPGJAvbMA1tn2zcRyqmYU5LC",
+  "did:ethr:0xd6f8d6ca86aa01e551a311d670a0d1bd8577e5fb",
+];
 
 const verifier = new PassportVerifierWithExpiration();
 
@@ -24,7 +25,7 @@ export async function validateCredential(
     handle.toLowerCase();
   const validCredential = await verifier.verifyCredential(credential);
 
-  const validIssuer = IAM_SERVER === credential.issuer;
+  const validIssuer = IAM_SERVER.includes(credential.issuer);
 
   return validCredentialProvider && validCredential && validIssuer;
 }

packages/round-manager/src/features/round/ViewApplicationPage.tsx

@@ -74,8 +74,10 @@ import { convertApplications } from "../api/utils";
 
 type Status = "done" | "current" | "rejected" | "approved" | undefined;
 
-export const IAM_SERVER =
-  "did:key:z6MkghvGHLobLEdj1bgRLhS4LPGJAvbMA1tn2zcRyqmYU5LC";
+export const IAM_SERVER = [
+  "did:key:z6MkghvGHLobLEdj1bgRLhS4LPGJAvbMA1tn2zcRyqmYU5LC",
+  "did:ethr:0xd6f8d6ca86aa01e551a311d670a0d1bd8577e5fb",
+];
 
 const verifier = new PassportVerifierWithExpiration();
 
@@ -927,7 +929,9 @@ async function isVerified(
   application: GrantApplication | undefined
 ) {
   const vcHasValidProof = await verifier.verifyCredential(verifiableCredential);
-  const vcIssuedByValidIAMServer = verifiableCredential.issuer === IAM_SERVER;
+  const vcIssuedByValidIAMServer = IAM_SERVER.includes(
+    verifiableCredential.issuer
+  );
   const providerMatchesProject = vcProviderMatchesProject(
     provider,
     verifiableCredential,