From a21d1ab4e920ae24a6d9899a7dbb8fbd4496348d Mon Sep 17 00:00:00 2001
From: FlayInAHook <timmae2001@gmail.com>
Date: Sat, 12 Dec 2020 14:49:39 +0100
Subject: [PATCH] fixed interceptor and equipment

---
 src/app/app-routing.module.ts       |  2 +-
 src/app/helper/token.interceptor.ts | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index aab32fe..bca7386 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -43,7 +43,7 @@ const routes: Routes = [
   { path: 'table/equipmentTypes', component: EquipmentTypesComponent, canActivate: [AuthGuard] },
   { path: 'table/engagementTypes', component: EngagementTypesComponent, canActivate: [AuthGuard] },
   { path: 'table/engagements', component: EngagementsComponent, canActivate: [AuthGuard] },
-  { path: 'table/equipments', component: EquipmentComponent, canActivate: [AuthGuard] },
+  { path: 'table/equipment', component: EquipmentComponent, canActivate: [AuthGuard] },
   { path: 'table/timeFrames', component: TimeFramesComponent, canActivate: [AuthGuard] },
   { path: 'table/persons', component: PersonsComponent, canActivate: [AuthGuard] },
   { path: 'table/contactInformation', component: ContactInformationComponent, canActivate: [AuthGuard] },
diff --git a/src/app/helper/token.interceptor.ts b/src/app/helper/token.interceptor.ts
index 86286a2..5b017a5 100644
--- a/src/app/helper/token.interceptor.ts
+++ b/src/app/helper/token.interceptor.ts
@@ -28,11 +28,12 @@ export class TokenInterceptor implements HttpInterceptor {
       let errorMessage = '';
         if (error.error instanceof ErrorEvent) {
           //client error
+          //console.log("Client Error: " + JSON.stringify(error));
 
           errorMessage = `Error: ${error.error.message}`;
         } else {
           //server error
-          //console.log("Error: " + JSON.stringify(error));
+          //console.log("Server Error: " + JSON.stringify(error));
           if (error.status === 400){
             switch (error.error.message) {
               case "Invalid refresh token!":
@@ -57,7 +58,7 @@ export class TokenInterceptor implements HttpInterceptor {
             errorMessage = this.serverErrorMessageGenerator(error);
           }
         }
-      if (errorMessage === "Viele Fehler sind aufgetreten.") {
+      if (errorMessage === "Viele Fehler sind aufgetreten.") { // Here is the thing I ment
         this.snackBar.openSnackBar(errorMessage, "Erweitert", true, error.error.errors);
       } else {
         this.snackBar.openSnackBar(errorMessage, "Ok", true);
@@ -68,13 +69,14 @@ export class TokenInterceptor implements HttpInterceptor {
   }
 
   private serverErrorMessageGenerator (error: HttpErrorResponse): string  {
-    if (error.error?.errors[0]?.message?.includes("not provided")) {
-      return "Nicht alle benötigten Felder wurden ausgefüllt.";
-    }
     if (error.error.message === undefined){
-      return "Viele Fehler sind aufgetreten."  // If you change this you have to change it over this aswell
+      if (error.error.errors[0].message.includes("not provided")) {
+        return "Nicht alle benötigten Felder wurden ausgefüllt.";
+      } else {
+        return "Viele Fehler sind aufgetreten." // If you change this you have to change it over this aswell ( I know its terrible to @ )
+      }
     } else {
-      `${error.error.message}. Fehlercode: ${error.status}.`;
+      return `${error.error.message}.`; //`${error.error.message}. Fehlercode: ${error.status}.`
     }
 
   }