From b8c75bd50ab07c42648d546188ad9a9e4c332362 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 16 Jul 2021 15:45:29 +0200
Subject: [PATCH 01/10] olli test 1

---
 frontend/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index a6613bec1..a2d4a0fa8 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="app" class="font-sans text-gray-800">
+  <div id="app" class="font-sans text-gray-800 ttt">
     <div class="">
       <particles-bg type="custom" :config="config" :bg="true" />
       <component :is="$route.meta.requiresAuth ? 'DashboardLayout' : 'AuthLayoutGDD'" />

From ec2f41814c89062b1f8e5356f477aba73df2bec7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 17 Jul 2021 11:08:34 +0200
Subject: [PATCH 02/10] input css clear :)

---
 frontend/src/components/Inputs/InputEmail.vue | 30 +++++++++----------
 .../src/components/Inputs/InputPassword.vue   |  6 +++-
 frontend/src/views/Pages/Register.vue         | 12 ++++++--
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/Inputs/InputEmail.vue b/frontend/src/components/Inputs/InputEmail.vue
index 41338fd8c..b83d25fdb 100644
--- a/frontend/src/components/Inputs/InputEmail.vue
+++ b/frontend/src/components/Inputs/InputEmail.vue
@@ -6,22 +6,20 @@
     v-slot="{ errors, valid, validated, ariaInput, ariaMsg }"
   >
     <b-form-group :label="label" :label-for="labelFor">
-      <b-input-group>
-        <b-form-input
-          v-model="currentValue"
-          v-bind="ariaInput"
-          :id="labelFor"
-          :name="name"
-          :placeholder="placeholder"
-          type="email"
-          :state="validated ? valid : false"
-          trim
-          class="email-form-input"
-        ></b-form-input>
-        <b-form-invalid-feedback v-bind="ariaMsg">
-          {{ errors[0] }}
-        </b-form-invalid-feedback>
-      </b-input-group>
+      <b-form-input
+        v-model="currentValue"
+        v-bind="ariaInput"
+        :id="labelFor"
+        :name="name"
+        :placeholder="placeholder"
+        type="email"
+        :state="validated ? valid : false"
+        trim
+        class="email-form-input"
+      ></b-form-input>
+      <b-form-invalid-feedback v-bind="ariaMsg">
+        {{ errors[0] }}
+      </b-form-invalid-feedback>
     </b-form-group>
   </validation-provider>
 </template>
diff --git a/frontend/src/components/Inputs/InputPassword.vue b/frontend/src/components/Inputs/InputPassword.vue
index 6b72f0b01..15ce116c9 100644
--- a/frontend/src/components/Inputs/InputPassword.vue
+++ b/frontend/src/components/Inputs/InputPassword.vue
@@ -19,7 +19,11 @@
           :state="validated ? valid : false"
         ></b-form-input>
         <b-input-group-append>
-          <b-button variant="outline-primary" @click="toggleShowPassword">
+          <b-button
+            variant="outline-light"
+            @click="toggleShowPassword"
+            class="border-left-0 rounded-right"
+          >
             <b-icon :icon="showPassword ? 'eye' : 'eye-slash'" />
           </b-button>
         </b-input-group-append>
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index 7f475ebae..f8a018a6e 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -121,7 +121,11 @@
                         ></b-form-input>
 
                         <b-input-group-append>
-                          <b-button variant="outline-primary" @click="togglePasswordVisibility">
+                          <b-button
+                            variant="outline-light"
+                            @click="togglePasswordVisibility"
+                            class="border-left-0"
+                          >
                             <b-icon :icon="passwordVisible ? 'eye' : 'eye-slash'" />
                           </b-button>
                         </b-input-group-append>
@@ -147,7 +151,11 @@
                       ></b-form-input>
 
                       <b-input-group-append>
-                        <b-button variant="outline-primary" @click="togglePasswordRepeatVisibility">
+                        <b-button
+                          variant="outline-light"
+                          @click="togglePasswordRepeatVisibility"
+                          class="border-left-0"
+                        >
                           <b-icon :icon="passwordVisibleRepeat ? 'eye' : 'eye-slash'" />
                         </b-button>
                       </b-input-group-append>

From a8422c690820ea80e3e25331bfce42f9e00bce6e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 17 Jul 2021 11:13:19 +0200
Subject: [PATCH 03/10] remove ttt test mit olli

---
 frontend/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index a2d4a0fa8..a6613bec1 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="app" class="font-sans text-gray-800 ttt">
+  <div id="app" class="font-sans text-gray-800">
     <div class="">
       <particles-bg type="custom" :config="config" :bg="true" />
       <component :is="$route.meta.requiresAuth ? 'DashboardLayout' : 'AuthLayoutGDD'" />

