optimse the error messages

ral-facilities · Jan 21, 2025 · d33f462 · d33f462
1 parent 6db1d22
commit d33f462
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/api/api.tsx b/src/api/api.tsx
@@ -40,20 +40,17 @@ ogApi.interceptors.response.use(
   (error) => {
     const originalRequest = error.config;
 
-    const errorMessage: string = error.response?.data
-      ? Array.isArray((error.response.data as APIError).detail)
-        ? ''
-        : ((
-            (error.response.data as APIError).detail as string
-          )?.toLocaleLowerCase() ?? error.message)
-      : error.message;
+    const errorDetail = (error.response.data as APIError).detail;
+
+    const errorMessage =
+      typeof errorDetail === 'string' ? errorDetail : error.message;
 
     // Check if the token is invalid and needs refreshing
     // only allow a request to be retried once. Don't retry if not logged
     // in, it should not have been accessible
     if (
       error.response?.status === 403 &&
-      errorMessage.includes('expired token') &&
+      errorMessage.includes('invalid token') &&
       !originalRequest._retried &&
       localStorage.getItem('scigateway:token')
     ) {

diff --git a/src/handleOG_APIError.ts b/src/handleOG_APIError.ts
@@ -5,9 +5,10 @@ import { NotificationType } from './state/scigateway.actions';
 
 const handleOG_APIError = (error: AxiosError, broadcast = true): void => {
   const status = error.response?.status;
-  const message = error.response?.data
-    ? ((error.response.data as APIError).detail ?? error.message)
-    : error.message;
+
+  const errorDetail = (error.response?.data as APIError).detail;
+
+  const message = typeof errorDetail === 'string' ? errorDetail : error.message;
 
   log.error(message);
   // Don't broadcast any error for an authentication issue - navigating via homepage links causes