🚧 wip

Co-Authored-By: Malte Sehmer <[email protected]>

Author: pkiparra

src/util/error.ts

@@ -1,4 +1,4 @@
-import { AxiosError } from "axios";
+import axios, { AxiosError } from "axios";
 import {
   DELEGATE_TO_FRONTEND_CODE,
   IntegrationErrorType,
@@ -7,7 +7,7 @@ import {
 import { errorLogger } from "./logger.util";
 
 export const throwAndDelegateError = (
-  error: Error | AxiosError,
+  error: AxiosError | Error,
   source: string,
   apiKey: string | undefined,
   logMessage?: string
@@ -24,8 +24,7 @@ export const throwAndDelegateError = (
   } else {
     errorLogger(source, errorMessage, apiKey);
   }
-
-  if (error instanceof AxiosError) {
+  if (axios.isAxiosError(error)) {
     const status = error.response?.status || 500;
     var errorType: IntegrationErrorType;
     switch (status) {
@@ -44,9 +43,12 @@ export const throwAndDelegateError = (
         errorType = IntegrationErrorType.INTEGRATION_ERROR_UNAVAILABLE;
         break;
       default:
+        console.log("bin default weil status= ", status);
         throw new ServerError(status, `${source} (${errorMessage})`);
     }
+    console.log("bin außerhalb vom switch weil status= ", status);
     throw new ServerError(DELEGATE_TO_FRONTEND_CODE, errorType);
   }
+  console.log("kein axios");
   throw new ServerError(500, "An internal error occurred");
 };

src/util/logger.util.ts

@@ -13,7 +13,7 @@ export const infoLogger = (
   apiKey: string | undefined,
   ...args: unknown[]
 ): void => {
-  logger(console.info, source, message, apiKey, args);
+  logger(console.info, source, message, apiKey, ...args);
 };
 
 /**
@@ -29,7 +29,7 @@ export const errorLogger = (
   apiKey: string | undefined,
   ...args: unknown[]
 ): void => {
-  logger(console.error, source, message, apiKey, args);
+  logger(console.error, source, message, apiKey, ...args);
 };
 
 /**
@@ -45,7 +45,7 @@ export const warnLogger = (
   apiKey?: string,
   ...args: unknown[]
 ): void => {
-  logger(console.warn, source, message, apiKey, args);
+  logger(console.warn, source, message, apiKey, ...args);
 };
 
 const logger = (
@@ -56,23 +56,22 @@ const logger = (
   ...args: unknown[]
 ): void => {
   // eslint-disable-next-line no-console
-  if (apiKey) {
-    logFn(
-      constructLogMessage(
-        `[${anonymizeKey(apiKey)}]`,
-        `[${source}]`,
-        message,
-        ...args
-      )
-    );
-  } else {
-    logFn(constructLogMessage(`[${source}]`, message, ...args));
-  }
+  const anonymizedApiKey = apiKey ? anonymizeKey(apiKey) : undefined;
+
+  logFn(
+    constructLogMessage(
+      anonymizedApiKey ? `[${anonymizedApiKey}]` : undefined,
+      `[${source}]`,
+      message
+    ),
+    ...args
+  );
 };
 
 const constructLogMessage = (...args: unknown[]): string =>
   `${args
     .flat()
+    .filter((item) => item != undefined)
     .map((item: unknown) => {
       if (Array.isArray(item) && item.length == 0) return;
       return typeof item !== "string" ? JSON.stringify(item) : item;