From 4c51a1429b00001046ce210d45a1956bfae3cb9d Mon Sep 17 00:00:00 2001
From: Hannes Heine <hannes.heine@gmail.com>
Date: Tue, 20 Jul 2021 12:30:57 +0200
Subject: [PATCH 04/10] Replaced form for Email, Password and PasswordConfirm
 to the existing components.

---
 frontend/src/views/Pages/Register.vue | 90 +++------------------------
 1 file changed, 7 insertions(+), 83 deletions(-)

diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index f8a018a6e..6f3e3af12 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -76,91 +76,11 @@
                     </b-form-group>
                   </validation-provider>
 
-                  <validation-provider
-                    name="Email"
-                    :rules="{ required: true, email: true }"
-                    v-slot="validationContext"
-                  >
-                    <b-form-group class="mb-3" label="Email" label-for="registerEmail">
-                      <b-form-input
-                        id="registerEmail"
-                        name="Email"
-                        v-model="form.email"
-                        placeholder="Email"
-                        :state="getValidationState(validationContext)"
-                        aria-describedby="registerEmailLiveFeedback"
-                      ></b-form-input>
-
-                      <b-form-invalid-feedback id="registerEmailLiveFeedback">
-                        {{ validationContext.errors[0] }}
-                      </b-form-invalid-feedback>
-                    </b-form-group>
-                  </validation-provider>
+                  <input-email v-model="form.email" id="registerEmail"></input-email>
 
                   <hr />
-
-                  <validation-provider
-                    :name="$t('form.password')"
-                    :rules="{ required: true }"
-                    v-slot="validationContext"
-                  >
-                    <b-form-group
-                      class="mb-5"
-                      :label="$t('form.password')"
-                      label-for="registerPassword"
-                    >
-                      <b-input-group>
-                        <b-form-input
-                          id="registerPassword"
-                          :name="$t('form.password')"
-                          v-model="form.password"
-                          :placeholder="$t('form.password')"
-                          :type="passwordVisible ? 'text' : 'password'"
-                          :state="getValidationState(validationContext)"
-                          aria-describedby="registerPasswordLiveFeedback"
-                        ></b-form-input>
-
-                        <b-input-group-append>
-                          <b-button
-                            variant="outline-light"
-                            @click="togglePasswordVisibility"
-                            class="border-left-0"
-                          >
-                            <b-icon :icon="passwordVisible ? 'eye' : 'eye-slash'" />
-                          </b-button>
-                        </b-input-group-append>
-                      </b-input-group>
-                      <b-form-invalid-feedback id="registerPasswordLiveFeedback">
-                        {{ validationContext.errors[0] }}
-                      </b-form-invalid-feedback>
-                    </b-form-group>
-                  </validation-provider>
-
-                  <b-form-group
-                    class="mb-5"
-                    :label="$t('form.passwordRepeat')"
-                    label-for="registerPasswordRepeat"
-                  >
-                    <b-input-group>
-                      <b-form-input
-                        id="registerPasswordRepeat"
-                        :name="$t('form.passwordRepeat')"
-                        v-model.lazy="form.passwordRepeat"
-                        :placeholder="$t('form.passwordRepeat')"
-                        :type="passwordVisibleRepeat ? 'text' : 'password'"
-                      ></b-form-input>
-
-                      <b-input-group-append>
-                        <b-button
-                          variant="outline-light"
-                          @click="togglePasswordRepeatVisibility"
-                          class="border-left-0"
-                        >
-                          <b-icon :icon="passwordVisibleRepeat ? 'eye' : 'eye-slash'" />
-                        </b-button>
-                      </b-input-group-append>
-                    </b-input-group>
-                  </b-form-group>
+                  <input-password v-model="form.password" id="registerPassword"></input-password>
+                  <input-password-confirmation v-model="form.passwordRepeat" id="registerPasswordRepeat"></input-password-confirmation>
 
                   <transition name="hint" appear>
                     <div v-if="passwordValidation.errors.length > 0 && !submitted" class="hints">
@@ -232,8 +152,12 @@
 </template>
 <script>
 import loginAPI from '../../apis/loginAPI'
