fix(webapp): correctly show captcha errors, fixes #931

desec-io · Dec 18, 2024 · 13cd1c4 · 13cd1c4
1 parent 8d0fc1a
commit 13cd1c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/www/webapp/src/components/Field/GenericCaptcha.vue b/www/webapp/src/components/Field/GenericCaptcha.vue
@@ -122,8 +122,8 @@ export default {
       this.working = false;
       this.emitChange();
     },
-    addError(values) {
-      this.errors.push(values);
+    addError(...values) {
+      this.errors.push(...values);
     },
     captchaID() {
       return this.captcha.id;

diff --git a/www/webapp/src/views/ConfirmationPage.vue b/www/webapp/src/views/ConfirmationPage.vue
@@ -111,7 +111,13 @@
           let errors = await digestError(ex);
           this.post_response = ex.response
           for (const c in errors) {
-            this.errors.push(...errors[c])
+            if (c === 'captcha' && this.$refs.actionHandler.$refs.captchaField !== undefined) {
+              this.$refs.actionHandler.$refs.captchaField.addError(...(errors[c]['id'] ?? []));
+              this.$refs.actionHandler.$refs.captchaField.addError(...(errors[c]['non_field_errors'] ?? []));
+              this.$refs.actionHandler.$refs.captchaField.addError(...(errors[c]['solution'] ?? []));
+            } else {
+              this.errors.push(...errors[c]);
+            }
           }
         }
         this.working = false