Updates error code match to include 400

Signed-off-by: Darshit Chanpura <[email protected]>
DarshitChanpura · May 25, 2024 · a32a285 · a32a285
1 parent 94c1588
commit a32a285
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/public/apps/configuration/panels/audit-logging/audit-logging.tsx b/public/apps/configuration/panels/audit-logging/audit-logging.tsx
@@ -173,7 +173,8 @@ export function AuditLogging(props: AuditLoggingProps) {
       } catch (e) {
         // TODO: switch to better error handling.
         console.log(e);
-        if (e.response && e.response.status === 403) {
+        // requests with existing credentials but insufficient permissions result in 403, remote data-source requests with non-existing credentials result in 400
+        if (e.response && [400, 403].includes(e.response.status)) {
           setAccessErrorFlag(true);
         }
       } finally {

diff --git a/public/apps/configuration/panels/auth-view/auth-view.tsx b/public/apps/configuration/panels/auth-view/auth-view.tsx
@@ -47,7 +47,8 @@ export function AuthView(props: AppDependencies) {
         setAccessErrorFlag(false);
       } catch (e) {
         console.log(e);
-        if (e.response && e.response.status === 403) {
+        // requests with existing credentials but insufficient permissions result in 403, remote data-source requests with non-existing credentials result in 400
+        if (e.response && [400, 403].includes(e.response.status)) {
           setAccessErrorFlag(true);
         }
         setErrorFlag(true);

diff --git a/public/apps/configuration/panels/permission-list/permission-list.tsx b/public/apps/configuration/panels/permission-list/permission-list.tsx
@@ -216,7 +216,8 @@ export function PermissionList(props: AppDependencies) {
       setAccessErrorFlag(false);
     } catch (e) {
       console.log(e);
-      if (e.response && e.response.status === 403) {
+      // requests with existing credentials but insufficient permissions result in 403, remote data-source requests with non-existing credentials result in 400
+      if (e.response && [400, 403].includes(e.response.status)) {
         setAccessErrorFlag(true);
       }
       setErrorFlag(true);

diff --git a/public/apps/configuration/panels/role-list.tsx b/public/apps/configuration/panels/role-list.tsx
@@ -124,7 +124,8 @@ export function RoleList(props: AppDependencies) {
         setAccessErrorFlag(false);
       } catch (e) {
         console.log(e);
-        if (e.response && e.response.status === 403) {
+        // requests with existing credentials but insufficient permissions result in 403, remote data-source requests with non-existing credentials result in 400
+        if (e.response && [400, 403].includes(e.response.status)) {
           setAccessErrorFlag(true);
         }
         setErrorFlag(true);

diff --git a/public/apps/configuration/panels/service-account-list.tsx b/public/apps/configuration/panels/service-account-list.tsx
@@ -118,7 +118,8 @@ export function ServiceAccountList(props: AppDependencies) {
         setAccessErrorFlag(false);
       } catch (e) {
         console.log(e);
-        if (e.response && e.response.status === 403) {
+        // requests with existing credentials but insufficient permissions result in 403, remote data-source requests with non-existing credentials result in 400
+        if (e.response && [400, 403].includes(e.response.status)) {
           setAccessErrorFlag(true);
         }
         setErrorFlag(true);

diff --git a/public/apps/configuration/panels/tenant-list/configure_tab1.tsx b/public/apps/configuration/panels/tenant-list/configure_tab1.tsx
@@ -207,7 +207,8 @@ export function ConfigureTab1(props: AppDependencies) {
       } catch (e) {
         // TODO: switch to better error display.
         console.error(e);
-        if (e.response && e.response.status === 403) {
+        // requests with existing credentials but insufficient permissions result in 403, remote data-source requests with non-existing credentials result in 400
+        if (e.response && [400, 403].includes(e.response.status)) {
           setAccessErrorFlag(true);
         }
       } finally {

diff --git a/public/apps/configuration/panels/tenant-list/manage_tab.tsx b/public/apps/configuration/panels/tenant-list/manage_tab.tsx
@@ -115,7 +115,8 @@ export function ManageTab(props: AppDependencies) {
       setErrorFlag(false);
     } catch (e) {
       console.log(e);
-      if (e.response && e.response.status === 403) {
+      // requests with existing credentials but insufficient permissions result in 403, remote data-source requests with non-existing credentials result in 400
+      if (e.response && [400, 403].includes(e.response.status)) {
         setAccessErrorFlag(true);
       }
       setErrorFlag(true);

diff --git a/public/apps/configuration/panels/user-list.tsx b/public/apps/configuration/panels/user-list.tsx
@@ -125,7 +125,8 @@ export function UserList(props: AppDependencies) {
         setAccessErrorFlag(false);
       } catch (e) {
         console.log(e);
-        if (e.response && e.response.status === 403) {
+        // requests with existing credentials but insufficient permissions result in 403, remote data-source requests with non-existing credentials result in 400
+        if (e.response && [400, 403].includes(e.response.status)) {
           setAccessErrorFlag(true);
         }
         setErrorFlag(true);