From e7993c2d1b8bfa775ea1a9fac71e75d8db0631ab Mon Sep 17 00:00:00 2001
From: Prakash Senthil Vel <23444145+prakashsvmx@users.noreply.github.com>
Date: Thu, 21 Sep 2023 08:15:51 +0530
Subject: [PATCH] Fix: handle crash in error handling of access keys page
 (#3051)

---
 portal-ui/src/screens/Console/Account/Account.tsx     | 11 +++++++----
 .../Console/Account/AddServiceAccountScreen.tsx       |  7 +++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/portal-ui/src/screens/Console/Account/Account.tsx b/portal-ui/src/screens/Console/Account/Account.tsx
index 57f15cd26..753fa8b6f 100644
--- a/portal-ui/src/screens/Console/Account/Account.tsx
+++ b/portal-ui/src/screens/Console/Account/Account.tsx
@@ -47,7 +47,7 @@ import { errorToHandler } from "api/errors";
 import HelpMenu from "../HelpMenu";
 import { ACCOUNT_TABLE_COLUMNS } from "./AccountUtils";
 import { useAppDispatch } from "store";
-import { ApiError, ServiceAccounts } from "api/consoleApi";
+import { ServiceAccounts } from "api/consoleApi";
 import {
   setErrorSnackMessage,
   setHelpName,
@@ -104,9 +104,12 @@ const Account = () => {
           const sortedRows = res.data.sort(usersSort);
           setRecords(sortedRows);
         })
-        .catch(async (res) => {
-          const err = (await res.json()) as ApiError;
-          dispatch(setErrorSnackMessage(errorToHandler(err)));
+        .catch((res) => {
+          dispatch(
+            setErrorSnackMessage(
+              errorToHandler(res?.error || "Error retrieving access keys"),
+            ),
+          );
           setLoading(false);
         });
     }
diff --git a/portal-ui/src/screens/Console/Account/AddServiceAccountScreen.tsx b/portal-ui/src/screens/Console/Account/AddServiceAccountScreen.tsx
index 17d0a94b9..7429a52a7 100644
--- a/portal-ui/src/screens/Console/Account/AddServiceAccountScreen.tsx
+++ b/portal-ui/src/screens/Console/Account/AddServiceAccountScreen.tsx
@@ -35,7 +35,7 @@ import { IAM_PAGES } from "../../../common/SecureComponent/permissions";
 import { setErrorSnackMessage, setHelpName } from "../../../systemSlice";
 import { api } from "api";
 import { errorToHandler } from "api/errors";
-import { ApiError, ContentType } from "api/consoleApi";
+import { ContentType } from "api/consoleApi";
 import CodeMirrorWrapper from "../Common/FormComponents/CodeMirrorWrapper/CodeMirrorWrapper";
 import AddServiceAccountHelpBox from "./AddServiceAccountHelpBox";
 import CredentialsPrompt from "../Common/CredentialsPrompt/CredentialsPrompt";
@@ -83,10 +83,9 @@ const AddServiceAccount = () => {
           });
         })
 
-        .catch(async (res) => {
+        .catch((res) => {
           setAddSending(false);
-          const err = (await res.json()) as ApiError;
-          dispatch(setErrorSnackMessage(errorToHandler(err)));
+          dispatch(setErrorSnackMessage(errorToHandler(res.error)));
         });
     }
   }, [addSending, setAddSending, dispatch, policyJSON, accessKey, secretKey]);