From 22c630a848902ca13731d042bb1ff320b3c9ce93 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 17:22:58 +0100
Subject: [PATCH 01/56] delete some weird docu stuff

---
 frontend/DEV-README.md     | 21 ---------------------
 frontend/ISSUE_TEMPLATE.md |  9 ---------
 2 files changed, 30 deletions(-)
 delete mode 100644 frontend/DEV-README.md
 delete mode 100644 frontend/ISSUE_TEMPLATE.md

diff --git a/frontend/DEV-README.md b/frontend/DEV-README.md
deleted file mode 100644
index ab2b3e225..000000000
--- a/frontend/DEV-README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-DEV README von Alex
-
-default Page:
-´´´
-      <template>
-        <div>default</div>
-      </template>
-
-      <script>
-      export default {
-        name: 'default',
-        data() {
-          return {}
-        },
-        methods: {},
-        watch: {},
-      }
-      </script>
-      
-´´´
-
diff --git a/frontend/ISSUE_TEMPLATE.md b/frontend/ISSUE_TEMPLATE.md
deleted file mode 100644
index 8103f52e6..000000000
--- a/frontend/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
- IMPORTANT: Please use the following link to create a new issue:
-
-  https://www.gradido.net/new-issue/bootstrap-vue-gradido-wallet
-
-**If your issue was not created using the app above, it will be closed immediately.**
--->
-
- 

From a61317c3afa053fad5fda9f5242b8e068218ad59 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 19:55:05 +0100
Subject: [PATCH 02/56] admin_area language file

---
 frontend/src/locales/de.json | 1 +
 frontend/src/locales/en.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 0dd3ba926..5eb3b859f 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -109,6 +109,7 @@
   "login": "Anmeldung",
   "logout": "Abmelden",
   "members_area": "Mitgliederbereich",
+  "admin_area": "Adminbereich",
   "message": "hallo gradido !!",
   "overview": "Übersicht",
   "privacy_policy": "Datenschutzerklärung",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 99fcd46a7..5bfa18aac 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -109,6 +109,7 @@
   "login": "Login",
   "logout": "Logout",
   "members_area": "Member's area",
+  "admin_area": "Admin's area",
   "message": "hello gradido !!",
   "overview": "Overview",
   "privacy_policy": "Privacy policy",

From cf899229460e3b4b4d926debe1c1b9ec58100fde Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 19:55:43 +0100
Subject: [PATCH 03/56] link to admin if `isAdmin` is true

---
 frontend/.env.dist                                |  3 ++-
 frontend/src/components/SidebarPlugin/SideBar.vue | 13 +++++++++++++
 frontend/src/config/index.js                      |  5 +++--
 frontend/src/store/store.js                       |  1 +
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/frontend/.env.dist b/frontend/.env.dist
index 8d4025a5d..80dafb7f9 100644
--- a/frontend/.env.dist
+++ b/frontend/.env.dist
@@ -1,3 +1,4 @@
 GRAPHQL_URI=http://localhost:4000/graphql
 DEFAULT_PUBLISHER_ID=2896
-//BUILD_COMMIT=0000000
\ No newline at end of file
+#BUILD_COMMIT=0000000
+ADMIN_AUTH_URL=http://localhost/admin/authenticate?token=$1
\ No newline at end of file
diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index c33c132b0..d8b26318f 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -45,6 +45,7 @@
           <slot name="links"></slot>
         </ul>
         <hr class="my-2" />
+
         <ul class="navbar-nav ml-3">
           <li class="nav-item">
             <a :href="getElopageLink()" class="nav-link" target="_blank">
@@ -54,6 +55,14 @@
           </li>
         </ul>
 
+        <ul class="navbar-nav ml-3" v-if="this.$store.state.isAdmin">
+          <li class="nav-item">
+            <a class="nav-link ponter" @click="admin">
+              {{ $t('admin_area') }}
+            </a>
+          </li>
+        </ul>
+
         <ul class="navbar-nav ml-3">
           <li class="nav-item">
             <a class="nav-link pointer" @click="logout">
