From 1a19f9ef219b7a813f459a53962b1706080bb14f Mon Sep 17 00:00:00 2001
From: Axolotle <nchesnais@mailoo.org>
Date: Fri, 30 Oct 2020 13:58:44 +0100
Subject: [PATCH] update DomainAdd views with validation

---
 app/src/components/AdressInputSelect.vue      |  11 +-
 .../components/reusableForms/DomainForm.vue   | 210 +++++++-----------
 .../helpers/validators/customValidators.js    |  13 +-
 app/src/helpers/yunohostArguments.js          |   2 +-
 app/src/store/data.js                         |   3 +
 app/src/views/PostInstall.vue                 |   6 +-
 app/src/views/domain/DomainAdd.vue            |  19 +-
 7 files changed, 112 insertions(+), 152 deletions(-)

diff --git a/app/src/components/AdressInputSelect.vue b/app/src/components/AdressInputSelect.vue
index 3965085e..815a028b 100644
--- a/app/src/components/AdressInputSelect.vue
+++ b/app/src/components/AdressInputSelect.vue
@@ -19,12 +19,8 @@
       />
     </b-input-group-append>
 
-    <span class="sr-only" :id="id + 'local-part-desc'">
-      {{ localPartDesc || $t('user_mail_local_part_description') }}
-    </span>
-    <span class="sr-only" :id="id + 'domain-desc'">
-      {{ domainDesc || $t('user_mail_domain_description') }}
-    </span>
+    <span class="sr-only" :id="id + 'local-part-desc'" v-t="'address.local_part_description.' + type" />
+    <span class="sr-only" :id="id + 'domain-desc'" v-t="'address.domain_description.' + type" />
   </b-input-group>
 </template>
 
