[WIP] Updated packages #162-2

kdb-web/src/app/services/auth/auth.service.ts

@@ -217,7 +217,7 @@ export class AuthService {
     };
   }
 
-  getDecodedToken(): { [key: string]: any } {
+  getDecodedToken(): { [key: string]: any } | null{
     return this.jwtHelper.decodeToken(this.getToken().token);
   }
 
@@ -288,10 +288,11 @@ export class AuthService {
       return false;
     }
     const token = this.getDecodedToken();
+    if (!token) return false;
     return AuthRoles[token['role']] === AuthRoles[role];
   }
 
-  getEMailFromDecodedToken(token: { [key: string]: any }): string | null {
+  getEMailFromDecodedToken(token: { [key: string]: any } | null): string | null {
     if (!token) {
       return null;
     }

kdb-web/src/app/services/data/data.service.ts

@@ -1,30 +1,28 @@
 import { HttpClient } from "@angular/common/http";
 import { Injectable } from "@angular/core";
 import { SettingsService } from "../settings/settings.service";
-import { Apollo, gql } from "apollo-angular";
 
 @Injectable({
   providedIn: 'root'
 })
 export class DataService {
 
-  serverQuery = this.apollo.watchQuery({
-      query: gql`
-        {
-          serverCount
-          servers {
-            id
-            name
-          }
-        }
-      `
-    });
+  // serverQuery = this.apollo.watchQuery({
+  //     query: gql`
+  //       {
+  //         serverCount
+  //         servers {
+  //           id
+  //           name
+  //         }
+  //       }
+  //     `
+  //   });
 
 
   constructor(
     private appsettings: SettingsService,
-    private http: HttpClient,
-    private apollo: Apollo
+    private http: HttpClient
   ) {}
 
 }