@@ -112,6 +121,10 @@ export default {
     logout() {
       this.$emit('logout')
     },
+    admin() {
+      window.location = CONFIG.ADMIN_AUTH_URL.replace('$1',this.$store.state.token)
+      this.$store.dispatch('logout') // logout without redirect
+    },
     getElopageLink() {
       const pId = this.$store.state.publisherId
         ? this.$store.state.publisherId
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 1f1819c62..6c7c49013 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -18,8 +18,9 @@ const environment = {
   DEFAULT_PUBLISHER_ID: process.env.DEFAULT_PUBLISHER_ID || 2896,
 }
 
-const server = {
+const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
+  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token=$1'
 }
 
 const options = {}
@@ -27,7 +28,7 @@ const options = {}
 const CONFIG = {
   ...version,
   ...environment,
-  ...server,
+  ...endpoints,
   ...options,
 }
 
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 6a229c161..1173a8685 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -87,6 +87,7 @@ export const store = new Vuex.Store({
     username: '',
     description: '',
     token: null,
+    isAdmin: true, // TODO implement this properly
     coinanimation: true,
     newsletterState: null,
     community: {

From 393c8000a4a191f65d2ec582f1eb890f85bdea24 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 19:56:12 +0100
Subject: [PATCH 04/56] store token is actually set

---
 admin/src/store/store.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/src/store/store.js b/admin/src/store/store.js
index 1dba6b9e3..b3f94b677 100644
--- a/admin/src/store/store.js
+++ b/admin/src/store/store.js
@@ -14,6 +14,9 @@ export const mutations = {
   resetOpenCreations: (state) => {
     state.openCreations = 0
   },
+  token: (state, token) => {
+    state.token = token
+  }
 }
 
 const store = new Vuex.Store({
@@ -23,7 +26,7 @@ const store = new Vuex.Store({
     }),
   ],
   state: {
-    token: 'some-valid-token',
+    token: null,
     moderator: 'Dertest Moderator',
     openCreations: 0,
   },

From 32fe16a03c525c5211af5aa5b2c940d9f342be47 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 19:56:37 +0100
Subject: [PATCH 05/56] refactor routes and route guards

---
 admin/src/router/guards.js | 18 +++++++++++++++++-
 admin/src/router/routes.js | 28 ++++++----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js
index c9baf61cb..d6eeda927 100644
--- a/admin/src/router/guards.js
+++ b/admin/src/router/guards.js
@@ -1,7 +1,23 @@
 const addNavigationGuards = (router, store) => {
+  // store token on authenticate
   router.beforeEach((to, from, next) => {
+    console.log('token', to.path, from.path, to.query)
     // handle authentication
-    if (to.meta.requiresAuth && !store.state.token) {
+    if (to.path === '/authenticate' && to.query.token) {
+      console.log('token', to.query.token, to)
+      store.commit('token',to.query.token)
+      // to.query = {}
+      next({path: '/'})
+    } else {
+      next()
+    }
+  })
+
+  // protect all routes but not-found  
+  router.beforeEach((to, from, next) => {
+    console.log('protect', to.path, from.path)
+    // handle authentication
+    if (!store.state.token && to.path !== '/not-found') {
       next({ path: '/not-found' })
     } else {
       next()
diff --git a/admin/src/router/routes.js b/admin/src/router/routes.js
index a13463e08..31008824d 100644
--- a/admin/src/router/routes.js
+++ b/admin/src/router/routes.js
@@ -1,38 +1,22 @@
 const routes = [
   {
-    path: '/',
-    component: () => import('@/views/Overview.vue'),
-    meta: {
-      requiresAuth: true,
-    },
+    path: '/authenticate',
   },
   {
-    path: '/overview',
-    component: () => import('@/views/Overview.vue'),
-    meta: {
-      requiresAuth: true,
-    },
+    path: '/',
+    component: () => import('@/pages/Overview.vue'),
   },
   {
     path: '/user',
-    component: () => import('@/views/UserSearch.vue'),
-    meta: {
-      requiresAuth: true,
-    },
+    component: () => import('@/pages/UserSearch.vue'),
   },
   {
     path: '/creation',
-    component: () => import('@/views/Creation.vue'),
-    meta: {
-      requiresAuth: true,
-    },
+    component: () => import('@/pages/Creation.vue'),
   },
   {
     path: '/creation-confirm',
-    component: () => import('@/views/CreationConfirm.vue'),
-    meta: {
-      requiresAuth: true,
-    },
+    component: () => import('@/pages/CreationConfirm.vue'),
   },
   {
     path: '*',

From d45048f3dfd3d63487663c6ebf5bd6146009f93f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 19:57:32 +0100
Subject: [PATCH 06/56] seperate app and layouts

---
 admin/src/App.vue                   | 16 ++++++----------
 admin/src/components/NavBar.vue     |  2 ++
 admin/src/layouts/defaultLayout.vue | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 admin/src/layouts/defaultLayout.vue

diff --git a/admin/src/App.vue b/admin/src/App.vue
index 70bc2978a..40460eda4 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -1,19 +1,15 @@
 <template>
   <div id="app">
-    <nav-bar class="wrapper-nav" />
-    <router-view class="wrapper p-3"></router-view>
-    <foo-ter />
+    <default-layout v-if="$store.state.token" />
+    <router-view v-else></router-view>
   </div>
 </template>
 
 <script>
-import NavBar from '@/components/NavBar.vue'
-import FooTer from '@/components/Footer.vue'
+import defaultLayout from '@/layouts/defaultLayout.vue'
+
 export default {
-  name: 'App',
-  components: {
-    NavBar,
-    FooTer,
-  },
+  name: 'app',
+  components: { defaultLayout },
 }
 </script>
diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index a9db9cfeb..fb767267a 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -16,6 +16,8 @@
           >
             | {{ $store.state.openCreations }} offene Schöpfungen
           </b-nav-item>
+          <b-nav-item class="mr-auto">Wallet</b-nav-item>
+          <b-nav-item class="mr-auto">Logout</b-nav-item>
           <!-- <b-nav-item v-show="open < 1" to="/creation-confirm">| keine offene Schöpfungen</b-nav-item> -->
         </b-navbar-nav>
       </b-collapse>
diff --git a/admin/src/layouts/defaultLayout.vue b/admin/src/layouts/defaultLayout.vue
new file mode 100644
index 000000000..71d2f894b
--- /dev/null
+++ b/admin/src/layouts/defaultLayout.vue
@@ -0,0 +1,19 @@
+<template>
+  <div>
+    <nav-bar class="wrapper-nav" />
+    <router-view class="wrapper p-3"></router-view>
+    <foo-ter />
+  </div>
+</template>
+
+<script>
+import NavBar from '@/components/NavBar.vue'
+import FooTer from '@/components/Footer.vue'
+export default {
+  name: 'defaultLayout',
+  components: {
+    NavBar,
+    FooTer,
+  },
+}
+</script>
\ No newline at end of file

From 9e66ea242b6736598b5b26ad5b7bf112a99e938d Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 19:57:48 +0100
Subject: [PATCH 07/56] rename views to pages

---
 admin/src/{views => pages}/Creation.vue        | 0
 admin/src/{views => pages}/CreationConfirm.vue | 0
 admin/src/{views => pages}/Overview.vue        | 0
 admin/src/{views => pages}/UserSearch.vue      | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename admin/src/{views => pages}/Creation.vue (100%)
 rename admin/src/{views => pages}/CreationConfirm.vue (100%)
 rename admin/src/{views => pages}/Overview.vue (100%)
 rename admin/src/{views => pages}/UserSearch.vue (100%)

diff --git a/admin/src/views/Creation.vue b/admin/src/pages/Creation.vue
similarity index 100%
rename from admin/src/views/Creation.vue
rename to admin/src/pages/Creation.vue
diff --git a/admin/src/views/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
similarity index 100%
rename from admin/src/views/CreationConfirm.vue
rename to admin/src/pages/CreationConfirm.vue
diff --git a/admin/src/views/Overview.vue b/admin/src/pages/Overview.vue
similarity index 100%
rename from admin/src/views/Overview.vue
rename to admin/src/pages/Overview.vue
diff --git a/admin/src/views/UserSearch.vue b/admin/src/pages/UserSearch.vue
similarity index 100%
rename from admin/src/views/UserSearch.vue
rename to admin/src/pages/UserSearch.vue

From 82356dceb49979d96a5c6fc5fab24f4c9aee18b8 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 20:53:18 +0100
Subject: [PATCH 08/56] config WALLET_AUTH_URL

---
 admin/.env.dist           | 2 ++
 admin/src/config/index.js | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 admin/.env.dist

diff --git a/admin/.env.dist b/admin/.env.dist
new file mode 100644
index 000000000..a056837ab
--- /dev/null
+++ b/admin/.env.dist
@@ -0,0 +1,2 @@
+GRAPHQL_URI=http://localhost:4000/graphql
+WALLET_AUTH_URL=http://localhost/vue/authenticate?token=$1
\ No newline at end of file
diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index eab63e903..a6c728498 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -17,8 +17,9 @@ const environment = {
   PRODUCTION: process.env.NODE_ENV === 'production' || false,
 }
 
-const server = {
+const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
+  WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost:3000/vue/authenticate?token=$1'
 }
 
 const options = {}
@@ -26,7 +27,7 @@ const options = {}
 const CONFIG = {
   ...version,
   ...environment,
-  ...server,
+  ...endpoints,
   ...options,
 }
 

From c5ec31343c0164f9c6fec52501c1ef11675824c6 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 20:54:49 +0100
Subject: [PATCH 09/56] separate router.beforeach & implement the authenticate
 route

---
 frontend/src/routes/guards.js | 20 ++++++++++++++++++--
 frontend/src/routes/routes.js |  3 +++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/frontend/src/routes/guards.js b/frontend/src/routes/guards.js
index eebd6976e..bb55ba0cf 100644
--- a/frontend/src/routes/guards.js
+++ b/frontend/src/routes/guards.js
@@ -1,12 +1,28 @@
 const addNavigationGuards = (router, store) => {
+  // handle publisherId
   router.beforeEach((to, from, next) => {
-    // handle publisherId
     const publisherId = to.query.pid
     if (publisherId) {
       store.commit('publisherId', publisherId)
       delete to.query.pid
     }
-    // handle authentication
+    next()
+  })
+
+  // store token on authenticate
+  router.beforeEach((to, from, next) => {
+    console.log('token', to.path, from.path, to.query)
+    if (to.path === '/authenticate' && to.query.token) {
+      console.log('token', to.query.token, to)
+      store.commit('token',to.query.token)
+      next({path: '/overview'})
+    } else {
+      next()
+    }
+  })
+  
+  // handle authentication
+  router.beforeEach((to, from, next) => {
     if (to.meta.requiresAuth && !store.state.token) {
       next({ path: '/login' })
     } else {
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index f4f0dfe04..6e7d8fadf 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -1,6 +1,9 @@
 import NotFound from '@/views/NotFoundPage.vue'
 
 const routes = [
+  {
+    path: '/authenticate',
+  },
   {
     path: '/',
     redirect: (to) => {

From 967864d989a2c18e9485d8540d059c50a5783b4f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 20:56:23 +0100
Subject: [PATCH 10/56] todo port & define port due to my setup

---
 admin/src/config/index.js    | 1 +
 frontend/src/config/index.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index a6c728498..1ef44fe60 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -19,6 +19,7 @@ const environment = {
 
 const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
+  // TODO port
   WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost:3000/vue/authenticate?token=$1'
 }
 
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 6c7c49013..01c6c009a 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -20,7 +20,8 @@ const environment = {
 
 const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
-  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token=$1'
+  // TODO port
+  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost:8080/admin/authenticate?token=$1'
 }
 
 const options = {}

From c057df54cf16b4db71c22a4848a2abad928d23e7 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 20:57:01 +0100
Subject: [PATCH 11/56] logout page

---
 admin/src/router/guards.js | 6 +-----
 admin/src/router/routes.js | 5 +++++
 admin/src/store/store.js   | 8 ++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js
index d6eeda927..6207f443e 100644
--- a/admin/src/router/guards.js
+++ b/admin/src/router/guards.js
@@ -1,12 +1,8 @@
 const addNavigationGuards = (router, store) => {
   // store token on authenticate
   router.beforeEach((to, from, next) => {
-    console.log('token', to.path, from.path, to.query)
-    // handle authentication
     if (to.path === '/authenticate' && to.query.token) {
-      console.log('token', to.query.token, to)
       store.commit('token',to.query.token)
-      // to.query = {}
       next({path: '/'})
     } else {
       next()
@@ -17,7 +13,7 @@ const addNavigationGuards = (router, store) => {
   router.beforeEach((to, from, next) => {
     console.log('protect', to.path, from.path)
     // handle authentication
-    if (!store.state.token && to.path !== '/not-found') {
+    if (!store.state.token && to.path !== '/not-found' && to.path !== '/logout') {
       next({ path: '/not-found' })
     } else {
       next()
diff --git a/admin/src/router/routes.js b/admin/src/router/routes.js
index 31008824d..72e7b1ac5 100644
--- a/admin/src/router/routes.js
+++ b/admin/src/router/routes.js
@@ -6,6 +6,11 @@ const routes = [
     path: '/',
     component: () => import('@/pages/Overview.vue'),
   },
+  {
+    // TODO: Implement a "You are logged out"-Page
+    path: '/logout',
+    component: () => import('@/components/NotFoundPage.vue'),
+  },
   {
     path: '/user',
     component: () => import('@/pages/UserSearch.vue'),
diff --git a/admin/src/store/store.js b/admin/src/store/store.js
index b3f94b677..544967d6e 100644
--- a/admin/src/store/store.js
+++ b/admin/src/store/store.js
@@ -19,6 +19,13 @@ export const mutations = {
   }
 }
 
+export const actions = {
+  logout: ({ commit, state }) => {
+    commit('token', null)
+    localStorage.clear()
+  },
+}
+
 const store = new Vuex.Store({
   plugins: [
     createPersistedState({
@@ -32,6 +39,7 @@ const store = new Vuex.Store({
   },
   // Syncronous mutation of the state
   mutations,
+  actions,
 })
 
 export default store

From 20eca8ba0d67a589e62b2d6c24bab6f229fb5813 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 20:57:24 +0100
Subject: [PATCH 12/56] implement back to wallet or logout in navbar, remove
 profile thingy

---
 admin/src/components/NavBar.vue | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index fb767267a..260c066b3 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -16,17 +16,43 @@
           >
             | {{ $store.state.openCreations }} offene Schöpfungen
           </b-nav-item>
-          <b-nav-item class="mr-auto">Wallet</b-nav-item>
-          <b-nav-item class="mr-auto">Logout</b-nav-item>
+          <b-nav-item @click="wallet">Wallet</b-nav-item>
+          <b-nav-item @click="logout">Logout</b-nav-item>
           <!-- <b-nav-item v-show="open < 1" to="/creation-confirm">| keine offene Schöpfungen</b-nav-item> -->
         </b-navbar-nav>
       </b-collapse>
-      <b-navbar-brand href="http://localhost:3000/vue/login">Profilbereich</b-navbar-brand>
     </b-navbar>
   </div>
 </template>
 <script>
+import CONFIG from '../config'
+
 export default {
   name: 'navbar',
+  methods: {
+    logout() {
+      // TODO
+      // this.$emit('logout')
+      /* this.$apollo
+        .query({
+          query: logout,
+        })
+        .then(() => {
+          this.$store.dispatch('logout')
+          this.$router.push('/logout')
+        })
+        .catch(() => {
+          this.$store.dispatch('logout')
+          if (this.$router.currentRoute.path !== '/logout') this.$router.push('/logout')
+        })
+      */
+      this.$store.dispatch('logout')
+      this.$router.push('/logout')
+    },
+    wallet() {
+      window.location = CONFIG.WALLET_AUTH_URL.replace('$1',this.$store.state.token)
+      this.$store.dispatch('logout') // logout without redirect
+    },
+  }
 }
 </script>

From 8e8dee1e4a4621eda437bd3ebf48a781d01d4643 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 21:26:12 +0100
Subject: [PATCH 13/56] convenience mode to disable the auth mode for
 development

---
 admin/.env.dist            |  3 ++-
 admin/src/App.vue          |  8 +++++++-
 admin/src/config/index.js  |  5 +++++
 admin/src/router/guards.js | 14 +++++++++-----
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/admin/.env.dist b/admin/.env.dist
index a056837ab..6d78e6782 100644
--- a/admin/.env.dist
+++ b/admin/.env.dist
@@ -1,2 +1,3 @@
 GRAPHQL_URI=http://localhost:4000/graphql
-WALLET_AUTH_URL=http://localhost/vue/authenticate?token=$1
\ No newline at end of file
+WALLET_AUTH_URL=http://localhost/vue/authenticate?token=$1
+DEBUG_DISABLE_AUTH=false
\ No newline at end of file
diff --git a/admin/src/App.vue b/admin/src/App.vue
index 40460eda4..7c3dd8514 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -1,15 +1,21 @@
 <template>
   <div id="app">
-    <default-layout v-if="$store.state.token" />
+    <default-layout v-if="showLayout" />
     <router-view v-else></router-view>
   </div>
 </template>
 
 <script>
 import defaultLayout from '@/layouts/defaultLayout.vue'
+import CONFIG from './config'
 
 export default {
   name: 'app',
   components: { defaultLayout },
+  data() {
+    return {
+      showLayout: CONFIG.DEBUG_DISABLE_AUTH || this.$store.state.token
+    }
+  }
 }
 </script>
diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index 1ef44fe60..236274d1f 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -23,6 +23,10 @@ const endpoints = {
   WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost:3000/vue/authenticate?token=$1'
 }
 
+const debug = {
+  DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true' || false
+}
+
 const options = {}
 
 const CONFIG = {
@@ -30,6 +34,7 @@ const CONFIG = {
   ...environment,
   ...endpoints,
   ...options,
+  ...debug,
 }
 
 export default CONFIG
diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js
index 6207f443e..a8bdaa2e2 100644
--- a/admin/src/router/guards.js
+++ b/admin/src/router/guards.js
@@ -1,5 +1,7 @@
+import CONFIG from "../config"
+
 const addNavigationGuards = (router, store) => {
-  // store token on authenticate
+  // store token on `authenticate`
   router.beforeEach((to, from, next) => {
     if (to.path === '/authenticate' && to.query.token) {
       store.commit('token',to.query.token)
@@ -9,11 +11,13 @@ const addNavigationGuards = (router, store) => {
     }
   })
 
-  // protect all routes but not-found  
+  // protect all routes but `not-found`
   router.beforeEach((to, from, next) => {
-    console.log('protect', to.path, from.path)
-    // handle authentication
-    if (!store.state.token && to.path !== '/not-found' && to.path !== '/logout') {
+    if (!CONFIG.DEBUG_DISABLE_AUTH &&   // we did not disabled the auth module for debug purposes
+        !store.state.token &&           // we do not have a token
+        to.path !== '/not-found' &&     // we are not on `not-found`
+        to.path !== '/logout') {        // we are not on `logout`
+      console.log(!CONFIG.DEBUG_DISABLE_AUTH,!store.state.token,to.path !== '/not-found',to.path !== '/logout')
       next({ path: '/not-found' })
     } else {
       next()

From e4f77407ee8bbcb285d7622594acf439f0028f09 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 16:30:05 +0100
Subject: [PATCH 14/56] corrected ports

---
 admin/src/config/index.js    | 2 +-
 frontend/src/config/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index 236274d1f..9f33b59cb 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -20,7 +20,7 @@ const environment = {
 const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
   // TODO port
-  WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost:3000/vue/authenticate?token=$1'
+  WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost/vue/authenticate?token=$1'
 }
 
 const debug = {
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 01c6c009a..0f8e58c1c 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -21,7 +21,7 @@ const environment = {
 const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
   // TODO port
-  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost:8080/admin/authenticate?token=$1'
+  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token=$1'
 }
 
 const options = {}

From dbfe882c143d043333fd6874d906abf9587c1cca Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 16:30:22 +0100
Subject: [PATCH 15/56] implemented `isAdmin` from backend

---
 backend/src/graphql/model/User.ts            |  4 +++
 backend/src/graphql/resolver/UserResolver.ts | 31 ++++++++++++++++++++
 frontend/src/graphql/queries.js              |  1 +
 frontend/src/store/store.js                  |  7 ++++-
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts
index 08651ae17..1b303aabb 100644
--- a/backend/src/graphql/model/User.ts
+++ b/backend/src/graphql/model/User.ts
@@ -19,6 +19,7 @@ export class User {
     this.pubkey = json.public_hex
     this.language = json.language
     this.publisherId = json.publisher_id
+    this.isAdmin = json.isAdmin
   }
 
   @Field(() => String)
@@ -69,6 +70,9 @@ export class User {
   @Field(() => Int, { nullable: true })
   publisherId?: number
 
+  @Field(() => Boolean)
+  isAdmin: boolean
+
   @Field(() => Boolean)
   coinanimation: boolean
 
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 5c4625938..71225c25a 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -194,6 +194,36 @@ const SecretKeyCryptographyDecrypt = (encryptedMessage: Buffer, encryptionKey: B
 
 @Resolver()
 export class UserResolver {
+  /*
+  @Authorized()
+  @Query(() => User)
+  async verifyLogin(@Ctx() context: any): Promise<User> {
+    const loginUserRepository = getCustomRepository(LoginUserRepository)
+    loginUser = loginUserRepository.findByPubkeyHex()
+    const user = new User(result.data.user)
+
+    this.email = json.email
+    this.firstName = json.first_name
+    this.lastName = json.last_name
+    this.username = json.username
+    this.description = json.description
+    this.pubkey = json.public_hex
+    this.language = json.language
+    this.publisherId = json.publisher_id
+    this.isAdmin = json.isAdmin
+
+    const userSettingRepository = getCustomRepository(UserSettingRepository)
+    const coinanimation = await userSettingRepository
+      .readBoolean(userEntity.id, Setting.COIN_ANIMATION)
+      .catch((error) => {
+        throw new Error(error)
+      })
+    user.coinanimation = coinanimation
+    user.isAdmin = true // TODO implement
+    return user
+  }
+  */
+
   @Query(() => User)
   @UseMiddleware(klicktippNewsletterStateMiddleware)
   async login(
@@ -254,6 +284,7 @@ export class UserResolver {
         throw new Error(error)
       })
     user.coinanimation = coinanimation
+    user.isAdmin = true // TODO implement
     return user
   }
 
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 01021f601..9cd364ed7 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -15,6 +15,7 @@ export const login = gql`
       }
       hasElopage
       publisherId
+      isAdmin
     }
   }
 `
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 1173a8685..c49197059 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -34,6 +34,9 @@ export const mutations = {
     if (isNaN(pubId)) pubId = null
     state.publisherId = pubId
   },
+  isAdmin: (state, isAdmin) => {
+    state.isAdmin = !!isAdmin
+  },
   community: (state, community) => {
     state.community = community
   },
@@ -57,6 +60,7 @@ export const actions = {
     commit('newsletterState', data.klickTipp.newsletterState)
     commit('hasElopage', data.hasElopage)
     commit('publisherId', data.publisherId)
+    commit('isAdmin', data.isAdmin)
   },
   logout: ({ commit, state }) => {
     commit('token', null)
@@ -69,6 +73,7 @@ export const actions = {
     commit('newsletterState', null)
     commit('hasElopage', false)
     commit('publisherId', null)
+    commit('isAdmin', false)
     localStorage.clear()
   },
 }
@@ -87,7 +92,7 @@ export const store = new Vuex.Store({
     username: '',
     description: '',
     token: null,
-    isAdmin: true, // TODO implement this properly
+    isAdmin: false,
     coinanimation: true,
     newsletterState: null,
     community: {

From 7ba1ec848210d42e462cf5aabb51709ce5c259d9 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 16:37:25 +0100
Subject: [PATCH 16/56] frontend lint

---
 frontend/src/components/SidebarPlugin/SideBar.vue | 2 +-
 frontend/src/config/index.js                      | 3 +--
 frontend/src/routes/guards.js                     | 9 ++++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index d8b26318f..8277b17eb 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -122,7 +122,7 @@ export default {
       this.$emit('logout')
     },
     admin() {
-      window.location = CONFIG.ADMIN_AUTH_URL.replace('$1',this.$store.state.token)
+      window.location = CONFIG.ADMIN_AUTH_URL.replace('$1', this.$store.state.token)
       this.$store.dispatch('logout') // logout without redirect
     },
     getElopageLink() {
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 0f8e58c1c..b3a9366b7 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -20,8 +20,7 @@ const environment = {
 
 const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
-  // TODO port
-  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token=$1'
+  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token=$1',
 }
 
 const options = {}
diff --git a/frontend/src/routes/guards.js b/frontend/src/routes/guards.js
index bb55ba0cf..005ed720f 100644
--- a/frontend/src/routes/guards.js
+++ b/frontend/src/routes/guards.js
@@ -11,16 +11,15 @@ const addNavigationGuards = (router, store) => {
 
   // store token on authenticate
   router.beforeEach((to, from, next) => {
-    console.log('token', to.path, from.path, to.query)
     if (to.path === '/authenticate' && to.query.token) {
-      console.log('token', to.query.token, to)
-      store.commit('token',to.query.token)
-      next({path: '/overview'})
+      // TODO verify user in order to get user data
+      store.commit('token', to.query.token)
+      next({ path: '/overview' })
     } else {
       next()
     }
   })
-  
+
   // handle authentication
   router.beforeEach((to, from, next) => {
     if (to.meta.requiresAuth && !store.state.token) {

From df74427c39bdfd1e8eb9222e5b4e56981e5468b7 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 16:40:38 +0100
Subject: [PATCH 17/56] lint admin

---
 admin/src/App.vue                   |  4 ++--
 admin/src/components/NavBar.vue     |  4 ++--
 admin/src/config/index.js           |  5 ++---
 admin/src/layouts/defaultLayout.vue |  2 +-
 admin/src/router/guards.js          | 18 ++++++++++--------
 admin/src/store/store.js            |  2 +-
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/admin/src/App.vue b/admin/src/App.vue
index 7c3dd8514..359b63b3a 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -14,8 +14,8 @@ export default {
   components: { defaultLayout },
   data() {
     return {
-      showLayout: CONFIG.DEBUG_DISABLE_AUTH || this.$store.state.token
+      showLayout: CONFIG.DEBUG_DISABLE_AUTH || this.$store.state.token,
     }
-  }
+  },
 }
 </script>
diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index 260c066b3..6fb0cb31f 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -50,9 +50,9 @@ export default {
       this.$router.push('/logout')
     },
     wallet() {
-      window.location = CONFIG.WALLET_AUTH_URL.replace('$1',this.$store.state.token)
+      window.location = CONFIG.WALLET_AUTH_URL.replace('$1', this.$store.state.token)
       this.$store.dispatch('logout') // logout without redirect
     },
-  }
+  },
 }
 </script>
diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index 9f33b59cb..69d30a66a 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -19,12 +19,11 @@ const environment = {
 
 const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
-  // TODO port
-  WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost/vue/authenticate?token=$1'
+  WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost/vue/authenticate?token=$1',
 }
 
 const debug = {
-  DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true' || false
+  DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true' || false,
 }
 
 const options = {}
diff --git a/admin/src/layouts/defaultLayout.vue b/admin/src/layouts/defaultLayout.vue
index 71d2f894b..4f6cbbe4d 100644
--- a/admin/src/layouts/defaultLayout.vue
+++ b/admin/src/layouts/defaultLayout.vue
@@ -16,4 +16,4 @@ export default {
     FooTer,
   },
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js
index a8bdaa2e2..f6d8058aa 100644
--- a/admin/src/router/guards.js
+++ b/admin/src/router/guards.js
@@ -1,11 +1,12 @@
-import CONFIG from "../config"
+import CONFIG from '../config'
 
 const addNavigationGuards = (router, store) => {
   // store token on `authenticate`
   router.beforeEach((to, from, next) => {
     if (to.path === '/authenticate' && to.query.token) {
-      store.commit('token',to.query.token)
-      next({path: '/'})
+      // TODO verify user to get user data
+      store.commit('token', to.query.token)
+      next({ path: '/' })
     } else {
       next()
     }
@@ -13,11 +14,12 @@ const addNavigationGuards = (router, store) => {
 
   // protect all routes but `not-found`
   router.beforeEach((to, from, next) => {
-    if (!CONFIG.DEBUG_DISABLE_AUTH &&   // we did not disabled the auth module for debug purposes
-        !store.state.token &&           // we do not have a token
-        to.path !== '/not-found' &&     // we are not on `not-found`
-        to.path !== '/logout') {        // we are not on `logout`
-      console.log(!CONFIG.DEBUG_DISABLE_AUTH,!store.state.token,to.path !== '/not-found',to.path !== '/logout')
+    if (
+      !CONFIG.DEBUG_DISABLE_AUTH && // we did not disabled the auth module for debug purposes
+      !store.state.token && // we do not have a token
+      to.path !== '/not-found' && // we are not on `not-found`
+      to.path !== '/logout' // we are not on `logout`
+    ) {
       next({ path: '/not-found' })
     } else {
       next()
diff --git a/admin/src/store/store.js b/admin/src/store/store.js
index 544967d6e..4df9f6f39 100644
--- a/admin/src/store/store.js
+++ b/admin/src/store/store.js
@@ -16,7 +16,7 @@ export const mutations = {
   },
   token: (state, token) => {
     state.token = token
-  }
+  },
 }
 
 export const actions = {

From 7f501879b1cc3eae1b36c82ca9f818311ab834b3 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 16:48:10 +0100
Subject: [PATCH 18/56] properly handle auth shortcut in oder to not break
 layout on logout

---
 admin/src/App.vue        | 8 +-------
 admin/src/store/store.js | 3 ++-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/admin/src/App.vue b/admin/src/App.vue
index 359b63b3a..40460eda4 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -1,21 +1,15 @@
 <template>
   <div id="app">
-    <default-layout v-if="showLayout" />
+    <default-layout v-if="$store.state.token" />
     <router-view v-else></router-view>
   </div>
 </template>
 
 <script>
 import defaultLayout from '@/layouts/defaultLayout.vue'
-import CONFIG from './config'
 
 export default {
   name: 'app',
   components: { defaultLayout },
-  data() {
-    return {
-      showLayout: CONFIG.DEBUG_DISABLE_AUTH || this.$store.state.token,
-    }
-  },
 }
 </script>
diff --git a/admin/src/store/store.js b/admin/src/store/store.js
index 4df9f6f39..7820296c6 100644
--- a/admin/src/store/store.js
+++ b/admin/src/store/store.js
@@ -1,6 +1,7 @@
 import Vuex from 'vuex'
 import Vue from 'vue'
 import createPersistedState from 'vuex-persistedstate'
+import CONFIG from '../config'
 
 Vue.use(Vuex)
 
@@ -33,7 +34,7 @@ const store = new Vuex.Store({
     }),
   ],
   state: {
-    token: null,
+    token: CONFIG.DEBUG_DISABLE_AUTH ? 'validToken' : null,
     moderator: 'Dertest Moderator',
     openCreations: 0,
   },

From ced0b066082f594f383e031c10b101ebc2c98d87 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 16:51:21 +0100
Subject: [PATCH 19/56] add infos about jq software requirement

---
 frontend/README.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/frontend/README.md b/frontend/README.md
index e9ac0b097..f7c60552c 100755
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -385,4 +385,13 @@ TODO: Update GDT-Server um paging und Zugriff auf alle Einträge zu erhalten, op
 GET https://staging.gradido.net/state-balances/ajaxGdtTransactions
 Liefert wenn alles in Ordnung ist:
  
-wenn nicht type 7 dann "amount" in euro ansonsten in GDT
\ No newline at end of file
+wenn nicht type 7 dann "amount" in euro ansonsten in GDT
+
+## Additional Software
+
+For `yarn locales` you will need `jq` to use it.
+You can install it (on arch) via
+
+```
+sudo pacman -S jq
+```
\ No newline at end of file

From b6400d3c8da07e7403ea207db1d07822b4725cf1 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 16:51:45 +0100
Subject: [PATCH 20/56] fixed locales

---
 frontend/src/locales/de.json | 2 +-
 frontend/src/locales/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 5eb3b859f..606fa161a 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -1,4 +1,5 @@
 {
+  "admin_area": "Adminbereich",
   "back": "Zurück",
   "community": {
     "choose-another-community": "Eine andere Gemeinschaft auswählen",
@@ -109,7 +110,6 @@
   "login": "Anmeldung",
   "logout": "Abmelden",
   "members_area": "Mitgliederbereich",
-  "admin_area": "Adminbereich",
   "message": "hallo gradido !!",
   "overview": "Übersicht",
   "privacy_policy": "Datenschutzerklärung",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 5bfa18aac..3e3941415 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -1,4 +1,5 @@
 {
+  "admin_area": "Admin's area",
   "back": "Back",
   "community": {
     "choose-another-community": "Choose another community",
@@ -109,7 +110,6 @@
   "login": "Login",
   "logout": "Logout",
   "members_area": "Member's area",
-  "admin_area": "Admin's area",
   "message": "hello gradido !!",
   "overview": "Overview",
   "privacy_policy": "Privacy policy",

From 573d9985333553f12dbe466bee753d7d23ef81a2 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 17:01:28 +0100
Subject: [PATCH 21/56] fix tests

---
 frontend/src/routes/guards.test.js |  2 +-
 frontend/src/routes/router.test.js |  4 ++--
 frontend/src/store/store.test.js   | 19 +++++++++++++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/frontend/src/routes/guards.test.js b/frontend/src/routes/guards.test.js
index cf366eac8..f271c5427 100644
--- a/frontend/src/routes/guards.test.js
+++ b/frontend/src/routes/guards.test.js
@@ -30,7 +30,7 @@ describe('navigation guards', () => {
   })
 
   describe('authorization', () => {
-    const navGuard = router.beforeHooks[0]
+    const navGuard = router.beforeHooks[2]
     const next = jest.fn()
 
     it('redirects to login when not authorized', () => {
diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index df4f9c229..cd26b6f6b 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -49,8 +49,8 @@ describe('router', () => {
         expect(routes.find((r) => r.path === '/').redirect()).toEqual({ path: '/login' })
       })
 
-      it('has fourteen routes defined', () => {
-        expect(routes).toHaveLength(14)
+      it('has fifteen routes defined', () => {
+        expect(routes).toHaveLength(15)
       })
 
       describe('overview', () => {
diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js
index bdb98d03b..829678b44 100644
--- a/frontend/src/store/store.test.js
+++ b/frontend/src/store/store.test.js
@@ -148,11 +148,12 @@ describe('Vuex store', () => {
         },
         hasElopage: false,
         publisherId: 1234,
+        isAdmin: true,
       }
 
-      it('calls ten commits', () => {
+      it('calls eleven commits', () => {
         login({ commit, state }, commitedData)
-        expect(commit).toHaveBeenCalledTimes(10)
+        expect(commit).toHaveBeenCalledTimes(11)
       })
 
       it('commits email', () => {
@@ -204,15 +205,20 @@ describe('Vuex store', () => {
         login({ commit, state }, commitedData)
         expect(commit).toHaveBeenNthCalledWith(10, 'publisherId', 1234)
       })
+
+      it('commits isAdmin', () => {
+        login({ commit, state }, commitedData)
+        expect(commit).toHaveBeenNthCalledWith(11, 'isAdmin', true)
+      })
     })
 
     describe('logout', () => {
       const commit = jest.fn()
       const state = {}
 
-      it('calls ten commits', () => {
+      it('calls eleven commits', () => {
         logout({ commit, state })
-        expect(commit).toHaveBeenCalledTimes(10)
+        expect(commit).toHaveBeenCalledTimes(11)
       })
 
       it('commits token', () => {
@@ -265,6 +271,11 @@ describe('Vuex store', () => {
         expect(commit).toHaveBeenNthCalledWith(10, 'publisherId', null)
       })
 
+      it('commits isAdmin', () => {
+        logout({ commit, state })
+        expect(commit).toHaveBeenNthCalledWith(11, 'isAdmin', false)
+      })
+
       // how to get this working?
       it.skip('calls localStorage.clear()', () => {
         const clearStorageMock = jest.fn()

From ab33753c8ed876c87677c0d64f28414fabeae466 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 22 Nov 2021 17:51:09 +0100
Subject: [PATCH 22/56] test admin link, correct pointer class

---
 .../components/SidebarPlugin/SideBar.spec.js  | 28 +++++++++++++++++++
 .../src/components/SidebarPlugin/SideBar.vue  |  6 ++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
index 8204eb604..0a3b0ec1a 100644
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js
@@ -24,6 +24,7 @@ describe('SideBar', () => {
         hasElopage: false,
       },
       commit: jest.fn(),
+      dispatch: jest.fn(),
     },
     $i18n: {
       locale: 'en',
@@ -154,6 +155,33 @@ describe('SideBar', () => {
           expect(wrapper.emitted('logout')).toEqual([[]])
         })
       })
+
+      describe('admin-area', () => {
+        it('is not visible when not an admin', () => {
+          expect(wrapper.findAll('li').at(1).text()).not.toBe('admin_area')
+        })
+        describe('logged in as admin', () => {
+          const assignLocationSpy = jest.fn()
+          beforeEach(() => {
+            mocks.$store.state.isAdmin = true
+            mocks.$store.state.token = 'valid token'
+            // const { location } = window;
+            delete window.location
+            window.location = {}
+            Object.defineProperty(window, 'location', assignLocationSpy)
+            wrapper = Wrapper()
+          })
+
+          it('is visible', () => {
+            expect(wrapper.findAll('li').at(1).text()).toBe('admin_area')
+          })
+          it.skip('opens a new window when clicked', async () => {
+            wrapper.findAll('li').at(1).find('a').trigger('click')
+            await wrapper.vm.$nextTick()
+            expect(assignLocationSpy).toHaveBeenCalledWith('peter')
+          })
+        })
+      })
     })
   })
 })
diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 8277b17eb..9cf6b6185 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -50,14 +50,14 @@
           <li class="nav-item">
             <a :href="getElopageLink()" class="nav-link" target="_blank">
               {{ $t('members_area') }}&nbsp;
-              <b-badge v-if="!this.$store.state.hasElopage" pill variant="danger">!</b-badge>
+              <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
             </a>
           </li>
         </ul>
 
-        <ul class="navbar-nav ml-3" v-if="this.$store.state.isAdmin">
+        <ul class="navbar-nav ml-3" v-if="$store.state.isAdmin">
           <li class="nav-item">
-            <a class="nav-link ponter" @click="admin">
+            <a class="nav-link pointer" @click="admin">
               {{ $t('admin_area') }}
             </a>
           </li>

From 14ed1d518a981d01164bfa5d3fe8922569c3de82 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 23 Nov 2021 12:16:18 +0100
Subject: [PATCH 23/56] test window location assign

---
 .../src/components/SidebarPlugin/SideBar.spec.js  | 15 ++++++++-------
 frontend/src/components/SidebarPlugin/SideBar.vue |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
index 0a3b0ec1a..a129f4660 100644
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js
@@ -160,25 +160,26 @@ describe('SideBar', () => {
         it('is not visible when not an admin', () => {
           expect(wrapper.findAll('li').at(1).text()).not.toBe('admin_area')
         })
+
         describe('logged in as admin', () => {
           const assignLocationSpy = jest.fn()
           beforeEach(() => {
             mocks.$store.state.isAdmin = true
-            mocks.$store.state.token = 'valid token'
-            // const { location } = window;
-            delete window.location
-            window.location = {}
-            Object.defineProperty(window, 'location', assignLocationSpy)
+            mocks.$store.state.token = 'valid-token'
+            window.location.assign = assignLocationSpy
             wrapper = Wrapper()
           })
 
           it('is visible', () => {
             expect(wrapper.findAll('li').at(1).text()).toBe('admin_area')
           })
-          it.skip('opens a new window when clicked', async () => {
+
+          it('opens a new window when clicked', async () => {
             wrapper.findAll('li').at(1).find('a').trigger('click')
             await wrapper.vm.$nextTick()
-            expect(assignLocationSpy).toHaveBeenCalledWith('peter')
+            expect(assignLocationSpy).toHaveBeenCalledWith(
+              'http://localhost/admin/authenticate?token=valid-token',
+            )
           })
         })
       })
diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 9cf6b6185..96882e816 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -122,7 +122,7 @@ export default {
       this.$emit('logout')
     },
     admin() {
-      window.location = CONFIG.ADMIN_AUTH_URL.replace('$1', this.$store.state.token)
+      window.location.assign(CONFIG.ADMIN_AUTH_URL.replace('$1', this.$store.state.token))
       this.$store.dispatch('logout') // logout without redirect
     },
     getElopageLink() {

From 0e101a012d22d7e4b3d1d87387fcdc91965a74c3 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 23 Nov 2021 12:21:47 +0100
Subject: [PATCH 24/56] test that logout is dispatched when clicked on admin
 area

---
 .../components/SidebarPlugin/SideBar.spec.js  | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
index a129f4660..7b12b6473 100644
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js
@@ -3,6 +3,8 @@ import SideBar from './SideBar'
 
 const localVue = global.localVue
 
+const storeDispatchMock = jest.fn()
+
 describe('SideBar', () => {
   let wrapper
 
@@ -23,8 +25,7 @@ describe('SideBar', () => {
         lastName: 'example',
         hasElopage: false,
       },
-      commit: jest.fn(),
-      dispatch: jest.fn(),
+      dispatch: storeDispatchMock,
     },
     $i18n: {
       locale: 'en',
@@ -163,7 +164,7 @@ describe('SideBar', () => {
 
         describe('logged in as admin', () => {
           const assignLocationSpy = jest.fn()
-          beforeEach(() => {
+          beforeEach(async () => {
             mocks.$store.state.isAdmin = true
             mocks.$store.state.token = 'valid-token'
             window.location.assign = assignLocationSpy
@@ -174,12 +175,20 @@ describe('SideBar', () => {
             expect(wrapper.findAll('li').at(1).text()).toBe('admin_area')
           })
 
-          it('opens a new window when clicked', async () => {
-            wrapper.findAll('li').at(1).find('a').trigger('click')
-            await wrapper.vm.$nextTick()
-            expect(assignLocationSpy).toHaveBeenCalledWith(
-              'http://localhost/admin/authenticate?token=valid-token',
-            )
+          describe('click on admin area', () => {
+            beforeEach(async () => {
+              await wrapper.findAll('li').at(1).find('a').trigger('click')
+            })
+
+            it('opens a new window when clicked', () => {
+              expect(assignLocationSpy).toHaveBeenCalledWith(
+                'http://localhost/admin/authenticate?token=valid-token',
+              )
+            })
+
+            it('dispatches logout to store', () => {
+              expect(storeDispatchMock).toHaveBeenCalledWith('logout')
+            })
           })
         })
       })

From 0eb4bf8732850af2add8b68bdad658b8b2103e91 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 17:22:58 +0100
Subject: [PATCH 25/56] delete some weird docu stuff

---
 frontend/DEV-README.md     | 21 ---------------------
 frontend/ISSUE_TEMPLATE.md |  9 ---------
 2 files changed, 30 deletions(-)
 delete mode 100644 frontend/DEV-README.md
 delete mode 100644 frontend/ISSUE_TEMPLATE.md

diff --git a/frontend/DEV-README.md b/frontend/DEV-README.md
deleted file mode 100644
index ab2b3e225..000000000
--- a/frontend/DEV-README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-DEV README von Alex
-
-default Page:
-´´´
-      <template>
-        <div>default</div>
-      </template>
-
-      <script>
-      export default {
-        name: 'default',
-        data() {
-          return {}
-        },
-        methods: {},
-        watch: {},
-      }
-      </script>
-      
-´´´
-
diff --git a/frontend/ISSUE_TEMPLATE.md b/frontend/ISSUE_TEMPLATE.md
deleted file mode 100644
index 8103f52e6..000000000
--- a/frontend/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
- IMPORTANT: Please use the following link to create a new issue:
-
-  https://www.gradido.net/new-issue/bootstrap-vue-gradido-wallet
-
-**If your issue was not created using the app above, it will be closed immediately.**
--->
-
- 

From a1e811467360070e8b014a4ef173b11d09ae77d6 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 19:55:05 +0100
Subject: [PATCH 26/56] admin_area language file

---
 frontend/src/locales/de.json | 1 +
 frontend/src/locales/en.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index faa61886d..3f981450d 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -110,6 +110,7 @@
   "login": "Anmeldung",
   "logout": "Abmelden",
   "members_area": "Mitgliederbereich",
+  "admin_area": "Adminbereich",
   "message": "hallo gradido !!",
   "overview": "Übersicht",
   "privacy_policy": "Datenschutzerklärung",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 91e25f61d..08c29d646 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -110,6 +110,7 @@
   "login": "Login",
   "logout": "Logout",
   "members_area": "Member's area",
+  "admin_area": "Admin's area",
   "message": "hello gradido !!",
   "overview": "Overview",
   "privacy_policy": "Privacy policy",

From f8404fc9a980740e44aa5218542bec5c048dfc1d Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 19:55:43 +0100
Subject: [PATCH 27/56] link to admin if `isAdmin` is true

---
 frontend/.env.dist                                |  3 ++-
 frontend/src/components/SidebarPlugin/SideBar.vue | 13 +++++++++++++
 frontend/src/config/index.js                      |  5 +++--
 frontend/src/store/store.js                       |  1 +
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/frontend/.env.dist b/frontend/.env.dist
index 8d4025a5d..80dafb7f9 100644
--- a/frontend/.env.dist
+++ b/frontend/.env.dist
@@ -1,3 +1,4 @@
 GRAPHQL_URI=http://localhost:4000/graphql
 DEFAULT_PUBLISHER_ID=2896
-//BUILD_COMMIT=0000000
\ No newline at end of file
+#BUILD_COMMIT=0000000
+ADMIN_AUTH_URL=http://localhost/admin/authenticate?token=$1
\ No newline at end of file
diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index c33c132b0..d8b26318f 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -45,6 +45,7 @@
           <slot name="links"></slot>
         </ul>
         <hr class="my-2" />
+
         <ul class="navbar-nav ml-3">
           <li class="nav-item">
             <a :href="getElopageLink()" class="nav-link" target="_blank">
@@ -54,6 +55,14 @@
           </li>
         </ul>
 
+        <ul class="navbar-nav ml-3" v-if="this.$store.state.isAdmin">
+          <li class="nav-item">
+            <a class="nav-link ponter" @click="admin">
+              {{ $t('admin_area') }}
+            </a>
+          </li>
+        </ul>
+
         <ul class="navbar-nav ml-3">
           <li class="nav-item">
             <a class="nav-link pointer" @click="logout">
@@ -112,6 +121,10 @@ export default {
     logout() {
       this.$emit('logout')
     },
+    admin() {
+      window.location = CONFIG.ADMIN_AUTH_URL.replace('$1',this.$store.state.token)
+      this.$store.dispatch('logout') // logout without redirect
+    },
     getElopageLink() {
       const pId = this.$store.state.publisherId
         ? this.$store.state.publisherId
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 1f1819c62..6c7c49013 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -18,8 +18,9 @@ const environment = {
   DEFAULT_PUBLISHER_ID: process.env.DEFAULT_PUBLISHER_ID || 2896,
 }
 
-const server = {
+const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
+  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token=$1'
 }
 
 const options = {}
@@ -27,7 +28,7 @@ const options = {}
 const CONFIG = {
   ...version,
   ...environment,
-  ...server,
+  ...endpoints,
   ...options,
 }
 
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 6a229c161..1173a8685 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -87,6 +87,7 @@ export const store = new Vuex.Store({
     username: '',
     description: '',
     token: null,
+    isAdmin: true, // TODO implement this properly
     coinanimation: true,
     newsletterState: null,
     community: {

From f1965c44534bc3bf0d65d84ba246f19af4cee4f0 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 19:56:12 +0100
Subject: [PATCH 28/56] store token is actually set

---
 admin/src/store/store.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/store/store.js b/admin/src/store/store.js
index 38a210fe1..e33ce9df1 100644
--- a/admin/src/store/store.js
+++ b/admin/src/store/store.js
@@ -26,7 +26,7 @@ const store = new Vuex.Store({
     }),
   ],
   state: {
-    token: 'some-valid-token',
+    token: null,
     moderator: 'Dertest Moderator',
     openCreations: 0,
   },

From c02028cd553398477e29a7d041d31eb484980b39 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 19:56:37 +0100
Subject: [PATCH 29/56] refactor routes and route guards

---
 admin/src/router/guards.js | 18 +++++++++++++++++-
 admin/src/router/routes.js | 28 ++++++----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js
index c9baf61cb..d6eeda927 100644
--- a/admin/src/router/guards.js
+++ b/admin/src/router/guards.js
@@ -1,7 +1,23 @@
 const addNavigationGuards = (router, store) => {
+  // store token on authenticate
   router.beforeEach((to, from, next) => {
+    console.log('token', to.path, from.path, to.query)
     // handle authentication
-    if (to.meta.requiresAuth && !store.state.token) {
+    if (to.path === '/authenticate' && to.query.token) {
+      console.log('token', to.query.token, to)
+      store.commit('token',to.query.token)
+      // to.query = {}
+      next({path: '/'})
+    } else {
+      next()
+    }
+  })
+
+  // protect all routes but not-found  
+  router.beforeEach((to, from, next) => {
+    console.log('protect', to.path, from.path)
+    // handle authentication
+    if (!store.state.token && to.path !== '/not-found') {
       next({ path: '/not-found' })
     } else {
       next()
diff --git a/admin/src/router/routes.js b/admin/src/router/routes.js
index a13463e08..31008824d 100644
--- a/admin/src/router/routes.js
+++ b/admin/src/router/routes.js
@@ -1,38 +1,22 @@
 const routes = [
   {
-    path: '/',
-    component: () => import('@/views/Overview.vue'),
-    meta: {
-      requiresAuth: true,
-    },
+    path: '/authenticate',
   },
   {
-    path: '/overview',
-    component: () => import('@/views/Overview.vue'),
-    meta: {
-      requiresAuth: true,
-    },
+    path: '/',
+    component: () => import('@/pages/Overview.vue'),
   },
   {
     path: '/user',
-    component: () => import('@/views/UserSearch.vue'),
-    meta: {
-      requiresAuth: true,
-    },
+    component: () => import('@/pages/UserSearch.vue'),
   },
   {
     path: '/creation',
-    component: () => import('@/views/Creation.vue'),
-    meta: {
-      requiresAuth: true,
-    },
+    component: () => import('@/pages/Creation.vue'),
   },
   {
     path: '/creation-confirm',
-    component: () => import('@/views/CreationConfirm.vue'),
-    meta: {
-      requiresAuth: true,
-    },
+    component: () => import('@/pages/CreationConfirm.vue'),
   },
   {
     path: '*',

From 2ba1466a8d574ad6e2d42e2f43abc5de874f4f40 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 19:57:32 +0100
Subject: [PATCH 30/56] seperate app and layouts

---
 admin/src/App.vue                   | 16 ++++++----------
 admin/src/components/NavBar.vue     |  2 ++
 admin/src/layouts/defaultLayout.vue | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 admin/src/layouts/defaultLayout.vue

diff --git a/admin/src/App.vue b/admin/src/App.vue
index 70bc2978a..40460eda4 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -1,19 +1,15 @@
 <template>
   <div id="app">
-    <nav-bar class="wrapper-nav" />
-    <router-view class="wrapper p-3"></router-view>
-    <foo-ter />
+    <default-layout v-if="$store.state.token" />
+    <router-view v-else></router-view>
   </div>
 </template>
 
 <script>
-import NavBar from '@/components/NavBar.vue'
-import FooTer from '@/components/Footer.vue'
+import defaultLayout from '@/layouts/defaultLayout.vue'
+
 export default {
-  name: 'App',
-  components: {
-    NavBar,
-    FooTer,
-  },
+  name: 'app',
+  components: { defaultLayout },
 }
 </script>
diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index a9db9cfeb..fb767267a 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -16,6 +16,8 @@
           >
             | {{ $store.state.openCreations }} offene Schöpfungen
           </b-nav-item>
+          <b-nav-item class="mr-auto">Wallet</b-nav-item>
+          <b-nav-item class="mr-auto">Logout</b-nav-item>
           <!-- <b-nav-item v-show="open < 1" to="/creation-confirm">| keine offene Schöpfungen</b-nav-item> -->
         </b-navbar-nav>
       </b-collapse>
diff --git a/admin/src/layouts/defaultLayout.vue b/admin/src/layouts/defaultLayout.vue
new file mode 100644
index 000000000..71d2f894b
--- /dev/null
+++ b/admin/src/layouts/defaultLayout.vue
@@ -0,0 +1,19 @@
+<template>
+  <div>
+    <nav-bar class="wrapper-nav" />
+    <router-view class="wrapper p-3"></router-view>
+    <foo-ter />
+  </div>
+</template>
+
+<script>
+import NavBar from '@/components/NavBar.vue'
+import FooTer from '@/components/Footer.vue'
+export default {
+  name: 'defaultLayout',
+  components: {
+    NavBar,
+    FooTer,
+  },
+}
+</script>
\ No newline at end of file

From f249f9043c493660ad62b597d2c72ec082212bab Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 19:57:48 +0100
Subject: [PATCH 31/56] rename views to pages

---
 admin/src/{views => pages}/Creation.vue        | 0
 admin/src/{views => pages}/CreationConfirm.vue | 0
 admin/src/{views => pages}/Overview.vue        | 0
 admin/src/{views => pages}/UserSearch.vue      | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename admin/src/{views => pages}/Creation.vue (100%)
 rename admin/src/{views => pages}/CreationConfirm.vue (100%)
 rename admin/src/{views => pages}/Overview.vue (100%)
 rename admin/src/{views => pages}/UserSearch.vue (100%)

diff --git a/admin/src/views/Creation.vue b/admin/src/pages/Creation.vue
similarity index 100%
rename from admin/src/views/Creation.vue
rename to admin/src/pages/Creation.vue
diff --git a/admin/src/views/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
similarity index 100%
rename from admin/src/views/CreationConfirm.vue
rename to admin/src/pages/CreationConfirm.vue
diff --git a/admin/src/views/Overview.vue b/admin/src/pages/Overview.vue
similarity index 100%
rename from admin/src/views/Overview.vue
rename to admin/src/pages/Overview.vue
diff --git a/admin/src/views/UserSearch.vue b/admin/src/pages/UserSearch.vue
similarity index 100%
rename from admin/src/views/UserSearch.vue
rename to admin/src/pages/UserSearch.vue

From 762819b63b6baf908cfb945725e211cb79d8bcf1 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 20:53:18 +0100
Subject: [PATCH 32/56] config WALLET_AUTH_URL

---
 admin/.env.dist           | 2 ++
 admin/src/config/index.js | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 admin/.env.dist

diff --git a/admin/.env.dist b/admin/.env.dist
new file mode 100644
index 000000000..a056837ab
--- /dev/null
+++ b/admin/.env.dist
@@ -0,0 +1,2 @@
+GRAPHQL_URI=http://localhost:4000/graphql
+WALLET_AUTH_URL=http://localhost/vue/authenticate?token=$1
\ No newline at end of file
diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index eab63e903..a6c728498 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -17,8 +17,9 @@ const environment = {
   PRODUCTION: process.env.NODE_ENV === 'production' || false,
 }
 
-const server = {
+const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
+  WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost:3000/vue/authenticate?token=$1'
 }
 
 const options = {}
@@ -26,7 +27,7 @@ const options = {}
 const CONFIG = {
   ...version,
   ...environment,
-  ...server,
+  ...endpoints,
   ...options,
 }
 

From a82f612be820c7f5f7362581b1b72eec0c1287f2 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 20:54:49 +0100
Subject: [PATCH 33/56] separate router.beforeach & implement the authenticate
 route

---
 frontend/src/routes/guards.js | 20 ++++++++++++++++++--
 frontend/src/routes/routes.js |  3 +++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/frontend/src/routes/guards.js b/frontend/src/routes/guards.js
index eebd6976e..bb55ba0cf 100644
--- a/frontend/src/routes/guards.js
+++ b/frontend/src/routes/guards.js
@@ -1,12 +1,28 @@
 const addNavigationGuards = (router, store) => {
+  // handle publisherId
   router.beforeEach((to, from, next) => {
-    // handle publisherId
     const publisherId = to.query.pid
     if (publisherId) {
       store.commit('publisherId', publisherId)
       delete to.query.pid
     }
-    // handle authentication
+    next()
+  })
+
+  // store token on authenticate
+  router.beforeEach((to, from, next) => {
+    console.log('token', to.path, from.path, to.query)
+    if (to.path === '/authenticate' && to.query.token) {
+      console.log('token', to.query.token, to)
+      store.commit('token',to.query.token)
+      next({path: '/overview'})
+    } else {
+      next()
+    }
+  })
+  
+  // handle authentication
+  router.beforeEach((to, from, next) => {
     if (to.meta.requiresAuth && !store.state.token) {
       next({ path: '/login' })
     } else {
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index a3c1389ce..f6975d09d 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -1,6 +1,9 @@
 import NotFound from '@/views/NotFoundPage.vue'
 
 const routes = [
+  {
+    path: '/authenticate',
+  },
   {
     path: '/',
     redirect: (to) => {

From 35b45f4b3d80903ee191b8c398220490aa89ad13 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 20:56:23 +0100
Subject: [PATCH 34/56] todo port & define port due to my setup

---
 admin/src/config/index.js    | 1 +
 frontend/src/config/index.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index a6c728498..1ef44fe60 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -19,6 +19,7 @@ const environment = {
 
 const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
+  // TODO port
   WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost:3000/vue/authenticate?token=$1'
 }
 
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 6c7c49013..01c6c009a 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -20,7 +20,8 @@ const environment = {
 
 const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
-  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token=$1'
+  // TODO port
+  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost:8080/admin/authenticate?token=$1'
 }
 
 const options = {}

From 7ab55acf5accd77614cc2572a3ee5952e0266611 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 20:57:01 +0100
Subject: [PATCH 35/56] logout page

---
 admin/src/router/guards.js | 6 +-----
 admin/src/router/routes.js | 5 +++++
 admin/src/store/store.js   | 8 ++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js
index d6eeda927..6207f443e 100644
--- a/admin/src/router/guards.js
+++ b/admin/src/router/guards.js
@@ -1,12 +1,8 @@
 const addNavigationGuards = (router, store) => {
   // store token on authenticate
   router.beforeEach((to, from, next) => {
-    console.log('token', to.path, from.path, to.query)
-    // handle authentication
     if (to.path === '/authenticate' && to.query.token) {
-      console.log('token', to.query.token, to)
       store.commit('token',to.query.token)
-      // to.query = {}
       next({path: '/'})
     } else {
       next()
@@ -17,7 +13,7 @@ const addNavigationGuards = (router, store) => {
   router.beforeEach((to, from, next) => {
     console.log('protect', to.path, from.path)
     // handle authentication
-    if (!store.state.token && to.path !== '/not-found') {
+    if (!store.state.token && to.path !== '/not-found' && to.path !== '/logout') {
       next({ path: '/not-found' })
     } else {
       next()
diff --git a/admin/src/router/routes.js b/admin/src/router/routes.js
index 31008824d..72e7b1ac5 100644
--- a/admin/src/router/routes.js
+++ b/admin/src/router/routes.js
@@ -6,6 +6,11 @@ const routes = [
     path: '/',
     component: () => import('@/pages/Overview.vue'),
   },
+  {
+    // TODO: Implement a "You are logged out"-Page
+    path: '/logout',
+    component: () => import('@/components/NotFoundPage.vue'),
+  },
   {
     path: '/user',
     component: () => import('@/pages/UserSearch.vue'),
diff --git a/admin/src/store/store.js b/admin/src/store/store.js
index e33ce9df1..4df9f6f39 100644
--- a/admin/src/store/store.js
+++ b/admin/src/store/store.js
@@ -19,6 +19,13 @@ export const mutations = {
   },
 }
 
+export const actions = {
+  logout: ({ commit, state }) => {
+    commit('token', null)
+    localStorage.clear()
+  },
+}
+
 const store = new Vuex.Store({
   plugins: [
     createPersistedState({
@@ -32,6 +39,7 @@ const store = new Vuex.Store({
   },
   // Syncronous mutation of the state
   mutations,
+  actions,
 })
 
 export default store

From 58a3de8fbbcd5fc686dc9dd37099c671b1160c13 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 20:57:24 +0100
Subject: [PATCH 36/56] implement back to wallet or logout in navbar, remove
 profile thingy

---
 admin/src/components/NavBar.vue | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index fb767267a..260c066b3 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -16,17 +16,43 @@
           >
             | {{ $store.state.openCreations }} offene Schöpfungen
           </b-nav-item>
-          <b-nav-item class="mr-auto">Wallet</b-nav-item>
-          <b-nav-item class="mr-auto">Logout</b-nav-item>
+          <b-nav-item @click="wallet">Wallet</b-nav-item>
+          <b-nav-item @click="logout">Logout</b-nav-item>
           <!-- <b-nav-item v-show="open < 1" to="/creation-confirm">| keine offene Schöpfungen</b-nav-item> -->
         </b-navbar-nav>
       </b-collapse>
-      <b-navbar-brand href="http://localhost:3000/vue/login">Profilbereich</b-navbar-brand>
     </b-navbar>
   </div>
 </template>
 <script>
+import CONFIG from '../config'
+
 export default {
   name: 'navbar',
+  methods: {
+    logout() {
+      // TODO
+      // this.$emit('logout')
+      /* this.$apollo
+        .query({
+          query: logout,
+        })
+        .then(() => {
+          this.$store.dispatch('logout')
+          this.$router.push('/logout')
+        })
+        .catch(() => {
+          this.$store.dispatch('logout')
+          if (this.$router.currentRoute.path !== '/logout') this.$router.push('/logout')
+        })
+      */
+      this.$store.dispatch('logout')
+      this.$router.push('/logout')
+    },
+    wallet() {
+      window.location = CONFIG.WALLET_AUTH_URL.replace('$1',this.$store.state.token)
+      this.$store.dispatch('logout') // logout without redirect
+    },
+  }
 }
 </script>

From 03e5df5ece7dd4984b062644f59e853621d876bf Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 19 Nov 2021 21:26:12 +0100
Subject: [PATCH 37/56] convenience mode to disable the auth mode for
 development

---
 admin/.env.dist            |  3 ++-
 admin/src/App.vue          |  8 +++++++-
 admin/src/config/index.js  |  5 +++++
 admin/src/router/guards.js | 14 +++++++++-----
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/admin/.env.dist b/admin/.env.dist
index a056837ab..6d78e6782 100644
--- a/admin/.env.dist
+++ b/admin/.env.dist
@@ -1,2 +1,3 @@
 GRAPHQL_URI=http://localhost:4000/graphql
-WALLET_AUTH_URL=http://localhost/vue/authenticate?token=$1
\ No newline at end of file
+WALLET_AUTH_URL=http://localhost/vue/authenticate?token=$1
+DEBUG_DISABLE_AUTH=false
\ No newline at end of file
diff --git a/admin/src/App.vue b/admin/src/App.vue
index 40460eda4..7c3dd8514 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -1,15 +1,21 @@
 <template>
   <div id="app">
-    <default-layout v-if="$store.state.token" />
+    <default-layout v-if="showLayout" />
     <router-view v-else></router-view>
   </div>
 </template>
 
 <script>
 import defaultLayout from '@/layouts/defaultLayout.vue'
+import CONFIG from './config'
 
 export default {
   name: 'app',
   components: { defaultLayout },
+  data() {
+    return {
+      showLayout: CONFIG.DEBUG_DISABLE_AUTH || this.$store.state.token
+    }
+  }
 }
 </script>
diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index 1ef44fe60..236274d1f 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -23,6 +23,10 @@ const endpoints = {
   WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost:3000/vue/authenticate?token=$1'
 }
 
+const debug = {
+  DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true' || false
+}
+
 const options = {}
 
 const CONFIG = {
@@ -30,6 +34,7 @@ const CONFIG = {
   ...environment,
   ...endpoints,
   ...options,
+  ...debug,
 }
 
 export default CONFIG
diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js
index 6207f443e..a8bdaa2e2 100644
--- a/admin/src/router/guards.js
+++ b/admin/src/router/guards.js
@@ -1,5 +1,7 @@
+import CONFIG from "../config"
+
 const addNavigationGuards = (router, store) => {
-  // store token on authenticate
+  // store token on `authenticate`
   router.beforeEach((to, from, next) => {
     if (to.path === '/authenticate' && to.query.token) {
       store.commit('token',to.query.token)
@@ -9,11 +11,13 @@ const addNavigationGuards = (router, store) => {
     }
   })
 
-  // protect all routes but not-found  
+  // protect all routes but `not-found`
   router.beforeEach((to, from, next) => {
-    console.log('protect', to.path, from.path)
-    // handle authentication
-    if (!store.state.token && to.path !== '/not-found' && to.path !== '/logout') {
+    if (!CONFIG.DEBUG_DISABLE_AUTH &&   // we did not disabled the auth module for debug purposes
+        !store.state.token &&           // we do not have a token
+        to.path !== '/not-found' &&     // we are not on `not-found`
+        to.path !== '/logout') {        // we are not on `logout`
+      console.log(!CONFIG.DEBUG_DISABLE_AUTH,!store.state.token,to.path !== '/not-found',to.path !== '/logout')
       next({ path: '/not-found' })
     } else {
       next()

From c3801f37ab00a144bb2c82195510566287b00ca3 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 16:30:05 +0100
Subject: [PATCH 38/56] corrected ports

---
 admin/src/config/index.js    | 2 +-
 frontend/src/config/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index 236274d1f..9f33b59cb 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -20,7 +20,7 @@ const environment = {
 const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
   // TODO port
-  WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost:3000/vue/authenticate?token=$1'
+  WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost/vue/authenticate?token=$1'
 }
 
 const debug = {
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 01c6c009a..0f8e58c1c 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -21,7 +21,7 @@ const environment = {
 const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
   // TODO port
-  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost:8080/admin/authenticate?token=$1'
+  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token=$1'
 }
 
 const options = {}

From 41d6a7ba45659f5f129ea0a31a30d927f71f37a2 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 16:30:22 +0100
Subject: [PATCH 39/56] implemented `isAdmin` from backend

---
 backend/src/graphql/model/User.ts            |  4 +++
 backend/src/graphql/resolver/UserResolver.ts | 31 ++++++++++++++++++++
 frontend/src/graphql/queries.js              |  1 +
 frontend/src/store/store.js                  |  7 ++++-
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts
index 5b7682e01..33dce434b 100644
--- a/backend/src/graphql/model/User.ts
+++ b/backend/src/graphql/model/User.ts
@@ -20,6 +20,7 @@ export class User {
       this.pubkey = json.public_hex
       this.language = json.language
       this.publisherId = json.publisher_id
+      this.isAdmin = json.isAdmin
     }
   }
 
@@ -71,6 +72,9 @@ export class User {
   @Field(() => Int, { nullable: true })
   publisherId?: number
 
+  @Field(() => Boolean)
+  isAdmin: boolean
+
   @Field(() => Boolean)
   coinanimation: boolean
 
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 25f83bb09..1fd441935 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -194,6 +194,36 @@ const SecretKeyCryptographyDecrypt = (encryptedMessage: Buffer, encryptionKey: B
 
 @Resolver()
 export class UserResolver {
+  /*
+  @Authorized()
+  @Query(() => User)
+  async verifyLogin(@Ctx() context: any): Promise<User> {
+    const loginUserRepository = getCustomRepository(LoginUserRepository)
+    loginUser = loginUserRepository.findByPubkeyHex()
+    const user = new User(result.data.user)
+
+    this.email = json.email
+    this.firstName = json.first_name
+    this.lastName = json.last_name
+    this.username = json.username
+    this.description = json.description
+    this.pubkey = json.public_hex
+    this.language = json.language
+    this.publisherId = json.publisher_id
+    this.isAdmin = json.isAdmin
+
+    const userSettingRepository = getCustomRepository(UserSettingRepository)
+    const coinanimation = await userSettingRepository
+      .readBoolean(userEntity.id, Setting.COIN_ANIMATION)
+      .catch((error) => {
+        throw new Error(error)
+      })
+    user.coinanimation = coinanimation
+    user.isAdmin = true // TODO implement
+    return user
+  }
+  */
+
   @Query(() => User)
   @UseMiddleware(klicktippNewsletterStateMiddleware)
   async login(
@@ -265,6 +295,7 @@ export class UserResolver {
         throw new Error(error)
       })
     user.coinanimation = coinanimation
+	user.isAdmin = true // TODO implement
 
     context.setHeaders.push({
       key: 'token',
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 01021f601..9cd364ed7 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -15,6 +15,7 @@ export const login = gql`
       }
       hasElopage
       publisherId
+      isAdmin
     }
   }
 `
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 1173a8685..c49197059 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -34,6 +34,9 @@ export const mutations = {
     if (isNaN(pubId)) pubId = null
     state.publisherId = pubId
   },
+  isAdmin: (state, isAdmin) => {
+    state.isAdmin = !!isAdmin
+  },
   community: (state, community) => {
     state.community = community
   },
@@ -57,6 +60,7 @@ export const actions = {
     commit('newsletterState', data.klickTipp.newsletterState)
     commit('hasElopage', data.hasElopage)
     commit('publisherId', data.publisherId)
+    commit('isAdmin', data.isAdmin)
   },
   logout: ({ commit, state }) => {
     commit('token', null)
@@ -69,6 +73,7 @@ export const actions = {
     commit('newsletterState', null)
     commit('hasElopage', false)
     commit('publisherId', null)
+    commit('isAdmin', false)
     localStorage.clear()
   },
 }
@@ -87,7 +92,7 @@ export const store = new Vuex.Store({
     username: '',
     description: '',
     token: null,
-    isAdmin: true, // TODO implement this properly
+    isAdmin: false,
     coinanimation: true,
     newsletterState: null,
     community: {

From f21587ae3abb1ed8125d4de277bfbef990047176 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 16:37:25 +0100
Subject: [PATCH 40/56] frontend lint

---
 frontend/src/components/SidebarPlugin/SideBar.vue | 2 +-
 frontend/src/config/index.js                      | 3 +--
 frontend/src/routes/guards.js                     | 9 ++++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index d8b26318f..8277b17eb 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -122,7 +122,7 @@ export default {
       this.$emit('logout')
     },
     admin() {
-      window.location = CONFIG.ADMIN_AUTH_URL.replace('$1',this.$store.state.token)
+      window.location = CONFIG.ADMIN_AUTH_URL.replace('$1', this.$store.state.token)
       this.$store.dispatch('logout') // logout without redirect
     },
     getElopageLink() {
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 0f8e58c1c..b3a9366b7 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -20,8 +20,7 @@ const environment = {
 
 const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
-  // TODO port
-  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token=$1'
+  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token=$1',
 }
 
 const options = {}
diff --git a/frontend/src/routes/guards.js b/frontend/src/routes/guards.js
index bb55ba0cf..005ed720f 100644
--- a/frontend/src/routes/guards.js
+++ b/frontend/src/routes/guards.js
@@ -11,16 +11,15 @@ const addNavigationGuards = (router, store) => {
 
   // store token on authenticate
   router.beforeEach((to, from, next) => {
-    console.log('token', to.path, from.path, to.query)
     if (to.path === '/authenticate' && to.query.token) {
-      console.log('token', to.query.token, to)
-      store.commit('token',to.query.token)
-      next({path: '/overview'})
+      // TODO verify user in order to get user data
+      store.commit('token', to.query.token)
+      next({ path: '/overview' })
     } else {
       next()
     }
   })
-  
+
   // handle authentication
   router.beforeEach((to, from, next) => {
     if (to.meta.requiresAuth && !store.state.token) {

From 84684fe51f3cae31c3d3bb7384c500de54037276 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 16:40:38 +0100
Subject: [PATCH 41/56] lint admin

---
 admin/src/App.vue                   |  4 ++--
 admin/src/components/NavBar.vue     |  4 ++--
 admin/src/config/index.js           |  5 ++---
 admin/src/layouts/defaultLayout.vue |  2 +-
 admin/src/router/guards.js          | 18 ++++++++++--------
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/admin/src/App.vue b/admin/src/App.vue
index 7c3dd8514..359b63b3a 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -14,8 +14,8 @@ export default {
   components: { defaultLayout },
   data() {
     return {
-      showLayout: CONFIG.DEBUG_DISABLE_AUTH || this.$store.state.token
+      showLayout: CONFIG.DEBUG_DISABLE_AUTH || this.$store.state.token,
     }
-  }
+  },
 }
 </script>
diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index 260c066b3..6fb0cb31f 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -50,9 +50,9 @@ export default {
       this.$router.push('/logout')
     },
     wallet() {
-      window.location = CONFIG.WALLET_AUTH_URL.replace('$1',this.$store.state.token)
+      window.location = CONFIG.WALLET_AUTH_URL.replace('$1', this.$store.state.token)
       this.$store.dispatch('logout') // logout without redirect
     },
-  }
+  },
 }
 </script>
diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index 9f33b59cb..69d30a66a 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -19,12 +19,11 @@ const environment = {
 
 const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
-  // TODO port
-  WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost/vue/authenticate?token=$1'
+  WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost/vue/authenticate?token=$1',
 }
 
 const debug = {
-  DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true' || false
+  DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true' || false,
 }
 
 const options = {}
diff --git a/admin/src/layouts/defaultLayout.vue b/admin/src/layouts/defaultLayout.vue
index 71d2f894b..4f6cbbe4d 100644
--- a/admin/src/layouts/defaultLayout.vue
+++ b/admin/src/layouts/defaultLayout.vue
@@ -16,4 +16,4 @@ export default {
     FooTer,
   },
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js
index a8bdaa2e2..f6d8058aa 100644
--- a/admin/src/router/guards.js
+++ b/admin/src/router/guards.js
@@ -1,11 +1,12 @@
-import CONFIG from "../config"
+import CONFIG from '../config'
 
 const addNavigationGuards = (router, store) => {
   // store token on `authenticate`
   router.beforeEach((to, from, next) => {
     if (to.path === '/authenticate' && to.query.token) {
-      store.commit('token',to.query.token)
-      next({path: '/'})
+      // TODO verify user to get user data
+      store.commit('token', to.query.token)
+      next({ path: '/' })
     } else {
       next()
     }
@@ -13,11 +14,12 @@ const addNavigationGuards = (router, store) => {
 
   // protect all routes but `not-found`
   router.beforeEach((to, from, next) => {
-    if (!CONFIG.DEBUG_DISABLE_AUTH &&   // we did not disabled the auth module for debug purposes
-        !store.state.token &&           // we do not have a token
-        to.path !== '/not-found' &&     // we are not on `not-found`
-        to.path !== '/logout') {        // we are not on `logout`
-      console.log(!CONFIG.DEBUG_DISABLE_AUTH,!store.state.token,to.path !== '/not-found',to.path !== '/logout')
+    if (
+      !CONFIG.DEBUG_DISABLE_AUTH && // we did not disabled the auth module for debug purposes
+      !store.state.token && // we do not have a token
+      to.path !== '/not-found' && // we are not on `not-found`
+      to.path !== '/logout' // we are not on `logout`
+    ) {
       next({ path: '/not-found' })
     } else {
       next()

From 47bce06f95d74a851e1e69e22eda90466f77a1ce Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 16:48:10 +0100
Subject: [PATCH 42/56] properly handle auth shortcut in oder to not break
 layout on logout

---
 admin/src/App.vue        | 8 +-------
 admin/src/store/store.js | 3 ++-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/admin/src/App.vue b/admin/src/App.vue
index 359b63b3a..40460eda4 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -1,21 +1,15 @@
 <template>
   <div id="app">
-    <default-layout v-if="showLayout" />
+    <default-layout v-if="$store.state.token" />
     <router-view v-else></router-view>
   </div>
 </template>
 
 <script>
 import defaultLayout from '@/layouts/defaultLayout.vue'
-import CONFIG from './config'
 
 export default {
   name: 'app',
   components: { defaultLayout },
-  data() {
-    return {
-      showLayout: CONFIG.DEBUG_DISABLE_AUTH || this.$store.state.token,
-    }
-  },
 }
 </script>
diff --git a/admin/src/store/store.js b/admin/src/store/store.js
index 4df9f6f39..7820296c6 100644
--- a/admin/src/store/store.js
+++ b/admin/src/store/store.js
@@ -1,6 +1,7 @@
 import Vuex from 'vuex'
 import Vue from 'vue'
 import createPersistedState from 'vuex-persistedstate'
+import CONFIG from '../config'
 
 Vue.use(Vuex)
 
@@ -33,7 +34,7 @@ const store = new Vuex.Store({
     }),
   ],
   state: {
-    token: null,
+    token: CONFIG.DEBUG_DISABLE_AUTH ? 'validToken' : null,
     moderator: 'Dertest Moderator',
     openCreations: 0,
   },

From c8d188279fe0995671cb96bdf6d2f0cc6a9f6518 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 16:51:21 +0100
Subject: [PATCH 43/56] add infos about jq software requirement

---
 frontend/README.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/frontend/README.md b/frontend/README.md
index e9ac0b097..f7c60552c 100755
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -385,4 +385,13 @@ TODO: Update GDT-Server um paging und Zugriff auf alle Einträge zu erhalten, op
 GET https://staging.gradido.net/state-balances/ajaxGdtTransactions
 Liefert wenn alles in Ordnung ist:
  
-wenn nicht type 7 dann "amount" in euro ansonsten in GDT
\ No newline at end of file
+wenn nicht type 7 dann "amount" in euro ansonsten in GDT
+
+## Additional Software
+
+For `yarn locales` you will need `jq` to use it.
+You can install it (on arch) via
+
+```
+sudo pacman -S jq
+```
\ No newline at end of file

From 024eb306127b6c8efebacef9bccdd1363e56c3b1 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 16:51:45 +0100
Subject: [PATCH 44/56] fixed locales

---
 frontend/src/locales/de.json | 2 +-
 frontend/src/locales/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 3f981450d..b0dfe36d4 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -1,4 +1,5 @@
 {
+  "admin_area": "Adminbereich",
   "back": "Zurück",
   "community": {
     "choose-another-community": "Eine andere Gemeinschaft auswählen",
@@ -110,7 +111,6 @@
   "login": "Anmeldung",
   "logout": "Abmelden",
   "members_area": "Mitgliederbereich",
-  "admin_area": "Adminbereich",
   "message": "hallo gradido !!",
   "overview": "Übersicht",
   "privacy_policy": "Datenschutzerklärung",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 08c29d646..135729ffa 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -1,4 +1,5 @@
 {
+  "admin_area": "Admin's area",
   "back": "Back",
   "community": {
     "choose-another-community": "Choose another community",
@@ -110,7 +111,6 @@
   "login": "Login",
   "logout": "Logout",
   "members_area": "Member's area",
-  "admin_area": "Admin's area",
   "message": "hello gradido !!",
   "overview": "Overview",
   "privacy_policy": "Privacy policy",

From b2bb67ab9c04a570cc780f94fd7fa4cf45d4c4a2 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 20 Nov 2021 17:01:28 +0100
Subject: [PATCH 45/56] fix tests

---
 frontend/src/routes/guards.test.js |  2 +-
 frontend/src/routes/router.test.js |  4 ++--
 frontend/src/store/store.test.js   | 19 +++++++++++++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/frontend/src/routes/guards.test.js b/frontend/src/routes/guards.test.js
index cf366eac8..f271c5427 100644
--- a/frontend/src/routes/guards.test.js
+++ b/frontend/src/routes/guards.test.js
@@ -30,7 +30,7 @@ describe('navigation guards', () => {
   })
 
   describe('authorization', () => {
-    const navGuard = router.beforeHooks[0]
+    const navGuard = router.beforeHooks[2]
     const next = jest.fn()
 
     it('redirects to login when not authorized', () => {
diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index df4f9c229..cd26b6f6b 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -49,8 +49,8 @@ describe('router', () => {
         expect(routes.find((r) => r.path === '/').redirect()).toEqual({ path: '/login' })
       })
 
-      it('has fourteen routes defined', () => {
-        expect(routes).toHaveLength(14)
+      it('has fifteen routes defined', () => {
+        expect(routes).toHaveLength(15)
       })
 
       describe('overview', () => {
diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js
index bdb98d03b..829678b44 100644
--- a/frontend/src/store/store.test.js
+++ b/frontend/src/store/store.test.js
@@ -148,11 +148,12 @@ describe('Vuex store', () => {
         },
         hasElopage: false,
         publisherId: 1234,
+        isAdmin: true,
       }
 
-      it('calls ten commits', () => {
+      it('calls eleven commits', () => {
         login({ commit, state }, commitedData)
-        expect(commit).toHaveBeenCalledTimes(10)
+        expect(commit).toHaveBeenCalledTimes(11)
       })
 
       it('commits email', () => {
@@ -204,15 +205,20 @@ describe('Vuex store', () => {
         login({ commit, state }, commitedData)
         expect(commit).toHaveBeenNthCalledWith(10, 'publisherId', 1234)
       })
+
+      it('commits isAdmin', () => {
+        login({ commit, state }, commitedData)
+        expect(commit).toHaveBeenNthCalledWith(11, 'isAdmin', true)
+      })
     })
 
     describe('logout', () => {
       const commit = jest.fn()
       const state = {}
 
-      it('calls ten commits', () => {
+      it('calls eleven commits', () => {
         logout({ commit, state })
-        expect(commit).toHaveBeenCalledTimes(10)
+        expect(commit).toHaveBeenCalledTimes(11)
       })
 
       it('commits token', () => {
@@ -265,6 +271,11 @@ describe('Vuex store', () => {
         expect(commit).toHaveBeenNthCalledWith(10, 'publisherId', null)
       })
 
+      it('commits isAdmin', () => {
+        logout({ commit, state })
+        expect(commit).toHaveBeenNthCalledWith(11, 'isAdmin', false)
+      })
+
       // how to get this working?
       it.skip('calls localStorage.clear()', () => {
         const clearStorageMock = jest.fn()

From c1381da2407d43f05b38daabe245a268d7b49aa4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 22 Nov 2021 17:51:09 +0100
Subject: [PATCH 46/56] test admin link, correct pointer class

---
 .../components/SidebarPlugin/SideBar.spec.js  | 28 +++++++++++++++++++
 .../src/components/SidebarPlugin/SideBar.vue  |  6 ++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
index 8204eb604..0a3b0ec1a 100644
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js
@@ -24,6 +24,7 @@ describe('SideBar', () => {
         hasElopage: false,
       },
       commit: jest.fn(),
+      dispatch: jest.fn(),
     },
     $i18n: {
       locale: 'en',
@@ -154,6 +155,33 @@ describe('SideBar', () => {
           expect(wrapper.emitted('logout')).toEqual([[]])
         })
       })
+
+      describe('admin-area', () => {
+        it('is not visible when not an admin', () => {
+          expect(wrapper.findAll('li').at(1).text()).not.toBe('admin_area')
+        })
+        describe('logged in as admin', () => {
+          const assignLocationSpy = jest.fn()
+          beforeEach(() => {
+            mocks.$store.state.isAdmin = true
+            mocks.$store.state.token = 'valid token'
+            // const { location } = window;
+            delete window.location
+            window.location = {}
+            Object.defineProperty(window, 'location', assignLocationSpy)
+            wrapper = Wrapper()
+          })
+
+          it('is visible', () => {
+            expect(wrapper.findAll('li').at(1).text()).toBe('admin_area')
+          })
+          it.skip('opens a new window when clicked', async () => {
+            wrapper.findAll('li').at(1).find('a').trigger('click')
+            await wrapper.vm.$nextTick()
+            expect(assignLocationSpy).toHaveBeenCalledWith('peter')
+          })
+        })
+      })
     })
   })
 })
diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 8277b17eb..9cf6b6185 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -50,14 +50,14 @@
           <li class="nav-item">
             <a :href="getElopageLink()" class="nav-link" target="_blank">
               {{ $t('members_area') }}&nbsp;
-              <b-badge v-if="!this.$store.state.hasElopage" pill variant="danger">!</b-badge>
+              <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
             </a>
           </li>
         </ul>
 
-        <ul class="navbar-nav ml-3" v-if="this.$store.state.isAdmin">
+        <ul class="navbar-nav ml-3" v-if="$store.state.isAdmin">
           <li class="nav-item">
-            <a class="nav-link ponter" @click="admin">
+            <a class="nav-link pointer" @click="admin">
               {{ $t('admin_area') }}
             </a>
           </li>

From 599eaf495a62da460c89794adbd3d7b26394b9ea Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 23 Nov 2021 12:16:18 +0100
Subject: [PATCH 47/56] test window location assign

---
 .../src/components/SidebarPlugin/SideBar.spec.js  | 15 ++++++++-------
 frontend/src/components/SidebarPlugin/SideBar.vue |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
index 0a3b0ec1a..a129f4660 100644
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js
@@ -160,25 +160,26 @@ describe('SideBar', () => {
         it('is not visible when not an admin', () => {
           expect(wrapper.findAll('li').at(1).text()).not.toBe('admin_area')
         })
+
         describe('logged in as admin', () => {
           const assignLocationSpy = jest.fn()
           beforeEach(() => {
             mocks.$store.state.isAdmin = true
-            mocks.$store.state.token = 'valid token'
-            // const { location } = window;
-            delete window.location
-            window.location = {}
-            Object.defineProperty(window, 'location', assignLocationSpy)
+            mocks.$store.state.token = 'valid-token'
+            window.location.assign = assignLocationSpy
             wrapper = Wrapper()
           })
 
           it('is visible', () => {
             expect(wrapper.findAll('li').at(1).text()).toBe('admin_area')
           })
-          it.skip('opens a new window when clicked', async () => {
+
+          it('opens a new window when clicked', async () => {
             wrapper.findAll('li').at(1).find('a').trigger('click')
             await wrapper.vm.$nextTick()
-            expect(assignLocationSpy).toHaveBeenCalledWith('peter')
+            expect(assignLocationSpy).toHaveBeenCalledWith(
+              'http://localhost/admin/authenticate?token=valid-token',
+            )
           })
         })
       })
diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 9cf6b6185..96882e816 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -122,7 +122,7 @@ export default {
       this.$emit('logout')
     },
     admin() {
-      window.location = CONFIG.ADMIN_AUTH_URL.replace('$1', this.$store.state.token)
+      window.location.assign(CONFIG.ADMIN_AUTH_URL.replace('$1', this.$store.state.token))
       this.$store.dispatch('logout') // logout without redirect
     },
     getElopageLink() {

From e9ceb7e7a5e216e4957a75e06811d18e78756b0c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 23 Nov 2021 12:21:47 +0100
Subject: [PATCH 48/56] test that logout is dispatched when clicked on admin
 area

---
 .../components/SidebarPlugin/SideBar.spec.js  | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
index a129f4660..7b12b6473 100644
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js
@@ -3,6 +3,8 @@ import SideBar from './SideBar'
 
 const localVue = global.localVue
 
+const storeDispatchMock = jest.fn()
+
 describe('SideBar', () => {
   let wrapper
 
@@ -23,8 +25,7 @@ describe('SideBar', () => {
         lastName: 'example',
         hasElopage: false,
       },
-      commit: jest.fn(),
-      dispatch: jest.fn(),
+      dispatch: storeDispatchMock,
     },
     $i18n: {
       locale: 'en',
@@ -163,7 +164,7 @@ describe('SideBar', () => {
 
         describe('logged in as admin', () => {
           const assignLocationSpy = jest.fn()
-          beforeEach(() => {
+          beforeEach(async () => {
             mocks.$store.state.isAdmin = true
             mocks.$store.state.token = 'valid-token'
             window.location.assign = assignLocationSpy
@@ -174,12 +175,20 @@ describe('SideBar', () => {
             expect(wrapper.findAll('li').at(1).text()).toBe('admin_area')
           })
 
-          it('opens a new window when clicked', async () => {
-            wrapper.findAll('li').at(1).find('a').trigger('click')
-            await wrapper.vm.$nextTick()
-            expect(assignLocationSpy).toHaveBeenCalledWith(
-              'http://localhost/admin/authenticate?token=valid-token',
-            )
+          describe('click on admin area', () => {
+            beforeEach(async () => {
+              await wrapper.findAll('li').at(1).find('a').trigger('click')
+            })
+
+            it('opens a new window when clicked', () => {
+              expect(assignLocationSpy).toHaveBeenCalledWith(
+                'http://localhost/admin/authenticate?token=valid-token',
+              )
+            })
+
+            it('dispatches logout to store', () => {
+              expect(storeDispatchMock).toHaveBeenCalledWith('logout')
+            })
           })
         })
       })

From 636c4c8df375a7d0f9966da0a8088f3a4ede2ae4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 23 Nov 2021 14:05:02 +0100
Subject: [PATCH 49/56] implement verifyLogin

---
 admin/src/main.js                            |  1 -
 backend/src/graphql/resolver/UserResolver.ts | 35 +++++++++++++++++++-
 frontend/src/graphql/queries.js              | 20 +++++++++++
 frontend/src/main.js                         |  2 +-
 frontend/src/routes/guards.js                | 11 ++++--
 5 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/admin/src/main.js b/admin/src/main.js
index aa4cc3e03..529f78605 100644
--- a/admin/src/main.js
+++ b/admin/src/main.js
@@ -25,7 +25,6 @@ import moment from 'vue-moment'
 const httpLink = new HttpLink({ uri: CONFIG.GRAPHQL_URI })
 
 const authLink = new ApolloLink((operation, forward) => {
-
   const token = store.state.token
 
   operation.setContext({
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 1fd441935..3f53d5538 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -224,6 +224,39 @@ export class UserResolver {
   }
   */
 
+  @Authorized()
+  @Query(() => User)
+  @UseMiddleware(klicktippNewsletterStateMiddleware)
+  async verifyLogin(@Ctx() context: any): Promise<User> {
+    // TODO refactor and do not have duplicate code with login(see below)
+    const userRepository = getCustomRepository(UserRepository)
+    const userEntity = await userRepository.findByPubkeyHex(context.pubKey)
+    const loginUserRepository = getCustomRepository(LoginUserRepository)
+    const loginUser = await loginUserRepository.findByEmail(userEntity.email)
+    const user = new User()
+    user.email = userEntity.email
+    user.firstName = userEntity.firstName
+    user.lastName = userEntity.lastName
+    user.username = userEntity.username
+    user.description = loginUser.description
+    user.pubkey = userEntity.pubkey.toString('hex')
+    user.language = loginUser.language
+
+    // Elopage Status & Stored PublisherId
+    user.hasElopage = await this.hasElopage(context)
+
+    // coinAnimation
+    const userSettingRepository = getCustomRepository(UserSettingRepository)
+    const coinanimation = await userSettingRepository
+      .readBoolean(userEntity.id, Setting.COIN_ANIMATION)
+      .catch((error) => {
+        throw new Error(error)
+      })
+    user.coinanimation = coinanimation
+    user.isAdmin = true // TODO implement
+    return user
+  }
+
   @Query(() => User)
   @UseMiddleware(klicktippNewsletterStateMiddleware)
   async login(
@@ -295,7 +328,7 @@ export class UserResolver {
         throw new Error(error)
       })
     user.coinanimation = coinanimation
-	user.isAdmin = true // TODO implement
+    user.isAdmin = true // TODO implement
 
     context.setHeaders.push({
       key: 'token',
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 9cd364ed7..8b55f4098 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -20,6 +20,26 @@ export const login = gql`
   }
 `
 
+export const verifyLogin = gql`
+  query {
+    verifyLogin {
+      email
+      username
+      firstName
+      lastName
+      language
+      description
+      coinanimation
+      klickTipp {
+        newsletterState
+      }
+      hasElopage
+      publisherId
+      isAdmin
+    }
+  }
+`
+
 export const logout = gql`
   query {
     logout
diff --git a/frontend/src/main.js b/frontend/src/main.js
index fd06bf9c0..1aa945608 100755
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -51,7 +51,7 @@ Vue.config.productionTip = false
 
 loadAllRules(i18n)
 
-addNavigationGuards(router, store)
+addNavigationGuards(router, store, apolloProvider.defaultClient)
 
 /* eslint-disable no-new */
 new Vue({
diff --git a/frontend/src/routes/guards.js b/frontend/src/routes/guards.js
index 005ed720f..dc8df4f13 100644
--- a/frontend/src/routes/guards.js
+++ b/frontend/src/routes/guards.js
@@ -1,4 +1,6 @@
-const addNavigationGuards = (router, store) => {
+import { verifyLogin } from '../graphql/queries'
+
+const addNavigationGuards = (router, store, apollo) => {
   // handle publisherId
   router.beforeEach((to, from, next) => {
     const publisherId = to.query.pid
@@ -10,10 +12,15 @@ const addNavigationGuards = (router, store) => {
   })
 
   // store token on authenticate
-  router.beforeEach((to, from, next) => {
+  router.beforeEach(async (to, from, next) => {
     if (to.path === '/authenticate' && to.query.token) {
       // TODO verify user in order to get user data
       store.commit('token', to.query.token)
+      const result = await apollo.query({
+        query: verifyLogin,
+        fetchPolicy: 'network-only',
+      })
+      store.dispatch('login', result.data.verifyLogin)
       next({ path: '/overview' })
     } else {
       next()

From 9e34c3459a2cafd8320dd850313e7b0ef2ff110c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 24 Nov 2021 18:32:03 +0100
Subject: [PATCH 50/56] fix test for main and router

---
 admin/src/layouts/defaultLayout.vue |  6 +++---
 admin/src/router/router.test.js     | 11 ++---------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/admin/src/layouts/defaultLayout.vue b/admin/src/layouts/defaultLayout.vue
index 4f6cbbe4d..28babdd58 100644
--- a/admin/src/layouts/defaultLayout.vue
+++ b/admin/src/layouts/defaultLayout.vue
@@ -2,18 +2,18 @@
   <div>
     <nav-bar class="wrapper-nav" />
     <router-view class="wrapper p-3"></router-view>
-    <foo-ter />
+    <content-footer />
   </div>
 </template>
 
 <script>
 import NavBar from '@/components/NavBar.vue'
-import FooTer from '@/components/Footer.vue'
+import ContentFooter from '@/components/ContentFooter.vue'
 export default {
   name: 'defaultLayout',
   components: {
     NavBar,
-    FooTer,
+    ContentFooter,
   },
 }
 </script>
diff --git a/admin/src/router/router.test.js b/admin/src/router/router.test.js
index 8e2e70d4d..e9a622d18 100644
--- a/admin/src/router/router.test.js
+++ b/admin/src/router/router.test.js
@@ -49,15 +49,8 @@ describe('router', () => {
         expect(component.default.name).toBe('overview')
       })
 
-      it('has fourteen routes defined', () => {
-        expect(routes).toHaveLength(6)
-      })
-
-      describe('overview', () => {
-        it('loads the "Overview" component', async () => {
-          const component = await routes.find((r) => r.path === '/overview').component()
-          expect(component.default.name).toBe('overview')
-        })
+      it('has seven routes defined', () => {
+        expect(routes).toHaveLength(7)
       })
 
       describe('user', () => {

From 53c396e17072af9f7b6dfc9411496e01a46fc120 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 24 Nov 2021 18:34:34 +0100
Subject: [PATCH 51/56] fix test of App.vue

---
 admin/src/App.spec.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/admin/src/App.spec.js b/admin/src/App.spec.js
index e77bc578b..6936394f1 100644
--- a/admin/src/App.spec.js
+++ b/admin/src/App.spec.js
@@ -7,11 +7,19 @@ const stubs = {
   RouterView: true,
 }
 
+const mocks = {
+  $store: {
+    state: {
+      token: null,
+    },
+  },
+}
+
 describe('App', () => {
   let wrapper
 
   const Wrapper = () => {
-    return shallowMount(App, { localVue, stubs })
+    return shallowMount(App, { localVue, stubs, mocks })
   }
 
   describe('shallowMount', () => {

From 544c221fb9b8f73a9d136ff9d4ca574789f6eba1 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 24 Nov 2021 18:37:35 +0100
Subject: [PATCH 52/56] move specs to pages folder

---
 admin/src/{views => pages}/Creation.spec.js        | 0
 admin/src/{views => pages}/CreationConfirm.spec.js | 0
 admin/src/{views => pages}/UserSearch.spec.js      | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename admin/src/{views => pages}/Creation.spec.js (100%)
 rename admin/src/{views => pages}/CreationConfirm.spec.js (100%)
 rename admin/src/{views => pages}/UserSearch.spec.js (100%)

diff --git a/admin/src/views/Creation.spec.js b/admin/src/pages/Creation.spec.js
similarity index 100%
rename from admin/src/views/Creation.spec.js
rename to admin/src/pages/Creation.spec.js
diff --git a/admin/src/views/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
similarity index 100%
rename from admin/src/views/CreationConfirm.spec.js
rename to admin/src/pages/CreationConfirm.spec.js
diff --git a/admin/src/views/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js
similarity index 100%
rename from admin/src/views/UserSearch.spec.js
rename to admin/src/pages/UserSearch.spec.js

From 7c49600df6fa0d6d16f336e968c053b836e2131b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 24 Nov 2021 19:43:31 +0100
Subject: [PATCH 53/56] test logout action in store

---
 admin/src/store/store.js      |  2 +-
 admin/src/store/store.test.js | 46 ++++++++++++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/admin/src/store/store.js b/admin/src/store/store.js
index 5f8b4249d..754c559c8 100644
--- a/admin/src/store/store.js
+++ b/admin/src/store/store.js
@@ -23,7 +23,7 @@ export const mutations = {
 export const actions = {
   logout: ({ commit, state }) => {
     commit('token', null)
-    localStorage.clear()
+    window.localStorage.clear()
   },
 }
 
diff --git a/admin/src/store/store.test.js b/admin/src/store/store.test.js
index 81d75f05f..4482a46bf 100644
--- a/admin/src/store/store.test.js
+++ b/admin/src/store/store.test.js
@@ -1,6 +1,11 @@
-import { mutations } from './store'
+import store, { mutations, actions } from './store'
 
 const { token, openCreationsPlus, openCreationsMinus, resetOpenCreations } = mutations
+const { logout } = actions
+
+const CONFIG = {
+  DEBUG_DISABLE_AUTH: true,
+}
 
 describe('Vuex store', () => {
   describe('mutations', () => {
@@ -36,4 +41,43 @@ describe('Vuex store', () => {
       })
     })
   })
+
+  describe('actions', () => {
+    describe('logout', () => {
+      const windowStorageMock = jest.fn()
+      const commit = jest.fn()
+      const state = {}
+      beforeEach(() => {
+        jest.clearAllMocks()
+        window.localStorage.clear = windowStorageMock
+      })
+
+      it('deletes the token in store', () => {
+        logout({ commit, state })
+        expect(commit).toBeCalledWith('token', null)
+      })
+
+      it.skip('clears the window local storage', () => {
+        expect(windowStorageMock).toBeCalled()
+      })
+    })
+  })
+
+  describe('state', () => {
+    describe('authentication enabled', () => {
+      it('has no token', () => {
+        expect(store.state.token).toBe(null)
+      })
+    })
+
+    describe('authentication enabled', () => {
+      beforeEach(() => {
+        CONFIG.DEBUG_DISABLE_AUTH = false
+      })
+
+      it.skip('has a token', () => {
+        expect(store.state.token).toBe('validToken')
+      })
+    })
+  })
 })

From fd9f6f6d55c32cf901211d500da0b14172a5aff8 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 24 Nov 2021 19:49:17 +0100
Subject: [PATCH 54/56] fix error caused by merging

---
 backend/src/graphql/model/User.ts | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts
index 3e3d4e7bf..cdb46c954 100644
--- a/backend/src/graphql/model/User.ts
+++ b/backend/src/graphql/model/User.ts
@@ -10,16 +10,18 @@ export class User {
   @PrimaryGeneratedColumn()
   id: number
   */
-  constructor(json: any) {
-    this.email = json.email
-    this.firstName = json.first_name
-    this.lastName = json.last_name
-    this.username = json.username
-    this.description = json.description
-    this.pubkey = json.public_hex
-    this.language = json.language
-    this.publisherId = json.publisher_id
-    this.isAdmin = json.isAdmin
+  constructor(json?: any) {
+    if (json) {
+      this.email = json.email
+      this.firstName = json.first_name
+      this.lastName = json.last_name
+      this.username = json.username
+      this.description = json.description
+      this.pubkey = json.public_hex
+      this.language = json.language
+      this.publisherId = json.publisher_id
+      this.isAdmin = json.isAdmin
+    }
   }
 
   @Field(() => String)

From e0e707e680b5b57e9eaa7d28387a8fbd5ac81efc Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 24 Nov 2021 21:11:33 +0100
Subject: [PATCH 55/56] test router navigation guards

---
 admin/src/router/guards.js      |  2 +-
 admin/src/router/guards.test.js | 64 +++++++++++++++++++++++++++++++++
 admin/src/router/router.test.js | 11 ++++--
 3 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 admin/src/router/guards.test.js

diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js
index f6d8058aa..d59234a25 100644
--- a/admin/src/router/guards.js
+++ b/admin/src/router/guards.js
@@ -3,7 +3,7 @@ import CONFIG from '../config'
 const addNavigationGuards = (router, store) => {
   // store token on `authenticate`
   router.beforeEach((to, from, next) => {
-    if (to.path === '/authenticate' && to.query.token) {
+    if (to.path === '/authenticate' && to.query && to.query.token) {
       // TODO verify user to get user data
       store.commit('token', to.query.token)
       next({ path: '/' })
diff --git a/admin/src/router/guards.test.js b/admin/src/router/guards.test.js
new file mode 100644
index 000000000..e69846aab
--- /dev/null
+++ b/admin/src/router/guards.test.js
@@ -0,0 +1,64 @@
+import addNavigationGuards from './guards'
+import router from './router'
+
+const storeCommitMock = jest.fn()
+
+const store = {
+  commit: storeCommitMock,
+  state: {
+    token: null,
+  },
+}
+
+addNavigationGuards(router, store)
+
+describe('navigation guards', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  describe('authenticate', () => {
+    const navGuard = router.beforeHooks[0]
+    const next = jest.fn()
+
+    describe('with valid token', () => {
+      it('commits the token to the store', async () => {
+        navGuard({ path: '/authenticate', query: { token: 'valid-token' } }, {}, next)
+        expect(storeCommitMock).toBeCalledWith('token', 'valid-token')
+      })
+
+      it('redirects to /', async () => {
+        navGuard({ path: '/authenticate', query: { token: 'valid-token' } }, {}, next)
+        expect(next).toBeCalledWith({ path: '/' })
+      })
+    })
+
+    describe('without valid token', () => {
+      it('does not commit the token to the store', async () => {
+        navGuard({ path: '/authenticate' }, {}, next)
+        expect(storeCommitMock).not.toBeCalledWith()
+      })
+
+      it('calls next withou arguments', async () => {
+        navGuard({ path: '/authenticate' }, {}, next)
+        expect(next).toBeCalledWith()
+      })
+    })
+  })
+
+  describe('protect all routes', () => {
+    const navGuard = router.beforeHooks[1]
+    const next = jest.fn()
+
+    it('redirects no not found with no token in store ', () => {
+      navGuard({ path: '/' }, {}, next)
+      expect(next).toBeCalledWith({ path: '/not-found' })
+    })
+
+    it('does not redirect when token in store', () => {
+      store.state.token = 'valid token'
+      navGuard({ path: '/' }, {}, next)
+      expect(next).toBeCalledWith()
+    })
+  })
+})
diff --git a/admin/src/router/router.test.js b/admin/src/router/router.test.js
index e9a622d18..eb9b646cb 100644
--- a/admin/src/router/router.test.js
+++ b/admin/src/router/router.test.js
@@ -44,13 +44,20 @@ describe('router', () => {
     })
 
     describe('routes', () => {
+      it('has seven routes defined', () => {
+        expect(routes).toHaveLength(7)
+      })
+
       it('has "/overview" as default', async () => {
         const component = await routes.find((r) => r.path === '/').component()
         expect(component.default.name).toBe('overview')
       })
 
-      it('has seven routes defined', () => {
-        expect(routes).toHaveLength(7)
+      describe('logout', () => {
+        it('loads the "NotFoundPage" component', async () => {
+          const component = await routes.find((r) => r.path === '/logout').component()
+          expect(component.default.name).toBe('not-found')
+        })
       })
 
       describe('user', () => {

From 62b3600ac78885dc4e3b0cd07f4f59d7223bae01 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 24 Nov 2021 21:12:59 +0100
Subject: [PATCH 56/56] coverage unit tests admin interface 51%

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ff6f4e831..3d58752e7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -441,7 +441,7 @@ jobs:
           report_name: Coverage Admin Interface
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 47
+          min_coverage: 51
           token: ${{ github.token }}
 
   ##############################################################################