From 4a8ba8d385b697d0831ac6550a3c193251d93105 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 21 Apr 2021 16:24:06 +0200
Subject: [PATCH 1/5] API call for logout in compomemt

---
 .../src/components/SidebarPlugin/SideBar.vue  |  4 ++-
 frontend/src/store/store.js                   | 14 +++------
 frontend/src/views/Layout/DashboardNavbar.vue | 31 -------------------
 3 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 0063e6e58..bb925876b 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -70,6 +70,7 @@
 <script>
 import NavbarToggleButton from '@/components/NavbarToggleButton'
 import VueQrcode from 'vue-qrcode'
+import loginAPI from '../../apis/loginAPI'
 
 export default {
   name: 'sidebar',
@@ -101,7 +102,8 @@ export default {
     showSidebar() {
       this.$sidebar.displaySidebar(true)
     },
-    logout() {
+    async logout() {
+      //const result = await loginAPI.logout(this.$store.state.session_id)
       this.$store.dispatch('logout')
       this.$router.push('/login')
     },
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 357205847..cb6ea841a 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -49,23 +49,19 @@ export const store = new Vuex.Store({
     },
   },
   actions: {
-    login: async ({ dispatch, commit }, data) => {
+    login: ({ dispatch, commit }, data) => {
       commit('session_id', data.session_id)
       commit('email', data.email)
     },
-    passwordReset: async (data) => {},
-    schoepfen: async (data) => {
+    passwordReset: (data) => {},
+    schoepfen: (data) => {
       // http://localhost/transaction-creations/ajaxCreate
     },
-    createUser: async ({ commit, dispatch }, data) => {
+    createUser: ({ commit, dispatch }, data) => {
       commit('session_id', data.session_id)
       commit('email', data.email)
     },
-    logout: async ({ commit, state }) => {
-      if (state.session_id) {
-        const result = await loginAPI.logout(state.session_id)
-        // The result can be error, but thats ok with us
-      }
+    logout: ({ commit, state }) => {
       commit('session_id', null)
       commit('email', null)
       sessionStorage.clear()
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index 7b0964f2c..3b91a9d51 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -37,37 +37,6 @@ export default {
   props: {
     type: {
       type: String,
-      default: 'default', // default|light
-      description: 'Look of the dashboard navbar. Default (Green) or light (gray)',
-    },
-  },
-  computed: {
-    routeName() {
-      const { name } = this.$route
-      return this.capitalizeFirstLetter(name)
-    },
-  },
-  data() {
-    return {
-      activeNotifications: false,
-      showMenu: false,
-      searchModalVisible: false,
-      searchQuery: '',
-    }
-  },
-  methods: {
-    capitalizeFirstLetter(string) {
-      return string.charAt(0).toUpperCase() + string.slice(1)
-    },
-    toggleNotificationDropDown() {
-      this.activeNotifications = !this.activeNotifications
-    },
-    closeDropDown() {
-      this.activeNotifications = false
-    },
-    logout() {
-      this.$store.dispatch('logout')
-      this.$router.push('/login')
     },
   },
 }

From 810bd6d0badc46ca763c85a3b6da458d907ad7e0 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 21 Apr 2021 16:51:46 +0200
Subject: [PATCH 2/5] remove loginAPI calls from store

---
 frontend/src/components/SidebarPlugin/SideBar.vue | 7 ++-----
 frontend/src/store/store.js                       | 1 -
 frontend/src/views/Layout/DashboardLayout_gdd.vue | 9 ++++++++-
 frontend/src/views/Layout/DashboardNavbar.vue     | 1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index bb925876b..42d1e5fb1 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -70,7 +70,6 @@
 <script>
 import NavbarToggleButton from '@/components/NavbarToggleButton'
 import VueQrcode from 'vue-qrcode'
-import loginAPI from '../../apis/loginAPI'
 
 export default {
   name: 'sidebar',
@@ -102,10 +101,8 @@ export default {
     showSidebar() {
       this.$sidebar.displaySidebar(true)
     },
-    async logout() {
-      //const result = await loginAPI.logout(this.$store.state.session_id)
-      this.$store.dispatch('logout')
-      this.$router.push('/login')
+    logout() {
+      this.$emit('logout')
     },
   },
 }
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index cb6ea841a..82c2e6992 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 Vue.use(Vuex)
-import loginAPI from '../apis/loginAPI'
 import communityAPI from '../apis/communityAPI'
 import createPersistedState from 'vuex-persistedstate'
 
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index ec2fc1352..341f63ce3 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="wrapper">
     <notifications></notifications>
-    <side-bar>
+    <side-bar @logout="logout">
       <template slot="links">
         <b-nav-item href="#!" to="/overview">
           <b-nav-text class="p-0 text-lg text-muted">{{ $t('send') }}</b-nav-text>
@@ -36,6 +36,7 @@
 <script>
 import PerfectScrollbar from 'perfect-scrollbar'
 import 'perfect-scrollbar/css/perfect-scrollbar.css'
+import loginAPI from '../../apis/loginAPI'
 
 function hasElement(className) {
   return document.getElementsByClassName(className).length > 0
@@ -71,6 +72,12 @@ export default {
         initScrollbar('sidenav')
       }
     },
+    async logout() {
+      const result = await loginAPI.logout(this.$store.state.session_id)
+      // do we have to check success?
+      this.$store.dispatch('logout')
+      this.$router.push('/login')
+    },
   },
   mounted() {
     this.initScrollbar()
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index 3b91a9d51..afa48828a 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -28,6 +28,7 @@
 <script>
 import { BaseNav } from '@/components'
 import VueQrcode from 'vue-qrcode'
+import loginAPI from '../../apis/loginAPI'
 
 export default {
   components: {

From 31782d28c853f6b6f9de3a7cc6d1d128e8c3e63f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 21 Apr 2021 16:57:25 +0200
Subject: [PATCH 3/5] remove import of loginAPI

---
 frontend/src/views/Layout/DashboardNavbar.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index afa48828a..3b91a9d51 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -28,7 +28,6 @@
 <script>
 import { BaseNav } from '@/components'
 import VueQrcode from 'vue-qrcode'
-import loginAPI from '../../apis/loginAPI'
 
 export default {
   components: {

From a151f3a30a8af5bd1caeacc5b610043e8b351587 Mon Sep 17 00:00:00 2001
From: einhornimmond <dario.rekowski@gmx.de>
Date: Wed, 21 Apr 2021 18:20:46 +0200
Subject: [PATCH 4/5] Update
 login_server/src/cpp/JSONInterface/JsonLoginViaEmailVerificationCode.cpp

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 .../cpp/JSONInterface/JsonLoginViaEmailVerificationCode.cpp   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/login_server/src/cpp/JSONInterface/JsonLoginViaEmailVerificationCode.cpp b/login_server/src/cpp/JSONInterface/JsonLoginViaEmailVerificationCode.cpp
index d52a33fc1..fcbd7ba07 100644
--- a/login_server/src/cpp/JSONInterface/JsonLoginViaEmailVerificationCode.cpp
+++ b/login_server/src/cpp/JSONInterface/JsonLoginViaEmailVerificationCode.cpp
@@ -56,7 +56,7 @@ Poco::JSON::Object* JsonLoginViaEmailVerificationCode::handle(Poco::Dynamic::Var
 	auto user = session->getNewUser();
 
 	if (!user->getModel()->getPasswordHashed()) {
-		info.add("user hasn't password");
+		info.add("user has no password");
 	}
 	auto update_email_verification_result = session->updateEmailVerification(code);
 	if (1 == update_email_verification_result) {
@@ -69,4 +69,4 @@ Poco::JSON::Object* JsonLoginViaEmailVerificationCode::handle(Poco::Dynamic::Var
 
 	return result;
 
-}
\ No newline at end of file
+}

From 36ea3727f8cf4a8436f25597dfe8d4d30764cd74 Mon Sep 17 00:00:00 2001
From: einhornimmond <dario.rekowski@gmx.de>
Date: Wed, 21 Apr 2021 18:22:56 +0200
Subject: [PATCH 5/5] update doc to fit Ulf's suggestion

---
 docu/login_server.api.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docu/login_server.api.md b/docu/login_server.api.md
index 57996d797..5cf44c422 100644
--- a/docu/login_server.api.md
+++ b/docu/login_server.api.md
@@ -312,7 +312,7 @@ In case of success returns:
   - `registerDirect`: code generated by register for check email
   - `register`: code generated by auto-register via elopage for check email
 - `info`: can contain additional info strings 
-  - "user hasn't password": if user hasn't set a password yet (for example if he was registered via elopage)
+  - "user has no password": if user hasn't set a password yet (for example if he was registered via elopage)
   - "email already activated": if email was already checked 
 - `user`: contain user object
   - `created`: timestamp on which account was created