refactor: replace custom BackstageHttpError with AxiosError

Parkreiner · Parkreiner · commit 75bb176ff58a · 2024-06-03T15:05:57.000Z
diff --git a/plugins/backstage-plugin-coder/src/api/errors.ts b/plugins/backstage-plugin-coder/src/api/errors.ts
diff --git a/plugins/backstage-plugin-coder/src/components/CoderProvider/CoderAuthProvider.tsx b/plugins/backstage-plugin-coder/src/components/CoderProvider/CoderAuthProvider.tsx
@@ -19,7 +19,6 @@ import {
 import { useApi } from '@backstage/core-plugin-api';
 import { type Theme, makeStyles } from '@material-ui/core';
 import { useId } from '../../hooks/hookPolyfills';
-import { BackstageHttpError } from '../../api/errors';
 import {
   CODER_QUERY_KEY_PREFIX,
   sharedAuthQueryKey,
@@ -329,11 +328,10 @@ function generateAuthState({
     };
   }
 
-  if (BackstageHttpError.isInstance(authValidityQuery.error)) {
+  if (authValidityQuery.error instanceof AxiosError) {
     const deploymentLikelyUnavailable =
       authValidityQuery.error.status === 504 ||
-      (authValidityQuery.error.status === 200 &&
-        authValidityQuery.error.contentType !== 'application/json');
+      authValidityQuery.error.status === 200;
 
     if (deploymentLikelyUnavailable) {
       return {
diff --git a/plugins/backstage-plugin-coder/src/components/CoderProvider/CoderProvider.tsx b/plugins/backstage-plugin-coder/src/components/CoderProvider/CoderProvider.tsx
@@ -4,7 +4,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { CoderAuthProvider } from './CoderAuthProvider';
 import { CoderAppConfigProvider } from './CoderAppConfigProvider';
 import { CoderErrorBoundary } from '../CoderErrorBoundary';
-import { BackstageHttpError } from '../../api/errors';
+import { AxiosError } from 'axios';
 
 const MAX_FETCH_FAILURES = 3;
 
@@ -15,19 +15,16 @@ export type CoderProviderProps = ComponentProps<typeof CoderAuthProvider> &
 
 const shouldRetryRequest = (failureCount: number, error: unknown): boolean => {
   const isBelowThreshold = failureCount < MAX_FETCH_FAILURES;
-  if (!BackstageHttpError.isInstance(error)) {
+  if (!(error instanceof AxiosError)) {
     return isBelowThreshold;
   }
 
-  const isAuthenticationError = error.status === 401;
-  const isLikelyProxyConfigurationError =
-    error.status === 504 ||
-    (error.status === 200 && error.contentType !== 'application/json');
+  // We will get errors in the 500s range if the proxy isn't configured
+  // properly, even if there are zero issues with the Coder deployment itself
+  const isLikelyProxyConfigurationError = error.status === 504;
 
   return (
-    !isAuthenticationError &&
-    !isLikelyProxyConfigurationError &&
-    isBelowThreshold
+    !isLikelyProxyConfigurationError && error.status !== 401 && isBelowThreshold
   );
 };
 