+import InputEmail from '../../components/Inputs/InputEmail.vue'
+import InputPassword from '../../components/Inputs/InputPassword.vue'
+import InputPasswordConfirmation from '../../components/Inputs/InputPasswordConfirmation.vue'
 
 export default {
+  components: { InputPassword, InputPasswordConfirmation, InputEmail },
   name: 'register',
   data() {
     return {

From ec401d39080458ae2130dbae8ab1fe5fe070b78e Mon Sep 17 00:00:00 2001
From: Hannes Heine <hannes.heine@gmail.com>
Date: Tue, 20 Jul 2021 13:38:02 +0200
Subject: [PATCH 05/10] In register vue added the input-password components for
 new and confirm Password.

---
 frontend/src/views/Pages/Register.spec.js | 28 ++++++++++++++++++++++-
 frontend/src/views/Pages/Register.vue     |  7 +++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js
index 85f3ca38f..64c38f449 100644
--- a/frontend/src/views/Pages/Register.spec.js
+++ b/frontend/src/views/Pages/Register.spec.js
@@ -80,13 +80,39 @@ describe('Register', () => {
         expect(wrapper.find('button[type="submit"]').exists()).toBe(false)
       })
 
-      it('shows a warning when no valid Email is entered', async () => {
+      it('displays a message that Email is required', async () => {
+        await wrapper.find('form').trigger('submit')
+        await flushPromises()
+        expect(wrapper.findAll('div.invalid-feedback').at(0).text()).toBe(
+          'validations.messages.required',
+        )
+      })
+
+      it('displays a message that password is required', async () => {
+        await wrapper.find('form').trigger('submit')
+        await flushPromises()
+        expect(wrapper.findAll('div.invalid-feedback').at(1).text()).toBe(
+          'validations.messages.required',
+        )
+      })
+
+      it('displays a message that passwordConfirm is required', async () => {
+        await wrapper.find('form').trigger('submit')
+        await flushPromises()
+        expect(wrapper.findAll('div.invalid-feedback').at(2).text()).toBe(
+          'validations.messages.required',
+        )
+      })
+
+      /**
+       * it('shows a warning when no valid Email is entered', async () => {
         wrapper.find('#registerEmail').setValue('no_valid@Email')
         await flushPromises()
         await expect(wrapper.find('#registerEmailLiveFeedback').text()).toEqual(
           'validations.messages.email',
         )
       })
+      */
 
       it('shows 4 warnings when no password is set', async () => {
         const passwords = wrapper.findAll('input[type="password"]')
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index 6f3e3af12..1e5600008 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -79,8 +79,8 @@
                   <input-email v-model="form.email" id="registerEmail"></input-email>
 
                   <hr />
-                  <input-password v-model="form.password" id="registerPassword"></input-password>
-                  <input-password-confirmation v-model="form.passwordRepeat" id="registerPasswordRepeat"></input-password-confirmation>
+                  <input-password v-model="form.password" id="registerPassword" />
+                  <input-password v-model="form.passwordRepeat" id="registerPasswordRepeat" />
 
                   <transition name="hint" appear>
                     <div v-if="passwordValidation.errors.length > 0 && !submitted" class="hints">
@@ -154,10 +154,9 @@
 import loginAPI from '../../apis/loginAPI'
 import InputEmail from '../../components/Inputs/InputEmail.vue'
 import InputPassword from '../../components/Inputs/InputPassword.vue'
-import InputPasswordConfirmation from '../../components/Inputs/InputPasswordConfirmation.vue'
 
 export default {
-  components: { InputPassword, InputPasswordConfirmation, InputEmail },
+  components: { InputPassword, InputEmail },
   name: 'register',
   data() {
     return {

From a4fbc73480bec23fcdd79e975eb1968907420522 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 20 Jul 2021 14:59:06 +0200
Subject: [PATCH 06/10] use paddword confirmation component

---
 .../Inputs/InputPasswordConfirmation.vue      |  8 ++-
 frontend/src/views/Pages/Register.spec.js     | 31 +--------
 frontend/src/views/Pages/Register.vue         | 69 +++----------------
 3 files changed, 19 insertions(+), 89 deletions(-)

diff --git a/frontend/src/components/Inputs/InputPasswordConfirmation.vue b/frontend/src/components/Inputs/InputPasswordConfirmation.vue
index 08efaccfd..75c2ded47 100644
--- a/frontend/src/components/Inputs/InputPasswordConfirmation.vue
+++ b/frontend/src/components/Inputs/InputPasswordConfirmation.vue
@@ -13,7 +13,7 @@
           :label="$t('form.password_new')"
           :showAllErrors="true"
           :immediate="true"
-          :name="$t('form.password_new')"
+          :name="createId($t('form.password_new'))"
           :placeholder="$t('form.password_new')"
           v-model="password"
         ></input-password>
@@ -24,6 +24,7 @@
         <input-password
           :rules="{ samePassword: value.password }"
           :label="$t('form.password_new_repeat')"
+          :name="createId($t('form.password_new_repeat'))"
           :placeholder="$t('form.password_new_repeat')"
           v-model="passwordRepeat"
         ></input-password>
@@ -51,6 +52,11 @@ export default {
       passwordRepeat: '',
     }
   },
+  methods: {
+    createId(text) {
+      return text.replace(/ +/g, '-')
+    },
+  },
   computed: {
     passwordObject() {
       return { password: this.password, passwordRepeat: this.passwordRepeat }
diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js
index 64c38f449..f428a186f 100644
--- a/frontend/src/views/Pages/Register.spec.js
+++ b/frontend/src/views/Pages/Register.spec.js
@@ -65,11 +65,11 @@ describe('Register', () => {
       })
 
       it('has password input fields', () => {
-        expect(wrapper.find('#registerPassword').exists()).toBeTruthy()
+        expect(wrapper.find('input[name="form.password_new"]').exists()).toBeTruthy()
       })
 
       it('has password repeat input fields', () => {
-        expect(wrapper.find('#registerPasswordRepeat').exists()).toBeTruthy()
+        expect(wrapper.find('input[name="form.password_new_repeat"]').exists()).toBeTruthy()
       })
 
       it('has 1 checkbox input fields', () => {
@@ -103,33 +103,8 @@ describe('Register', () => {
           'validations.messages.required',
         )
       })
-
-      /**
-       * it('shows a warning when no valid Email is entered', async () => {
-        wrapper.find('#registerEmail').setValue('no_valid@Email')
-        await flushPromises()
-        await expect(wrapper.find('#registerEmailLiveFeedback').text()).toEqual(
-          'validations.messages.email',
-        )
-      })
-      */
-
-      it('shows 4 warnings when no password is set', async () => {
-        const passwords = wrapper.findAll('input[type="password"]')
-        passwords.at(0).setValue('')
-        passwords.at(1).setValue('')
-        await flushPromises()
-        await expect(wrapper.find('div.hints').text()).toContain(
-          'site.signup.lowercase',
-          'site.signup.uppercase',
-          'site.signup.minimum',
-          'site.signup.one_number',
-        )
-      })
-
-      // TODO test different invalid password combinations
     })
 
-    // TODO test submit button
+    // To Do: Test lines 156-197,210-213
   })
 })
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index 1e5600008..a74e857aa 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -79,24 +79,8 @@
                   <input-email v-model="form.email" id="registerEmail"></input-email>
 
                   <hr />
-                  <input-password v-model="form.password" id="registerPassword" />
-                  <input-password v-model="form.passwordRepeat" id="registerPasswordRepeat" />
+                  <input-password-confirmation v-model="form.password" />
 
-                  <transition name="hint" appear>
-                    <div v-if="passwordValidation.errors.length > 0 && !submitted" class="hints">
-                      <ul>
-                        <li v-for="error in passwordValidation.errors" :key="error">
-                          <small>{{ error }}</small>
-                        </li>
-                      </ul>
-                    </div>
-                    <div class="matches" v-else-if="!samePasswords">
-                      <p>
-                        {{ $t('site.signup.dont_match') }}
-                        <i class="ni ni-active-40" color="danger"></i>
-                      </p>
-                    </div>
-                  </transition>
                   <b-row class="my-4">
                     <b-col cols="12">
                       <b-form-checkbox
@@ -122,17 +106,7 @@
                     </span>
                   </b-alert>
 
-                  <div
-                    class="text-center"
-                    v-if="
-                      passwordsFilled &&
-                      samePasswords &&
-                      passwordValidation.valid &&
-                      namesFilled &&
-                      emailFilled &&
-                      form.agree
-                    "
-                  >
+                  <div class="text-center" v-if="namesFilled && emailFilled && form.agree">
                     <div class="text-center">
                       <b-button class="ml-2" @click="resetForm()">{{ $t('form.reset') }}</b-button>
                       <b-button type="submit" variant="primary">{{ $t('signup') }}</b-button>
@@ -153,10 +127,10 @@
 <script>
 import loginAPI from '../../apis/loginAPI'
 import InputEmail from '../../components/Inputs/InputEmail.vue'
-import InputPassword from '../../components/Inputs/InputPassword.vue'
+import InputPasswordConfirmation from '../../components/Inputs/InputPasswordConfirmation.vue'
 
 export default {
-  components: { InputPassword, InputEmail },
+  components: { InputPasswordConfirmation, InputEmail },
   name: 'register',
   data() {
     return {
@@ -165,12 +139,11 @@ export default {
         lastname: '',
         email: '',
         agree: false,
-        password: '',
-        passwordRepeat: '',
+        password: {
+          password: '',
+          passwordRepeat: '',
+        },
       },
-
-      passwordVisible: false,
-      passwordVisibleRepeat: false,
       submitted: false,
       showError: false,
       messageError: '',
@@ -186,18 +159,12 @@ export default {
         lastname: '',
         email: '',
         password: '',
-        passwordRepeat: '',
+        agree: false,
       }
       this.$nextTick(() => {
         this.$refs.observer.reset()
       })
     },
-    togglePasswordVisibility() {
-      this.passwordVisible = !this.passwordVisible
-    },
-    togglePasswordRepeatVisibility() {
-      this.passwordVisibleRepeat = !this.passwordVisibleRepeat
-    },
     async onSubmit() {
       const result = await loginAPI.create(
         this.form.email,
@@ -231,12 +198,6 @@ export default {
     },
   },
   computed: {
-    samePasswords() {
-      return this.form.password === this.form.passwordRepeat
-    },
-    passwordsFilled() {
-      return this.form.password !== '' && this.form.passwordRepeat !== ''
-    },
     namesFilled() {
       return (
         this.form.firstname !== '' &&
@@ -256,18 +217,6 @@ export default {
         { message: this.$t('site.signup.one_number'), regex: /[0-9]+/ },
       ]
     },
-    passwordValidation() {
-      const errors = []
-      for (const condition of this.rules) {
-        if (!condition.regex.test(this.form.password)) {
-          errors.push(condition.message)
-        }
-      }
-      if (errors.length === 0) {
-        return { valid: true, errors }
-      }
-      return { valid: false, errors }
-    },
   },
 }
 </script>

From 00fc4056b1dabf25f318e49c3b8a3fc972ec8da6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 21 Jul 2021 18:07:05 +0200
Subject: [PATCH 07/10] test step 1

---
 frontend/src/views/Pages/Register.spec.js | 1 +
 frontend/src/views/Pages/Register.vue     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js
index 85f3ca38f..8b4f99594 100644
--- a/frontend/src/views/Pages/Register.spec.js
+++ b/frontend/src/views/Pages/Register.spec.js
@@ -80,6 +80,7 @@ describe('Register', () => {
         expect(wrapper.find('button[type="submit"]').exists()).toBe(false)
       })
 
+
       it('shows a warning when no valid Email is entered', async () => {
         wrapper.find('#registerEmail').setValue('no_valid@Email')
         await flushPromises()
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index 6f3e3af12..27448c8b3 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -79,8 +79,8 @@
                   <input-email v-model="form.email" id="registerEmail"></input-email>
 
                   <hr />
-                  <input-password v-model="form.password" id="registerPassword"></input-password>
-                  <input-password-confirmation v-model="form.passwordRepeat" id="registerPasswordRepeat"></input-password-confirmation>
+                  <!--<input-password v-model="form.password" id="registerPassword"></input-password>-->
+                  <input-password-confirmation v-model="form.passwordRepeat" ></input-password-confirmation>
 
                   <transition name="hint" appear>
                     <div v-if="passwordValidation.errors.length > 0 && !submitted" class="hints">

From e61ca1ffa41d0bf0afb358aa3c18fe82d45217ec Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Jul 2021 12:47:21 +0200
Subject: [PATCH 08/10] pre merge moritz

---
 .../Inputs/InputPasswordConfirmation.vue      | 16 ++--
 frontend/src/views/Pages/Register.spec.js     | 11 ++-
 frontend/src/views/Pages/Register.vue         | 82 +++++--------------
 frontend/src/views/Pages/ResetPassword.vue    |  3 +-
 .../UserProfile/UserCard_FormUserPasswort.vue |  3 +-
 5 files changed, 42 insertions(+), 73 deletions(-)

diff --git a/frontend/src/components/Inputs/InputPasswordConfirmation.vue b/frontend/src/components/Inputs/InputPasswordConfirmation.vue
index 08efaccfd..02b1796ef 100644
--- a/frontend/src/components/Inputs/InputPasswordConfirmation.vue
+++ b/frontend/src/components/Inputs/InputPasswordConfirmation.vue
@@ -3,6 +3,7 @@
     <b-row class="mb-2">
       <b-col>
         <input-password
+           id="inputPassword"
           :rules="{
             required: true,
             containsLowercaseCharacter: true,
@@ -10,11 +11,11 @@
             containsNumericCharacter: true,
             atLeastEightCharactera: true,
           }"
-          :label="$t('form.password_new')"
+          :label="register ? $t('form.password') : $t('form.password_new')"
           :showAllErrors="true"
           :immediate="true"
-          :name="$t('form.password_new')"
-          :placeholder="$t('form.password_new')"
+          :name="register ? $t('form.password') : $t('form.password_new')"
+          :placeholder="register ? $t('form.password') : $t('form.password_new')"
           v-model="password"
         ></input-password>
       </b-col>
@@ -22,9 +23,10 @@
     <b-row class="mb-2">
       <b-col>
         <input-password
+          id="inputPasswordRepeat"
           :rules="{ samePassword: value.password }"
-          :label="$t('form.password_new_repeat')"
-          :placeholder="$t('form.password_new_repeat')"
+          :label="register ? $t('form.passwordRepeat') : $t('form.password_new_repeat')"
+          :placeholder="register ? $t('form.passwordRepeat') : $t('form.password_new_repeat')"
           v-model="passwordRepeat"
         ></input-password>
       </b-col>
@@ -44,6 +46,10 @@ export default {
       type: Object,
       required: true,
     },
+    register: {
+      type: Boolean,
+      required: false,
+    }
   },
   data() {
     return {
diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js
index 8b4f99594..3d4c93897 100644
--- a/frontend/src/views/Pages/Register.spec.js
+++ b/frontend/src/views/Pages/Register.spec.js
@@ -61,15 +61,15 @@ describe('Register', () => {
       })
 
       it('has email input fields', () => {
-        expect(wrapper.find('#registerEmail').exists()).toBeTruthy()
+        expect(wrapper.find('#Email-input-field').exists()).toBeTruthy()
       })
 
       it('has password input fields', () => {
-        expect(wrapper.find('#registerPassword').exists()).toBeTruthy()
+        expect(wrapper.find('#inputPassword').exists()).toBeTruthy()
       })
 
       it('has password repeat input fields', () => {
-        expect(wrapper.find('#registerPasswordRepeat').exists()).toBeTruthy()
+        expect(wrapper.find('#inputPasswordRepeat').exists()).toBeTruthy()
       })
 
       it('has 1 checkbox input fields', () => {
@@ -80,11 +80,10 @@ describe('Register', () => {
         expect(wrapper.find('button[type="submit"]').exists()).toBe(false)
       })
 
-
       it('shows a warning when no valid Email is entered', async () => {
-        wrapper.find('#registerEmail').setValue('no_valid@Email')
+        wrapper.find('#Email-input-field').setValue('no_valid@Email')
         await flushPromises()
-        await expect(wrapper.find('#registerEmailLiveFeedback').text()).toEqual(
+        await expect(wrapper.find('#Email-input-field b-form-invalid-feedback').text()).toEqual(
           'validations.messages.email',
         )
       })
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index 27448c8b3..c9a0d8772 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -76,27 +76,14 @@
                     </b-form-group>
                   </validation-provider>
 
-                  <input-email v-model="form.email" id="registerEmail"></input-email>
+                  <input-email v-model="form.email" ></input-email>
 
                   <hr />
-                  <!--<input-password v-model="form.password" id="registerPassword"></input-password>-->
-                  <input-password-confirmation v-model="form.passwordRepeat" ></input-password-confirmation>
+                  <input-password-confirmation                    
+                    v-model="form.password"
+                    :register="register"
+                  ></input-password-confirmation>
 
-                  <transition name="hint" appear>
-                    <div v-if="passwordValidation.errors.length > 0 && !submitted" class="hints">
-                      <ul>
-                        <li v-for="error in passwordValidation.errors" :key="error">
-                          <small>{{ error }}</small>
-                        </li>
-                      </ul>
-                    </div>
-                    <div class="matches" v-else-if="!samePasswords">
-                      <p>
-                        {{ $t('site.signup.dont_match') }}
-                        <i class="ni ni-active-40" color="danger"></i>
-                      </p>
-                    </div>
-                  </transition>
                   <b-row class="my-4">
                     <b-col cols="12">
                       <b-form-checkbox
@@ -127,7 +114,6 @@
                     v-if="
                       passwordsFilled &&
                       samePasswords &&
-                      passwordValidation.valid &&
                       namesFilled &&
                       emailFilled &&
                       form.agree
@@ -153,11 +139,10 @@
 <script>
 import loginAPI from '../../apis/loginAPI'
 import InputEmail from '../../components/Inputs/InputEmail.vue'
-import InputPassword from '../../components/Inputs/InputPassword.vue'
 import InputPasswordConfirmation from '../../components/Inputs/InputPasswordConfirmation.vue'
 
 export default {
-  components: { InputPassword, InputPasswordConfirmation, InputEmail },
+  components: { InputPasswordConfirmation, InputEmail },
   name: 'register',
   data() {
     return {
@@ -166,15 +151,15 @@ export default {
         lastname: '',
         email: '',
         agree: false,
-        password: '',
-        passwordRepeat: '',
+        password: {
+          password: '',
+          passwordRepeat: '',
+        },
       },
-
-      passwordVisible: false,
-      passwordVisibleRepeat: false,
       submitted: false,
       showError: false,
       messageError: '',
+      register: true,
     }
   },
   methods: {
@@ -186,25 +171,22 @@ export default {
         firstname: '',
         lastname: '',
         email: '',
-        password: '',
-        passwordRepeat: '',
+        password: {
+          password: '',
+          passwordRepeat: '',
+        },
       }
       this.$nextTick(() => {
         this.$refs.observer.reset()
       })
     },
-    togglePasswordVisibility() {
-      this.passwordVisible = !this.passwordVisible
-    },
-    togglePasswordRepeatVisibility() {
-      this.passwordVisibleRepeat = !this.passwordVisibleRepeat
-    },
+   
     async onSubmit() {
       const result = await loginAPI.create(
         this.form.email,
         this.form.firstname,
         this.form.lastname,
-        this.form.password,
+        this.form.password.password,
       )
       if (result.success) {
         this.$store.dispatch('login', {
@@ -214,8 +196,8 @@ export default {
         this.form.email = ''
         this.form.firstname = ''
         this.form.lastname = ''
-        this.password = ''
-        this.passwordVisibleRepeat = ''
+        this.form.password.password = ''
+ 
         this.$router.push('/thx/register')
       } else {
         this.showError = true
@@ -228,15 +210,15 @@ export default {
       this.form.email = ''
       this.form.firstname = ''
       this.form.lastname = ''
-      this.form.password = ''
+      this.form.password.password = ''
     },
   },
   computed: {
     samePasswords() {
-      return this.form.password === this.form.passwordRepeat
+      return this.form.password.password === this.form.password.passwordRepeat
     },
     passwordsFilled() {
-      return this.form.password !== '' && this.form.passwordRepeat !== ''
+      return this.form.password.password !== '' && this.form.password.passwordRepeat !== ''
     },
     namesFilled() {
       return (
@@ -249,26 +231,6 @@ export default {
     emailFilled() {
       return this.form.email !== ''
     },
-    rules() {
-      return [
-        { message: this.$t('site.signup.lowercase'), regex: /[a-z]+/ },
-        { message: this.$t('site.signup.uppercase'), regex: /[A-Z]+/ },
-        { message: this.$t('site.signup.minimum'), regex: /.{8,}/ },
-        { message: this.$t('site.signup.one_number'), regex: /[0-9]+/ },
-      ]
-    },
-    passwordValidation() {
-      const errors = []
-      for (const condition of this.rules) {
-        if (!condition.regex.test(this.form.password)) {
-          errors.push(condition.message)
-        }
-      }
-      if (errors.length === 0) {
-        return { valid: true, errors }
-      }
-      return { valid: false, errors }
-    },
   },
 }
 </script>
diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue
index 66a3dcfe5..8d1fe05cd 100644
--- a/frontend/src/views/Pages/ResetPassword.vue
+++ b/frontend/src/views/Pages/ResetPassword.vue
@@ -26,7 +26,7 @@
             <b-card-body class="p-4">
               <validation-observer ref="observer" v-slot="{ handleSubmit }">
                 <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
-                  <input-password-confirmation v-model="form" />
+                  <input-password-confirmation v-model="form" :register="register"/>
                   <div class="text-center">
                     <b-button type="submit" variant="primary" class="mt-4">
                       {{ $t('reset') }}
@@ -65,6 +65,7 @@ export default {
       sessionId: null,
       email: null,
       pending: true,
+      register: false,
     }
   },
   methods: {
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
index 7921f4037..59ce13c52 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
@@ -28,7 +28,7 @@
                 ></input-password>
               </b-col>
             </b-row>
-            <input-password-confirmation v-model="form.newPassword" />
+            <input-password-confirmation v-model="form.newPassword" :register="register"/>
             <b-row class="text-right">
               <b-col>
                 <div class="text-right">
@@ -66,6 +66,7 @@ export default {
           passwordRepeat: '',
         },
       },
+      register: false,
     }
   },
   methods: {

From 212b56766257539167f76315db4c1b3bee7a48b1 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Jul 2021 13:28:34 +0200
Subject: [PATCH 09/10] fix lint, fix test, fix merge

---
 .../Inputs/InputPasswordConfirmation.vue         |  7 ++++---
 frontend/src/views/Pages/Register.spec.js        |  4 ++--
 frontend/src/views/Pages/Register.vue            | 16 +++++++++++-----
 frontend/src/views/Pages/ResetPassword.vue       |  2 +-
 .../UserProfile/UserCard_FormUserPasswort.vue    |  2 +-
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/Inputs/InputPasswordConfirmation.vue b/frontend/src/components/Inputs/InputPasswordConfirmation.vue
index f47f809c4..19d4ab02e 100644
--- a/frontend/src/components/Inputs/InputPasswordConfirmation.vue
+++ b/frontend/src/components/Inputs/InputPasswordConfirmation.vue
@@ -12,9 +12,9 @@
           }"
           :label="register ? $t('form.password') : $t('form.password_new')"
           :showAllErrors="true"
-          :immediate="true" 
+          :immediate="true"
           :name="createId(register ? $t('form.password') : $t('form.password_new'))"
-          :placeholder="register ? $t('form.password') : $t('form.password_new')" 
+          :placeholder="register ? $t('form.password') : $t('form.password_new')"
           v-model="password"
         ></input-password>
       </b-col>
@@ -22,6 +22,7 @@
     <b-row class="mb-2">
       <b-col>
         <input-password
+          :rules="{ samePassword: value.password }"
           :label="register ? $t('form.passwordRepeat') : $t('form.password_new_repeat')"
           :name="createId(register ? $t('form.passwordRepeat') : $t('form.password_new_repeat'))"
           :placeholder="register ? $t('form.passwordRepeat') : $t('form.password_new_repeat')"
@@ -47,7 +48,7 @@ export default {
     register: {
       type: Boolean,
       required: false,
-    }
+    },
   },
   data() {
     return {
diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js
index 581d132c1..b200eb397 100644
--- a/frontend/src/views/Pages/Register.spec.js
+++ b/frontend/src/views/Pages/Register.spec.js
@@ -65,11 +65,11 @@ describe('Register', () => {
       })
 
       it('has password input fields', () => {
-        expect(wrapper.find('input[name="form.password_new"]').exists()).toBeTruthy()
+        expect(wrapper.find('input[name="form.password"]').exists()).toBeTruthy()
       })
 
       it('has password repeat input fields', () => {
-        expect(wrapper.find('input[name="form.password_new_repeat"]').exists()).toBeTruthy()
+        expect(wrapper.find('input[name="form.passwordRepeat"]').exists()).toBeTruthy()
       })
 
       it('has 1 checkbox input fields', () => {
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index 170365bdb..b0b2e4cd6 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -76,10 +76,10 @@
                     </b-form-group>
                   </validation-provider>
 
-                  <input-email v-model="form.email" ></input-email>
+                  <input-email v-model="form.email"></input-email>
 
                   <hr />
-                  <input-password-confirmation                    
+                  <input-password-confirmation
                     v-model="form.password"
                     :register="register"
                   ></input-password-confirmation>
@@ -180,15 +180,21 @@ export default {
         this.form.password.password,
       )
       if (result.success) {
-        this.$store.dispatch('login', {
+        /* this.$store.dispatch('login', {
           sessionId: result.result.data.session_id,
-          email: this.form.email,
+          user: {
+            email: this.form.email,
+            firstName: this.form.firstname,
+            lastName: this.form.lastname
+          }
+
         })
+        */
         this.form.email = ''
         this.form.firstname = ''
         this.form.lastname = ''
         this.form.password.password = ''
- 
+
         this.$router.push('/thx/register')
       } else {
         this.showError = true
diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue
index 8d1fe05cd..be565333a 100644
--- a/frontend/src/views/Pages/ResetPassword.vue
+++ b/frontend/src/views/Pages/ResetPassword.vue
@@ -26,7 +26,7 @@
             <b-card-body class="p-4">
               <validation-observer ref="observer" v-slot="{ handleSubmit }">
                 <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
-                  <input-password-confirmation v-model="form" :register="register"/>
+                  <input-password-confirmation v-model="form" :register="register" />
                   <div class="text-center">
                     <b-button type="submit" variant="primary" class="mt-4">
                       {{ $t('reset') }}
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
index 59ce13c52..74dc87ddb 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
@@ -28,7 +28,7 @@
                 ></input-password>
               </b-col>
             </b-row>
-            <input-password-confirmation v-model="form.newPassword" :register="register"/>
+            <input-password-confirmation v-model="form.newPassword" :register="register" />
             <b-row class="text-right">
               <b-col>
                 <div class="text-right">

From dcf3b78b953c74b51a944ef00449b71d58583541 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 4 Aug 2021 17:22:28 +0200
Subject: [PATCH 10/10] remove unused class/css, check that email is present
 before rendering qrcode

---
 frontend/src/components/Inputs/InputEmail.vue     | 10 ----------
 frontend/src/components/SidebarPlugin/SideBar.vue |  6 +++++-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/Inputs/InputEmail.vue b/frontend/src/components/Inputs/InputEmail.vue
index b83d25fdb..2aa153486 100644
--- a/frontend/src/components/Inputs/InputEmail.vue
+++ b/frontend/src/components/Inputs/InputEmail.vue
@@ -15,7 +15,6 @@
         type="email"
         :state="validated ? valid : false"
         trim
-        class="email-form-input"
       ></b-form-input>
       <b-form-invalid-feedback v-bind="ariaMsg">
         {{ errors[0] }}
@@ -60,12 +59,3 @@ export default {
   },
 }
 </script>
-<style>
-.email-form-input {
-  border-right-style: solid !important;
-  border-right-width: 1px !important;
-  padding-right: 12px !important;
-  border-top-right-radius: 6px !important;
-  border-bottom-right-radius: 6px !important;
-}
-</style>
diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 495dec3d2..c3f991297 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -16,7 +16,11 @@
         <ul class="nav align-items-center d-md-none">
           <div class="media align-items-center">
             <span class="avatar avatar-sm">
-              <vue-qrcode :value="$store.state.email" type="image/png"></vue-qrcode>
+              <vue-qrcode
+                v-if="$store.state.email"
+                :value="$store.state.email"
+                type="image/png"
+              ></vue-qrcode>
             </span>
           </div>
         </ul>