catch stray credential expiration consolewarn

Author: pennhan-dex

src/commands/verify.ts

@@ -4,6 +4,7 @@ import {
     getSupportedNetworkNameFromId,
     readJsonFile,
     CaptureConsoleWarnAsync,
+    CaptureConsoleWarn,
 } from '../utils';
 import {
     getChainId,
@@ -76,8 +77,10 @@ const verifyW3CDocument = async (
 ): Promise<{ result: VerificationFragment[]; warnings: unknown[][] }> => {
     signale.info('Verifying W3C document...');
 
+    const { result: isTransferable } = CaptureConsoleWarn(() => isTransferableRecord(signedVC));
+
     // Non-transferable record: verify directly
-    if (!isTransferableRecord(signedVC)) {
+    if (!isTransferable) {
         return await CaptureConsoleWarnAsync(() => verifyDocument(signedVC));
     }
 

src/utils/formatting.ts

@@ -40,7 +40,26 @@ export const getErrorMessage = function (error: unknown): string {
   }
 };
 
-// Captures console.warn for an async function to handle expected console.warn. Restores original console.warn functionality after the function is executed.
+// Captures console.warn for a function to handle expected console.warn. 
+// Restores original console.warn functionality after the function is executed.
+export const CaptureConsoleWarn= <T>(fn: () => T): { result: T; warnings: unknown[][] } =>  {
+  const originalWarn = console.warn;
+  const warnings: unknown[][] = [];
+
+  console.warn = (...args) => {
+    warnings.push(args);
+  };
+
+  try {
+    const result = fn();
+    return { result, warnings };
+  } finally {
+    console.warn = originalWarn;
+  }
+}
+
+// Async captures console.warn for an async function to handle expected console.warn. 
+// Restores original console.warn functionality after the function is executed.
 export const CaptureConsoleWarnAsync = async <T>(fn: () => Promise<T>): Promise<{ result: T; warnings: unknown[][] }> =>  {
   const originalWarn = console.warn;
   const warnings: unknown[][] = [];

tests/main.test.ts

@@ -537,13 +537,15 @@ describe('trustvc-cli', () => {
     let signaleSuccessSpy: MockedFunction<typeof signale.success>;
     let readJsonFileMock: MockedFunction<typeof utils.readJsonFile>;
     let CaptureConsoleWarnAsyncMock: MockedFunction<typeof utils.CaptureConsoleWarnAsync>;
+    let CaptureConsoleWarnMock: MockedFunction<typeof utils.CaptureConsoleWarn>;
     let getSupportedNetworkMock: MockedFunction<typeof utils.getSupportedNetwork>;
     let getSupportedNetworkNameFromIdMock: MockedFunction<typeof utils.getSupportedNetworkNameFromId>;
 
     const OA_V3_DNS_TXT_TOKEN_REGISTRY_FIXTURE = './tests/fixtures/verify/oa/3.0/signed_wrapped_oa_dns_txt_token_registry_v3.json';
     const W3C_REVOKED_DNS_DID_FIXTURE = './tests/fixtures/verify/w3c/revoked_ecdsa_w3c_verifiable_document_v2_0.json';
 
     beforeEach(async () => {
+      vi.clearAllMocks();
       vi.resetAllMocks();
 
       signalWarnSpy = signale.warn as MockedFunction<typeof signale.warn>;
@@ -562,6 +564,9 @@ describe('trustvc-cli', () => {
 
       CaptureConsoleWarnAsyncMock = utils.CaptureConsoleWarnAsync as MockedFunction<typeof utils.CaptureConsoleWarnAsync>;
       CaptureConsoleWarnAsyncMock.mockImplementation((fn: any) => actualUtils.CaptureConsoleWarnAsync(fn));
+
+      CaptureConsoleWarnMock = utils.CaptureConsoleWarn as MockedFunction<typeof utils.CaptureConsoleWarn>;
+      CaptureConsoleWarnMock.mockImplementation((fn: any) => actualUtils.CaptureConsoleWarn(fn));
     });
 
     it(
@@ -582,7 +587,6 @@ describe('trustvc-cli', () => {
         (prompts.input as any).mockResolvedValueOnce(W3C_REVOKED_DNS_DID_FIXTURE);
 
         await verifyHandler();
-
         expect(signaleSuccessSpy).toHaveBeenCalledWith('DOCUMENT_INTEGRITY: VALID');
         expect(signaleSuccessSpy).toHaveBeenCalledWith('ISSUER_IDENTITY: VALID');
         expect(signalWarnSpy).toHaveBeenCalledWith(expect.stringContaining('DOCUMENT_STATUS: INVALID [Document has been revoked.]'));