fix validate in more forms

silinternational · Jan 29, 2025 · 7192930 · 7192930
1 parent fe8516f
commit 7192930
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/src/2sv/smartphone/VerifyQrCode.vue b/src/2sv/smartphone/VerifyQrCode.vue
@@ -57,7 +57,9 @@ export default {
   }),
   methods: {
     async verify() {
-      if (this.$refs.form.validate()) {
+      const { valid, errors } = await this.$refs.form.validate()
+
+      if (valid) {
         try {
           await verify(this.$route.query.id, this.code.trim())
 
@@ -67,6 +69,8 @@ export default {
             this.errors.push(this.$t('2sv.smartphone.verifyQrCode.hint'))
           }
         }
+      } else {
+        throw Error(errors[0].errorMessages)
       }
     },
     blur(event) {

diff --git a/src/password/Confirm.vue b/src/password/Confirm.vue
@@ -92,14 +92,17 @@ export default {
   },
   methods: {
     async confirm() {
-      if (this.$refs.form.validate()) {
+      const { valid, errors } = await this.$refs.form.validate()
+      if (valid) {
         await this.$API.put('password', {
           password: this.password,
         })
 
         this.$refs.wizard.completed()
 
         this.$router.push('/password/saved')
+      } else {
+        throw Error(errors[0].errorMessages)
       }
     },
     blur(event) {

diff --git a/src/password/Create.vue b/src/password/Create.vue
@@ -155,7 +155,9 @@ export default {
       this.wizardKey += 1
     },
     async save() {
-      if (this.$refs.form.validate()) {
+      const { valid, errors } = await this.$refs.form.validate()
+
+      if (valid) {
         try {
           await this.$API.put('password/assess', {
             password: this.password,
@@ -174,6 +176,8 @@ export default {
             })
           }
         }
+      } else {
+        throw Error(errors[0].errorMessages)
       }
     },
     blur(event) {

diff --git a/src/password/Forgot.vue b/src/password/Forgot.vue
@@ -62,7 +62,9 @@ export default {
       this.recaptchaResponse = ''
     },
     async send() {
-      if (this.$refs.form.validate()) {
+      const { valid, errors } = await this.$refs.form.validate()
+
+      if (valid) {
         try {
           const reset = await this.$API.post('reset', {
             username: this.uname,
@@ -74,6 +76,8 @@ export default {
           grecaptcha.reset()
           throw error
         }
+      } else {
+        throw Error(errors[0].errorMessages)
       }
     },
   },