From da4bbdeeea21f3924754c7adb63fa3e4594bfcc0 Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Thu, 18 Apr 2019 12:51:57 +0200
Subject: [PATCH] fixed login and admin evaluation

---
 frontend/quasar.conf.js            | 2 +-
 frontend/src/pages/Overview.vue    | 2 +-
 frontend/src/store/auth/getters.js | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js
index b175999..9f61885 100644
--- a/frontend/quasar.conf.js
+++ b/frontend/quasar.conf.js
@@ -107,7 +107,7 @@ module.exports = function (ctx) {
           API: JSON.stringify('http://localhost:8080')
         }
         : { // Base URL for API-Calls: PRODUCTION (build)
-          //API: JSON.stringify('http://se.hs-heilbronn.de:8090')
+          //API: JSON.stringify('http://se.hs-heilbronn.de:8090/buga19geocaching')
           API: JSON.stringify('http://localhost:8080')
         }
     },
diff --git a/frontend/src/pages/Overview.vue b/frontend/src/pages/Overview.vue
index b0e123f..1616f18 100644
--- a/frontend/src/pages/Overview.vue
+++ b/frontend/src/pages/Overview.vue
@@ -132,7 +132,7 @@
           })
       },
       startCache(cacheID) {
-        const userToken = JSON.parse(localStorage.getItem('userToken'));
+        const userToken = JSON.parse(localStorage.getItem('userToken')).token;
         let params = {cacheID: cacheID};
         if (userToken != null) {
           params.token = userToken;
diff --git a/frontend/src/store/auth/getters.js b/frontend/src/store/auth/getters.js
index da66d9b..db5efb0 100644
--- a/frontend/src/store/auth/getters.js
+++ b/frontend/src/store/auth/getters.js
@@ -4,8 +4,8 @@
 export function GET_ADMINSTATE(state)  {
   console.log("GET_ADMINSTATE()");
   if (state.userAuthenticated !== null) {
-    console.log(state.userAuthenticated.roles.find(x => x.name === "admin") != null);
-    return state.userAuthenticated.roles.find(x => x.name === "admin") != null;
+    console.log(state.userAuthenticated.roles.find(x => x.name === "ADMIN") != null);
+    return state.userAuthenticated.roles.find(x => x.name === "ADMIN") != null;
   } else {
     console.log(state.userAuthenticated);
     return false;