@@ -41,8 +37,7 @@ export default {
     placeholder: { type: String, default: null },
     id: { type: String, default: null },
     state: { type: null, default: null },
-    localPartDesc: { type: String, default: null },
-    domainDesc: { type: String, default: null }
+    type: { type: String, default: 'email' }
   },
 
   computed: {
diff --git a/app/src/components/reusableForms/DomainForm.vue b/app/src/components/reusableForms/DomainForm.vue
index bf7518eb..22ddec94 100644
--- a/app/src/components/reusableForms/DomainForm.vue
+++ b/app/src/components/reusableForms/DomainForm.vue
@@ -1,137 +1,109 @@
 <template>
-  <b-card header-tag="h2" class="basic-form">
-    <template v-slot:header>
-      <h2><icon iname="globe" /> {{ title }}</h2>
-    </template>
+  <card-form
+    :title="title" icon="globe" :submit-text="submitText"
+    :validation="$v" :server-error="serverError"
+    @submit.prevent="onSubmit"
+  >
+    <slot name="disclaimer" slot="disclaimer" />
 
-    <b-form id="domain-form" @submit.prevent="onSubmit">
-      <slot name="message" />
+    <b-form-radio
+      v-model="selected" name="domain-type" value="domain"
+      :class="domainIsVisible ? null : 'collapsed'"
+      :aria-expanded="domainIsVisible ? 'true' : 'false'"
+      aria-controls="collapse-domain"
+    >
+      {{ $t('domain_add_panel_with_domain') }}
+    </b-form-radio>
 
-      <!-- DOMAIN -->
-      <b-form-radio
-        v-model="selected" name="domain-type" value="domain"
-        :class="domainIsVisible ? null : 'collapsed'"
-        :aria-expanded="domainIsVisible ? 'true' : 'false'"
-        aria-controls="collapse-domain"
-      >
-        {{ $t('domain_add_panel_with_domain') }}
-      </b-form-radio>
+    <b-collapse id="collapse-domain" :visible.sync="domainIsVisible">
+      <small v-html="$t('domain_add_dns_doc')" />
 
-      <b-collapse id="collapse-domain" :visible.sync="domainIsVisible">
-        <small v-html="$t('domain_add_dns_doc')" />
+      <form-field
+        v-bind="fields.domain" v-model="form.domain"
+        :validation="$v.form.domain" class="mt-3"
+      />
+    </b-collapse>
 
-        <b-form-group
-          label-cols-md="2" class="mt-2"
-          :label="$t('domain_name')" label-for="input-domain" label-tag="strong"
-        >
-          <b-input
-            id="input-domain" :placeholder="$t('placeholder.domain')"
-            aria-describedby="domain-feedback"
-            v-model="form.domain" :state="isValid.domain"
-            @input="validateDomainName($event)"
-          />
+    <b-form-radio
+      v-model="selected" name="domain-type" value="dynDomain"
+      :disabled="dynDnsForbiden"
+      :class="dynDomainIsVisible ? null : 'collapsed'"
+      :aria-expanded="dynDomainIsVisible ? 'true' : 'false'"
+      aria-controls="collapse-dynDomain"
+    >
+      {{ $t('domain_add_panel_without_domain') }}
+    </b-form-radio>
 
-          <b-form-invalid-feedback id="domain-feedback" :state="isValid.domain">
-            {{ this.error.domain }}
-          </b-form-invalid-feedback>
-        </b-form-group>
-      </b-collapse>
+    <b-collapse id="collapse-dynDomain" :visible.sync="dynDomainIsVisible">
+      <small>{{ $t('domain_add_dyndns_doc') }}</small>
 
-      <!-- DYN DOMAIN -->
-      <b-form-radio
-        v-model="selected" name="domain-type" value="dynDomain"
-        :disabled="dynDnsForbiden"
-        :class="dynDomainIsVisible ? null : 'collapsed'"
-        :aria-expanded="dynDomainIsVisible ? 'true' : 'false'"
-        aria-controls="collapse-dynDomain"
-      >
-        {{ $t('domain_add_panel_without_domain') }}
-      </b-form-radio>
-
-      <b-collapse id="collapse-dynDomain" :visible.sync="dynDomainIsVisible">
-        <small>{{ $t('domain_add_dyndns_doc') }}</small>
-
-        <b-form-group
-          label-cols-md="2" class="mt-2"
-          :label="$t('domain_name')" label-for="input-dynDomain"
-        >
-          <adress-input-select
-            id="input-dynDomain" feedback-id="dynDomain-feedback"
-            v-model="form.dynDomain" :options="dynDomains"
-            :state="isValid.dynDomain" :placeholder="$t('myserver')"
-            separator="."
-            @input="validateDomainName($event)"
-          />
-
-          <b-form-invalid-feedback id="dynDomain-feedback" :state="isValid.dynDomain">
-            {{ this.error.dynDomain }}
-          </b-form-invalid-feedback>
-        </b-form-group>
-      </b-collapse>
-    </b-form>
-
-    <template v-slot:footer>
-      <b-button
-        type="submit" form="domain-form" variant="success"
-        :disabled="!everythingValid"
-      >
-        {{ submitText ? submitText : $t('add') }}
-      </b-button>
-    </template>
-  </b-card>
+      <form-field v-bind="fields.dynDomain" :validation="$v.form.dynDomain" class="mt-3">
+        <template #default="{ self }">
+          <adress-input-select v-bind="self" v-model="form.dynDomain" />
+        </template>
+      </form-field>
+    </b-collapse>
+  </card-form>
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
+import { validationMixin } from 'vuelidate'
+
 import AdressInputSelect from '@/components/AdressInputSelect'
 
+import { formatFormDataValue } from '@/helpers/yunohostArguments'
+import { required, domain, domainLocalPart } from '@/helpers/validators'
+
+
 export default {
   name: 'DomainForm',
 
   props: {
-    title: {
-      type: String,
-      required: true
-    },
-    submitText: {
-      type: String,
-      default: null
-    },
-    isValid: {
-      type: Object,
-      default: () => ({
-        domainname: undefined,
-        dynDomainname: undefined
-      })
-    },
-    error: {
-      type: Object,
-      default: () => ({
-        domain: '',
-        dynDomain: ''
-      })
-    }
+    title: { type: String, required: true },
+    submitText: { type: String, default: null },
+    serverError: { type: String, default: '' }
   },
 
   data () {
     return {
       selected: '',
-      dynDomains: ['nohost.me', 'noho.st', 'ynh.fr'],
+
       form: {
         domain: '',
-        dynDomain: ['', 'nohost.me']
+        dynDomain: { localPart: '', separator: '.', domain: 'nohost.me' }
+      },
+
+      fields: {
+        domain: {
+          label: this.$i18n.t('domain_name'),
+          props: {
+            id: 'domain',
+            placeholder: this.$i18n.t('placeholder.domain')
+          }
+        },
+
+        dynDomain: {
+          label: this.$i18n.t('domain_name'),
+          props: {
+            id: 'dyn-domain',
+            placeholder: this.$i18n.t('myserver'),
+            type: 'domain',
+            choices: ['nohost.me', 'noho.st', 'ynh.fr']
+          }
+        }
       }
     }
   },
 
   computed: {
-    domains () {
-      return this.$store.state.data.domains
-    },
+    ...mapGetters(['domains']),
 
     dynDnsForbiden () {
       if (!this.domains) return true
+      const dynDomains = this.fields.dynDomain.props.choices
       return this.domains.some(domain => {
-        return this.dynDomains.some(dynDomain => domain.includes(dynDomain))
+        return dynDomains.some(dynDomain => domain.includes(dynDomain))
       })
     },
 
@@ -141,38 +113,26 @@ export default {
 
     dynDomainIsVisible () {
       return this.selected === 'dynDomain'
-    },
+    }
+  },
 
-    everythingValid () {
-      const domain = this.form[this.selected]
-      if (!domain || !domain[0]) return false
-      this.validateDomainName(domain)
-      return this.isValid[this.selected] !== false
+  validations () {
+    return {
+      selected: { required },
+      form: {
+        domain: this.selected === 'domain' ? { required, domain } : {},
+        dynDomain: { localPart: this.selected === 'dynDomain' ? { required, domainLocalPart } : {} }
+      }
     }
   },
 
   methods: {
     onSubmit () {
-      if (!this.everythingValid) return
-
       const domainType = this.selected
-      const domain = this.form[domainType]
       this.$emit('submit', {
-        domain: domainType === 'dynDomain' ? domain.join('.') : domain,
+        domain: formatFormDataValue(this.form[domainType]),
         domainType
       })
-    },
-
-    validateDomainName (name) {
-      const domainType = this.selected
-      const domainname = domainType === 'domain' ? name : name[0]
-      const regex = domainType === 'domain' ? '^[.a-z0-9-]+$' : '^[a-z0-9-]+$'
-      let error = ''
-      if (!domainname.match(regex) || (domainType === 'domain' ? !domainname.includes('.') : false)) {
-        error = this.$i18n.t(`form_errors.${domainType}_syntax`)
-      }
-      this.error[this.selected] = error
-      this.isValid[this.selected] = error === '' ? null : false
     }
   },
 
@@ -184,6 +144,8 @@ export default {
     })
   },
 
+  mixins: [validationMixin],
+
   components: {
     AdressInputSelect
   }
diff --git a/app/src/helpers/validators/customValidators.js b/app/src/helpers/validators/customValidators.js
index 748f207e..3cc946d0 100644
--- a/app/src/helpers/validators/customValidators.js
+++ b/app/src/helpers/validators/customValidators.js
@@ -1,7 +1,11 @@
 import { helpers } from 'vuelidate/lib/validators'
 
+// Unicode ranges are taken from https://stackoverflow.com/a/37668315
+const nonAsciiWordCharacters = '\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16F1-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC'
+
 const alphalownum_ = helpers.regex('alphalownum_', /^[a-z0-9_]+$/)
 
+
 const includes = items => item => helpers.withParams(
   { type: 'includes', value: item }, (item) => {
   return !helpers.req(item) || (items ? items.includes(item) : false)
@@ -12,8 +16,11 @@ const unique = items => item => helpers.withParams(
   item => items ? !helpers.req(item) || !items.includes(item) : true
 )(item)
 
-// Unicode ranges are taken from https://stackoverflow.com/a/37668315
-const name = helpers.regex('name', /^([A-Za-z\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16F1-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]{2,30}[ ,.'-]{0,3})+$/)
+const name = helpers.regex('name', new RegExp(`^(?:[A-Za-z${nonAsciiWordCharacters}]{2,30}[ ,.'-]{0,3})+$`))
+
+const domain = helpers.regex('domain', new RegExp(`^(?:[\\da-z${nonAsciiWordCharacters}]+(?:-*[\\da-z${nonAsciiWordCharacters}]+)*\\.)+(?:(?:xn--)?[\\da-z${nonAsciiWordCharacters}]{2,})$`))
+
+const domainLocalPart = helpers.regex('domainLocalPart', new RegExp(`^(?:(?:xn--)?[\\da-z${nonAsciiWordCharacters}]+(?:\\.|-)?)*[\\da-z${nonAsciiWordCharacters}]+$`))
 
 const mailLocalPart = helpers.regex('mail', /^[\w.-]+$/)
 
@@ -22,5 +29,7 @@ export {
   includes,
   unique,
   name,
+  domain,
+  domainLocalPart,
   mailLocalPart
 }
diff --git a/app/src/helpers/yunohostArguments.js b/app/src/helpers/yunohostArguments.js
index 8378cd1e..fd9dc687 100644
--- a/app/src/helpers/yunohostArguments.js
+++ b/app/src/helpers/yunohostArguments.js
@@ -176,7 +176,7 @@ export function formatYunoHostArguments (args, name = null) {
  * @param {*} value
  * @return {*}
  */
-function formatFormDataValue (value) {
+export function formatFormDataValue (value) {
   if (typeof value === 'boolean') {
     return value ? 1 : 0
   } else if (isObjectLiteral(value) && 'separator' in value) {
diff --git a/app/src/store/data.js b/app/src/store/data.js
index 8a50c804..fa2fc2c3 100644
--- a/app/src/store/data.js
+++ b/app/src/store/data.js
@@ -156,6 +156,9 @@ export default {
       })
     },
 
+    // not cached
+    user: state => name => state.users_details[name],
+
     domains: state => state.domains,
 
     mainDomain: state => state.main_domain,
diff --git a/app/src/views/PostInstall.vue b/app/src/views/PostInstall.vue
index ebf6038c..0c2492c8 100644
--- a/app/src/views/PostInstall.vue
+++ b/app/src/views/PostInstall.vue
@@ -17,8 +17,8 @@
 
     <!-- DOMAIN SETUP STEP -->
     <template v-else-if="step === 'domain'">
-      <domain-form :title="$t('postinstall_set_domain')" :submit-text="$t('next')" @submit="setDomain">
-        <template v-slot:message>
+      <domain-form :title="$t('postinstall_set_domain')" :submit-text="$t('next')" @submit.prevent="setDomain">
+        <template #disclaimer>
           <b-alert variant="warning" show v-t="'postinstall_domain'" />
         </template>
       </domain-form>
@@ -30,7 +30,7 @@
 
     <!-- PASSWORD SETUP STEP -->
     <template v-else-if="step === 'password'">
-      <password-form :title="$t('postinstall_set_password')" :submit-text="$t('next')" @submit="setPassword">
+      <password-form :title="$t('postinstall_set_password')" :submit-text="$t('next')" @submit.prevent="setPassword">
         <template v-slot:message>
           <b-alert variant="warning" show v-t="'postinstall_password'" />
         </template>
diff --git a/app/src/views/domain/DomainAdd.vue b/app/src/views/domain/DomainAdd.vue
index 9ab0ada5..7ef6eec8 100644
--- a/app/src/views/domain/DomainAdd.vue
+++ b/app/src/views/domain/DomainAdd.vue
@@ -1,8 +1,7 @@
 <template lang="html">
   <domain-form
-    :title="$t('domain_add')"
-    :error="error" :is-valid="isValid"
-    @submit="onSubmit"
+    :title="$t('domain_add')" :server-error="serverError"
+    @submit="onSubmit" :submit-text="$t('add')"
   />
 </template>
 
@@ -14,14 +13,7 @@ export default {
 
   data () {
     return {
-      isValid: {
-        domainname: undefined,
-        dynDomainname: undefined
-      },
-      error: {
-        domain: '',
-        dynDomain: ''
-      }
+      serverError: ''
     }
   },
 
@@ -29,15 +21,14 @@ export default {
     onSubmit ({ domain, domainType }) {
       const query = {
         uri: 'domains' + (domainType === 'dynDomain' ? '?dyndns' : ''),
-        data: { domain: domain },
+        data: { domain },
         storeKey: 'domains'
       }
 
       this.$store.dispatch('POST', query).then(() => {
         this.$router.push({ name: 'domain-list' })
       }).catch(error => {
-        this.error[domainType] = error.message
-        this.isValid[domainType] = false
+        this.serverError = error.message
       })
     }
   },