feat(inji-533): add null check for decrypt json for both hardware ke…

…ystore and cryptojs Signed-off-by: Tilak Puli <[email protected]>
mosip · Nov 3, 2023 · 6c9d9b1 · 6c9d9b1
1 parent 9e0492d
commit 6c9d9b1
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/shared/cryptoutil/cryptoUtil.ts b/shared/cryptoutil/cryptoUtil.ts
@@ -115,6 +115,10 @@ export async function decryptJson(
   encryptedData: string,
 ): Promise<string> {
   try {
+    if (encryptedData === null || encryptedData === undefined) {
+      // to avoid crash in case of null or undefined
+      return '';
+    }
     // Disable Encryption in debug mode
     if (DEBUG_MODE_ENABLED && __DEV__) {
       return JSON.parse(encryptedData);
@@ -126,11 +130,6 @@ export async function decryptJson(
       );
     }
 
-    if (encryptedData === null || encryptedData === undefined) {
-      // to avoid crash in case of null or undefined
-      return '';
-    }
-
     return await SecureKeystore.decryptData(ENCRYPTION_ID, encryptedData);
   } catch (e) {
     console.error('error decryptJson:', e);