From 555b783d745db0be54927442569a6dbdd7cd3d5b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 30 Jun 2021 20:45:06 +0200
Subject: [PATCH] refactor: Forgot Password Form

---
 .../src/views/Pages/ForgotPassword.spec.js    |  5 ++--
 frontend/src/views/Pages/ForgotPassword.vue   | 29 ++++---------------
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/frontend/src/views/Pages/ForgotPassword.spec.js b/frontend/src/views/Pages/ForgotPassword.spec.js
index 9e33c785e..4e6c3b834 100644
--- a/frontend/src/views/Pages/ForgotPassword.spec.js
+++ b/frontend/src/views/Pages/ForgotPassword.spec.js
@@ -83,7 +83,7 @@ describe('ForgotPassword', () => {
         })
 
         it('displays an error', () => {
-          expect(form.find('#reset-pwd--live-feedback').text()).toEqual(
+          expect(form.find('div.invalid-feedback').text()).toEqual(
             'The Email field must be a valid email',
           )
         })
@@ -96,8 +96,7 @@ describe('ForgotPassword', () => {
       describe('valid Email', () => {
         beforeEach(async () => {
           await form.find('input').setValue('user@example.org')
-          form.trigger('submit')
-          await wrapper.vm.$nextTick()
+          await form.trigger('submit')
           await flushPromises()
         })
 
diff --git a/frontend/src/views/Pages/ForgotPassword.vue b/frontend/src/views/Pages/ForgotPassword.vue
index e407f3590..a16ea2446 100644
--- a/frontend/src/views/Pages/ForgotPassword.vue
+++ b/frontend/src/views/Pages/ForgotPassword.vue
@@ -19,27 +19,7 @@
             <b-card-body class="p-4">
               <validation-observer ref="observer" v-slot="{ handleSubmit }">
                 <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
-                  <validation-provider
-                    name="Email"
-                    :rules="{ required: true, email: true }"
-                    v-slot="validationContext"
-                  >
-                    <b-form-group class="mb-3" label="Email" label-for="input-reset-pwd">
-                      <b-form-input
-                        id="input-reset-pwd"
-                        name="input-reset-pwd"
-                        v-model="form.email"
-                        placeholder="Email"
-                        :state="getValidationState(validationContext)"
-                        aria-describedby="reset-pwd--live-feedback"
-                      ></b-form-input>
-
-                      <b-form-invalid-feedback id="reset-pwd--live-feedback">
-                        {{ validationContext.errors[0] }}
-                      </b-form-invalid-feedback>
-                    </b-form-group>
-                  </validation-provider>
-
+                  <input-email v-model="form.email"></input-email>
                   <div class="text-center">
                     <b-button type="submit" variant="primary">
                       {{ $t('site.password.reset_now') }}
@@ -59,9 +39,13 @@
 </template>
 <script>
 import loginAPI from '../../apis/loginAPI.js'
+import InputEmail from '../../components/Inputs/InputEmail'
 
 export default {
   name: 'password',
+  components: {
+    InputEmail,
+  },
   data() {
     return {
       disable: 'disabled',
@@ -71,9 +55,6 @@ export default {
     }
   },
   methods: {
-    getValidationState({ dirty, validated, valid = null }) {
-      return dirty || validated ? valid : null
-    },
     async onSubmit() {
       await loginAPI.sendEmail(this.form.email)
       // always give success to avoid email spying