From 65cc4c83554b900b0a24a82727f691141f88fbcd Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Wed, 20 Jul 2022 08:58:46 +0200
Subject: [PATCH] fix(gui-v2): prevent having to submit twice

---
 packages/nc-gui-v2/pages/forgot-password.vue | 7 ++-----
 packages/nc-gui-v2/pages/signin.vue          | 8 ++++----
 packages/nc-gui-v2/pages/signup.vue          | 7 +++----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/packages/nc-gui-v2/pages/forgot-password.vue b/packages/nc-gui-v2/pages/forgot-password.vue
index 57bb46b7f2..3a8ecbec32 100644
--- a/packages/nc-gui-v2/pages/forgot-password.vue
+++ b/packages/nc-gui-v2/pages/forgot-password.vue
@@ -20,8 +20,6 @@ definePageMeta({
 let error = $ref<string | null>(null)
 let success = $ref(false)
 
-const valid = $ref()
-
 const formValidator = ref()
 
 const form = reactive({
@@ -46,6 +44,7 @@ const formRules = {
 }
 
 const resetPassword = async () => {
+  const valid = formValidator.value.validate()
   if (!valid) return
 
   error = null
@@ -72,9 +71,7 @@ const resetError = () => {
       layout="vertical"
       :model="form"
       class="forgot-password h-full min-h-[600px] flex justify-center items-center"
-      @finish="valid = true"
-      @finish-failed="valid = false"
-      @submit.prevent="resetPassword"
+      @finish="resetPassword"
     >
       <div class="h-full w-full flex flex-col flex-wrap justify-center items-center">
         <div
diff --git a/packages/nc-gui-v2/pages/signin.vue b/packages/nc-gui-v2/pages/signin.vue
index d999dbce60..80215ed898 100644
--- a/packages/nc-gui-v2/pages/signin.vue
+++ b/packages/nc-gui-v2/pages/signin.vue
@@ -16,8 +16,9 @@ definePageMeta({
   title: 'title.headLogin',
 })
 
+const formValidator = ref()
+
 let error = $ref<string | null>(null)
-const valid = $ref(false)
 
 const form = reactive({
   email: '',
@@ -46,6 +47,7 @@ const formRules = {
 }
 
 const signIn = async () => {
+  const valid = formValidator.value.validate()
   if (!valid) return
 
   error = null
@@ -73,9 +75,7 @@ const resetError = () => {
       :model="form"
       layout="vertical"
       class="signin h-[calc(100%_+_90px)] min-h-[600px] flex justify-center items-center"
-      @finish="valid = true"
-      @finish-failed="valid = false"
-      @submit.prevent="signIn"
+      @finish="signIn"
     >
       <div class="h-full w-full flex flex-col flex-wrap justify-center items-center">
         <div
diff --git a/packages/nc-gui-v2/pages/signup.vue b/packages/nc-gui-v2/pages/signup.vue
index f80c72ade9..95e44aad1c 100644
--- a/packages/nc-gui-v2/pages/signup.vue
+++ b/packages/nc-gui-v2/pages/signup.vue
@@ -14,7 +14,7 @@ definePageMeta({
   requiresAuth: false,
 })
 
-const valid = $ref()
+const formValidator = ref()
 let error = $ref<string | null>(null)
 
 const form = reactive({
@@ -60,6 +60,7 @@ const formRules = {
 }
 
 const signUp = async () => {
+  const valid = formValidator.value.validate()
   if (!valid) return
 
   error = null
@@ -86,9 +87,7 @@ const resetError = () => {
       :model="form"
       layout="vertical"
       class="signup h-[calc(100%_+_90px)] min-h-[600px] flex justify-center items-center"
-      @finish="valid = true"
-      @finish-failed="valid = false"
-      @submit.prevent="signUp"
+      @finish="signUp"
     >
       <div class="h-full w-full flex flex-col flex-wrap justify-center items-center">
         <div