Many fixes -- especially and endorserServer

src/libs/endorserServer.ts

@@ -75,7 +75,7 @@ export interface InternalError {
 // See https://github.com/trentlarson/endorser-ch/blob/0cb626f803028e7d9c67f095858a9fc8542e3dbd/server/api/services/util.js#L6
 const HIDDEN_DID = "did:none:HIDDEN";
 
-export function isHiddenDid(did) {
+export function isHiddenDid(did: string) {
   return did === HIDDEN_DID;
 }
 
@@ -88,7 +88,7 @@ export function didInfo(
   allMyDids: Array<string>,
   contacts: Array<Contact>,
 ): string {
-  const myId: string | undefined = R.find(R.equals(did), allMyDids, did);
+  const myId: string | undefined = R.find(R.equals(did), allMyDids);
   if (myId) {
     return "You" + (myId !== activeDid ? " (Alt ID)" : "");
   } else {
@@ -105,6 +105,18 @@ export function didInfo(
   }
 }
 
+interface SuccessResult {
+  type: "success";
+  response: AxiosResponse<ClaimResult>;
+}
+
+interface ErrorResult {
+  type: "error";
+  error: InternalError;
+}
+
+type CreateAndSubmitGiveResult = SuccessResult | ErrorResult;
+
 /**
  * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
  *
@@ -123,71 +135,108 @@ export async function createAndSubmitGive(
   description: string,
   hours: number,
   fulfillsProjectHandleId?: string,
-): Promise<AxiosResponse<ClaimResult> | InternalError> {
-  // Make a claim
-  const vcClaim: GiveVerifiableCredential = {
-    "@context": "https://schema.org",
-    "@type": "GiveAction",
-    recipient: { identifier: toDid },
-  };
-  if (fromDid) {
-    vcClaim.agent = { identifier: fromDid };
-  }
-  if (description) {
-    vcClaim.description = description;
-  }
-  if (hours) {
-    vcClaim.object = { amountOfThisGood: hours, unitCode: "HUR" };
-  }
-  if (fulfillsProjectHandleId) {
-    vcClaim.fulfills = {
-      "@type": "PlanAction",
-      identifier: fulfillsProjectHandleId,
+): Promise<CreateAndSubmitGiveResult> {
+  try {
+    // Make a claim
+    const vcClaim: GiveVerifiableCredential = {
+      "@context": "https://schema.org",
+      "@type": "GiveAction",
+      recipient: { identifier: toDid },
+    };
+    if (fromDid) {
+      vcClaim.agent = { identifier: fromDid };
+    }
+    if (description) {
+      vcClaim.description = description;
+    }
+    if (hours) {
+      vcClaim.object = { amountOfThisGood: hours, unitCode: "HUR" };
+    }
+    if (fulfillsProjectHandleId) {
+      vcClaim.fulfills = {
+        "@type": "PlanAction",
+        identifier: fulfillsProjectHandleId,
+      };
+    }
+    // Make a payload for the claim
+    const vcPayload = {
+      vc: {
+        "@context": ["https://www.w3.org/2018/credentials/v1"],
+        type: ["VerifiableCredential"],
+        credentialSubject: vcClaim,
+      },
+    };
+
+    // Create a signature using private key of identity
+    const firstKey = identity.keys[0];
+    if (!firstKey || !firstKey.privateKeyHex) {
+      throw {
+        error: "No private key",
+        message: `Your identifier ${identity.did} is not configured correctly. Use a different identifier.`,
+      };
+    }
+
+    const privateKeyHex = firstKey.privateKeyHex;
+
+    if (!privateKeyHex) {
+      throw {
+        error: "No private key",
+        message: `Your identifier ${identity.did} is not configured correctly. Use a different identifier.`,
+      };
+    }
+
+    const signer = await SimpleSigner(privateKeyHex);
+    const alg = undefined;
+
+    // Create a JWT for the request
+
+    const vcJwt: string = await didJwt.createJWT(vcPayload, {
+      alg: alg,
+      issuer: identity.did,
+      signer: signer,
+    });
+
+    // Make the xhr request payload
+
+    const payload = JSON.stringify({ jwtEncoded: vcJwt });
+    const url = apiServer + "/api/v2/claim";
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+
+    const response = await axios.post(url, payload, { headers });
+    return {
+      type: "success",
+      response,
+    };
+  } catch (error: unknown) {
+    let errorMessage: string;
+
+    if (error instanceof Error) {
+      // If it's a JavaScript Error object
+      errorMessage = error.message;
+    } else if (
+      typeof error === "object" &&
+      error !== null &&
+      "message" in error
+    ) {
+      // If it's an object that has a 'message' property
+      errorMessage = (error as { message: string }).message;
+    } else {
+      // Unknown error shape, default message
+      errorMessage = "Unknown error";
+    }
+
+    return {
+      type: "error",
+      error: {
+        error: errorMessage,
+        userMessage: "Failed to create and submit the claim",
+      },
     };
   }
-  // Make a payload for the claim
-  const vcPayload = {
-    vc: {
-      "@context": ["https://www.w3.org/2018/credentials/v1"],
-      type: ["VerifiableCredential"],
-      credentialSubject: vcClaim,
-    },
-  };
-  // Create a signature using private key of identity
-  if (identity.keys[0].privateKeyHex == null) {
-    return new Promise<InternalError>((resolve, reject) => {
-      reject({
-        error: "No private key",
-        message:
-          "Your identifier " +
-          identity.did +
-          " is not configured correctly. Use a different identifier.",
-      });
-    });
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  const privateKeyHex: string = identity.keys[0].privateKeyHex!;
-  const signer = await SimpleSigner(privateKeyHex);
-  const alg = undefined;
-  // Create a JWT for the request
-  const vcJwt: string = await didJwt.createJWT(vcPayload, {
-    alg: alg,
-    issuer: identity.did,
-    signer: signer,
-  });
-
-  // Make the xhr request payload
-
-  const payload = JSON.stringify({ jwtEncoded: vcJwt });
-  const url = apiServer + "/api/v2/claim";
-  const token = await accessToken(identity);
-  const headers = {
-    "Content-Type": "application/json",
-    Authorization: "Bearer " + token,
-  };
-
-  return axios.post(url, payload, { headers });
 }
 
 // from https://stackoverflow.com/a/175787/845494