From 137fce3e309dfaf77d9a414bcdc447da15b0b49e Mon Sep 17 00:00:00 2001 From: Matthew Raymer Date: Wed, 28 May 2025 09:00:46 +0000 Subject: [PATCH] fix(endorserServer): improve type safety and error handling - Update claimSummary to handle both GenericVerifiableCredential and GenericCredWrapper types - Fix logger error handling in register function to properly stringify response data - Add type narrowing with 'claim' in claim check for safer type handling - Improve error message formatting for registration errors This change improves type safety by properly handling different claim types and ensures consistent error logging. The registration error handling now properly stringifies response data for better debugging. --- src/libs/endorserServer.ts | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/libs/endorserServer.ts b/src/libs/endorserServer.ts index d482fd06..ce4f65f3 100644 --- a/src/libs/endorserServer.ts +++ b/src/libs/endorserServer.ts @@ -1106,21 +1106,20 @@ export const capitalizeAndInsertSpacesBeforeCaps = (text: string) => { similar code is also contained in endorser-mobile **/ -// eslint-disable-next-line @typescript-eslint/no-explicit-any const claimSummary = ( - claim: GenericCredWrapper, + claim: GenericVerifiableCredential | GenericCredWrapper, ) => { if (!claim) { // to differentiate from "something" above return "something"; } - let specificClaim: - | GenericVerifiableCredential - | GenericCredWrapper = claim; - if (claim.claim) { - // probably a Verified Credential - // eslint-disable-next-line @typescript-eslint/no-explicit-any + let specificClaim: GenericVerifiableCredential; + if ('claim' in claim) { + // It's a GenericCredWrapper specificClaim = claim.claim; + } else { + // It's already a GenericVerifiableCredential + specificClaim = claim; } if (Array.isArray(specificClaim)) { if (specificClaim.length === 1) { @@ -1339,7 +1338,7 @@ export async function register( } return { error: message }; } else { - logger.error(resp); + logger.error("Registration error:", JSON.stringify(resp.data)); return { error: "Got a server error when registering." }; } }