some refactoring

harden metadata loading

src/2fa/2FA.ts

@@ -1,5 +1,5 @@
 import { create2FA } from "./create";
-import { burn2fa } from "./burn";
+import { burn2FA } from "./burn";
 import { list2FAs, load2FAsByIdentityId } from "./list";
 import { BigNumber } from "ethers";
 import Masa from "../masa";
@@ -14,7 +14,7 @@ export const twoFA = (masa: Masa) => ({
   generate: (phoneNumber: string) => masa.client.twoFAGenerate(phoneNumber),
   create: (phoneNumber: string, code: string) =>
     create2FA(masa, phoneNumber, code),
-  burn: (twofaId: number) => burn2fa(masa, twofaId),
+  burn: (twoFAId: number) => burn2FA(masa, twoFAId),
   list: (address?: string) => list2FAs(masa, address),
   load: (identityId: BigNumber) => load2FAsByIdentityId(masa, identityId),
 });

src/2fa/burn.ts

@@ -1,13 +1,13 @@
 import Masa from "../masa";
 
-export const burn2faById = async (
+export const burn2FAById = async (
   masa: Masa,
-  twofaId: number
+  twoFAId: number
 ): Promise<boolean> => {
   try {
     const tx = await masa.contracts.identity.Soulbound2FA.connect(
       masa.config.wallet
-    ).burn(twofaId);
+    ).burn(twoFAId);
 
     console.log("Waiting for the burn tx to finalize");
     await tx.wait();
@@ -20,21 +20,21 @@ export const burn2faById = async (
   return false;
 };
 
-export const burn2fa = async (
+export const burn2FA = async (
   masa: Masa,
-  twofaId: number
+  twoFAId: number
 ): Promise<boolean> => {
   let success = false;
 
   if (await masa.session.checkLogin()) {
     const identityId = await masa.identity.load();
     if (!identityId) return success;
-    console.log(`Burning 2FA with id '${twofaId}'!`);
+    console.log(`Burning 2FA with id '${twoFAId}'!`);
 
-    success = await burn2faById(masa, twofaId);
+    success = await burn2FAById(masa, twoFAId);
 
     if (success) {
-      console.log(`Burned 2FA with id '${twofaId}'!`);
+      console.log(`Burned 2FA with id '${twoFAId}'!`);
     }
   } else {
     console.log("Not logged in please login first");

src/2fa/list.ts

@@ -10,7 +10,7 @@ export const load2FAsByIdentityId = async (
   {
     tokenId: BigNumber;
     tokenUri: string;
-    metadata: I2FA;
+    metadata?: I2FA;
   }[]
 > => {
   const twoFSIds: BigNumber[] =
@@ -25,7 +25,7 @@ export const load2FAsByIdentityId = async (
         await masa.contracts.identity.Soulbound2FA.tokenURI(tokenId)
       );
 
-      const metadata = (await masa.metadata.retrieve(tokenUri)) as I2FA;
+      const metadata = <I2FA | undefined>await masa.metadata.retrieve(tokenUri);
 
       return {
         tokenId,
@@ -43,7 +43,7 @@ export const list2FAs = async (
   {
     tokenId: BigNumber;
     tokenUri: string;
-    metadata: I2FA;
+    metadata?: I2FA;
   }[]
 > => {
   address = address || (await masa.config.wallet.getAddress());
@@ -58,8 +58,11 @@ export const list2FAs = async (
   let i = 1;
   for (const twoFA of twoFAs) {
     console.log(`Token: ${i}`);
+    console.log(`Token ID: ${twoFA.tokenId}`);
     i++;
-    console.log(`Metadata: ${JSON.stringify(twoFA.metadata, null, 2)}`);
+    if (twoFA.metadata) {
+      console.log(`Metadata: ${JSON.stringify(twoFA.metadata, null, 2)}`);
+    }
   }
 
   return twoFAs;

src/contracts/load-Identity-contracts.ts

@@ -24,6 +24,7 @@ export const loadIdentityContracts = ({
     provider ||
     // or try to load from the browser
     new ethers.providers.Web3Provider(
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
       window.ethereum
     );

src/credit-score/list.ts

@@ -10,7 +10,7 @@ export const loadCreditScoresByIdentityId = async (
   {
     tokenId: BigNumber;
     tokenUri: string;
-    metadata: ICreditScore;
+    metadata?: ICreditScore;
   }[]
 > => {
   const creditScoreIds: BigNumber[] =
@@ -31,7 +31,9 @@ export const loadCreditScoresByIdentityId = async (
       );
 
       console.log(`Metadata Url: ${tokenUri}`);
-      const metadata = (await masa.metadata.retrieve(tokenUri)) as ICreditScore;
+      const metadata: ICreditScore | undefined = <ICreditScore | undefined>(
+        await masa.metadata.retrieve(tokenUri)
+      );
 
       return {
         tokenId,
@@ -46,25 +48,30 @@ export const listCreditReports = async (
   masa: Masa,
   address?: string
 ): Promise<
-  | {
-      tokenId: BigNumber;
-      tokenUri: string;
-      metadata: ICreditScore;
-    }[]
-  | undefined
+  {
+    tokenId: BigNumber;
+    tokenUri: string;
+    metadata?: ICreditScore;
+  }[]
 > => {
   address = address || (await masa.config.wallet.getAddress());
 
   const identityId = await masa.identity.load(address);
-  if (!identityId) return;
+  if (!identityId) return [];
 
-  const creditReports = await loadCreditScoresByIdentityId(masa, identityId);
+  const creditScores = await loadCreditScoresByIdentityId(masa, identityId);
 
-  if (creditReports.length === 0) console.log("No Credit Scores found");
+  if (creditScores.length === 0) console.log("No Credit Scores found");
 
-  for (const creditReport of creditReports) {
-    console.log(`Metadata: ${JSON.stringify(creditReport.metadata, null, 2)}`);
+  let i = 1;
+  for (const creditScore of creditScores) {
+    console.log(`Token: ${i}`);
+    console.log(`Token ID: ${creditScore.tokenId}`);
+    i++;
+    if (creditScore.metadata) {
+      console.log(`Metadata: ${JSON.stringify(creditScore.metadata, null, 2)}`);
+    }
   }
 
-  return creditReports;
+  return creditScores;
 };

src/identity/index.ts

@@ -2,4 +2,4 @@ export * from "./burn";
 export * from "./create";
 export * from "./load";
 export * from "./show";
-export * from "./indetity";
+export * from "./identity";

src/identity/show.ts

@@ -18,7 +18,9 @@ export const loadIdentityDetails = async (
     ](identityId)
   );
 
-  const metadata = (await masa.metadata.retrieve(tokenUri)) as IIdentity;
+  const metadata: IIdentity | undefined = <IIdentity | undefined>(
+    await masa.metadata.retrieve(tokenUri)
+  );
 
   return {
     tokenId: identityId,

src/utils/clients/middleware.ts

@@ -42,11 +42,15 @@ export class MasaClient {
   getMetadata = async (
     uri: string
   ): Promise<IIdentity | ICreditScore | I2FA | undefined> => {
-    const metadataResponse = await this.middlewareClient.get(uri, {
-      headers: {
-        cookie: this.cookie ? [this.cookie] : undefined,
-      },
-    });
+    const metadataResponse = await this.middlewareClient
+      .get(uri, {
+        headers: {
+          cookie: this.cookie ? [this.cookie] : undefined,
+        },
+      })
+      .catch((err) => {
+        console.error("Failed to load Metadata!", err.message, uri);
+      });
 
     if (metadataResponse) {
       const { data: metadata } = metadataResponse;