From 592a682bd75f595e6f65a49486e9aec5173e1437 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 21 Aug 2019 13:29:30 +0200
Subject: [PATCH] Temporary commit

---
 backend/src/middleware/userMiddleware.js      | 26 -------------------
 .../Registration/CreateUserAccount.vue        |  1 +
 webapp/middleware/authenticated.js            |  5 ++--
 webapp/pages/login.vue                        |  3 ++-
 webapp/pages/terms-and-conditions-confirm.vue |  9 +++++++
 5 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/backend/src/middleware/userMiddleware.js b/backend/src/middleware/userMiddleware.js
index f4b81d495..fafbd44e5 100644
--- a/backend/src/middleware/userMiddleware.js
+++ b/backend/src/middleware/userMiddleware.js
@@ -8,33 +8,7 @@ export default {
       return result
     },
     UpdateUser: async (resolve, root, args, context, info) => {
-      const { currentUser } = context
-      if (
-        !!currentUser &&
-        !!args.termsAndConditionsAgreedVersion &&
-        args.termsAndConditionsAgreedVersion
-      ) {
-        const session = context.driver.session()
-        const cypher = `
-          MATCH (user: User { id: $userId})
-          SET user.termsAndConditionsAgreedAt = $createdAt
-          SET user.termsAndConditionsAgreedVersion = $version
-          RETURN user { .termsAndConditionsAgreedAt, .termsAndConditionsAgreedVersion }
-        `
-        const variable = {
-          userId: currentUser.id,
-          createdAt: new Date().toISOString(),
-          version: args.termsAndConditionsAgreedVersion,
-        }
-        await session.run(cypher, variable)
-        // console.log('Nach dem speichern')
-        // console.log(transactionResult)
-        // console.log('-------------------------------------')
-        session.close()
-      }
-
       const result = await resolve(root, args, context, info)
-
       await createOrUpdateLocations(args.id, args.locationName, context.driver)
       return result
     },
diff --git a/webapp/components/Registration/CreateUserAccount.vue b/webapp/components/Registration/CreateUserAccount.vue
index e5b1ee38f..b0e6bb7b7 100644
--- a/webapp/components/Registration/CreateUserAccount.vue
+++ b/webapp/components/Registration/CreateUserAccount.vue
@@ -84,6 +84,7 @@ import gql from 'graphql-tag'
 import PasswordStrength from '../Password/Strength'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
 import PasswordForm from '~/components/utils/PasswordFormHelper'
+/* TODO: hier muss die version rein */
 export const SignupVerificationMutation = gql`
   mutation($nonce: String!, $name: String!, $email: String!, $password: String!) {
     SignupVerification(nonce: $nonce, email: $email, name: $name, password: $password) {
diff --git a/webapp/middleware/authenticated.js b/webapp/middleware/authenticated.js
index 3d7b0a16b..04717e51c 100644
--- a/webapp/middleware/authenticated.js
+++ b/webapp/middleware/authenticated.js
@@ -26,11 +26,12 @@ export default async ({ store, env, route, redirect }) => {
 
   // set the redirect path for after the login
   let params = {}
-  if (!isEmpty(route.path) && route.path !== '/') {
+  if (!isEmpty(route.path) && route.path !== '/' && route.path !== 'terms-and-conditions-confirm') {
     params.path = route.path
   }
-
+  console.log("ÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖÖö")
   if (!upToDate) {
+    console.log("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")
     return redirect('/terms-and-conditions-confirm', params)
   } else {
     return redirect('/login', params)
diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index 14f9f4171..9a1666361 100644
--- a/webapp/pages/login.vue
+++ b/webapp/pages/login.vue
@@ -75,6 +75,7 @@
 
 <script>
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
+import { VERSION } from '~/pages/terms-and-conditions'
 
 export default {
   components: {
@@ -96,7 +97,7 @@ export default {
     },
   },
   asyncData({ store, redirect }) {
-    if (store.getters['auth/isLoggedIn']) {
+    if (store.getters['auth/user'].termsAndConditionsAgreedVersion === VERSION) {
       redirect('/')
     }
   },
diff --git a/webapp/pages/terms-and-conditions-confirm.vue b/webapp/pages/terms-and-conditions-confirm.vue
index e08c3663f..88f82a806 100644
--- a/webapp/pages/terms-and-conditions-confirm.vue
+++ b/webapp/pages/terms-and-conditions-confirm.vue
@@ -73,6 +73,15 @@ export default {
       ],
     }
   },
+  asyncData({ store, redirect }) {
+    console.log('store')
+    console.log(store)
+    console.log('redirect')
+    console.log(redirect)
+    if (store.getters['auth/isLoggedIn']) {
+      redirect('/')
+    }
+  },
   methods: {
     async submit() {
       try {