Merge pull request #1728 from tw-mosip/fix-wellknown-error

[INJIMOB-2415] store the wellknown data as object in activity log file
mosip · Dec 5, 2024 · 9e8e167 · 9e8e167
2 parents 0cc262d + 67389c6
commit 9e8e167
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/components/VC/common/VCUtils.tsx b/components/VC/common/VCUtils.tsx
@@ -269,19 +269,23 @@ export const getCredentialTypeFromWellKnown = (
   wellknown: IssuerWellknownResponse,
   credentialConfigurationId: string | undefined = undefined,
 ): string => {
-  if (credentialConfigurationId !== undefined) {
-    const supportedCredentialsWellknown = getMatchingCredentialIssuerMetadata(
-      wellknown,
-      credentialConfigurationId,
+  try {
+    if (credentialConfigurationId !== undefined) {
+      const supportedCredentialsWellknown = getMatchingCredentialIssuerMetadata(
+        wellknown,
+        credentialConfigurationId,
+      );
+      return getCredentialType(supportedCredentialsWellknown);
+    }
+    console.error(
+      'credentialConfigurationId not available for fetching the Credential type',
+    );
+    throw new Error(
+      `Invalid credentialConfigurationId - ${credentialConfigurationId} passed`,
     );
-    return getCredentialType(supportedCredentialsWellknown);
+  } catch (error) {
+    return i18n.t('VcDetails:identityCard');
   }
-  console.error(
-    'credentialConfigurationId not available for fetching the Credential type',
-  );
-  throw new Error(
-    `Invalid credentialConfigurationId - ${credentialConfigurationId} passed`,
-  );
 };
 
 export class Display {

diff --git a/machines/activityLog.ts b/machines/activityLog.ts
@@ -6,6 +6,7 @@ import {StoreEvents} from './store';
 import {VCActivityLog} from '../components/ActivityLogEvent';
 import {IssuerWellknownResponse} from './VerifiableCredential/VCMetaMachine/vc';
 import {VPShareActivityLog} from '../components/VPShareActivityLogEvent';
+import {parseJSON} from '../shared/Utils';
 
 const model = createModel(
   {
@@ -155,6 +156,10 @@ export const activityLogMachine =
 
         setAllWellknownConfigResponse: model.assign({
           wellKnownIssuerMap: (_, event) => {
+            Object.entries(event.response).forEach(([key, value]) => {
+              event.response[key] = parseJSON(value);
+            });
+
             return event.response as Record<string, Object>;
           },
         }),