From a786cc848c121b7885cf3bd34cd5143ee75ebc1e Mon Sep 17 00:00:00 2001
From: Hubert Van De Walle <hubv@protonmail.com>
Date: Thu, 18 Jun 2020 17:07:54 +0200
Subject: [PATCH] Match registration rules in frontend

---
 api-doc/users/index.apib             |  2 --
 frontend/components/RegisterForm.vue | 33 +++++++++++-----------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/api-doc/users/index.apib b/api-doc/users/index.apib
index 7e6941f..d2f719f 100644
--- a/api-doc/users/index.apib
+++ b/api-doc/users/index.apib
@@ -19,7 +19,6 @@
 + Request (application/json)
     + Attributes (object)
         + username: babar (string)
-        + email: `michel@seed-it.eu` (string)
         + password: tortue (string)
       
 + Response 200 (application/json)
@@ -85,4 +84,3 @@ Receive the username and email from the currently logged in user
    + Attributes
        + user: (object)
            + username: babar (string)
-           + email: `michel@seed-it.eu` (string)
\ No newline at end of file
diff --git a/frontend/components/RegisterForm.vue b/frontend/components/RegisterForm.vue
index da6a556..97e0ca5 100644
--- a/frontend/components/RegisterForm.vue
+++ b/frontend/components/RegisterForm.vue
@@ -10,14 +10,6 @@
                     :prepend-icon="mdiAccount"
                 ></v-text-field>
 
-                <v-text-field
-                    v-model="form.email"
-                    :rules="emailRules"
-                    label="Email"
-                    required
-                    :prepend-icon="mdiAt"
-                ></v-text-field>
-
                 <v-text-field
                     v-model="form.password"
                     :rules="passwordRules"
@@ -36,7 +28,6 @@
                     type="password"
                 ></v-text-field>
             </v-card-text>
-            <v-divider />
             <v-card-actions>
                 <v-spacer />
                 <v-btn
@@ -53,7 +44,7 @@
 </template>
 
 <script>
-import { mdiLock, mdiAccount, mdiAt } from '@mdi/js'
+import { mdiAccount, mdiAt, mdiLock } from '@mdi/js'
 
 export default {
     name: 'RegisterForm',
@@ -64,20 +55,22 @@ export default {
         valid: false,
         form: {
             username: '',
-            email: '',
             password: '',
         },
         usernameRules: [
-            (v) => !!v || 'Name is required',
-            (v) => /^[a-zA-Z0-9]+$/.test(v) || 'Name must be alphanumeric',
-        ],
-        emailRules: [
-            (v) => !!v || 'Email is required',
-            (v) => /.+@.+/.test(v) || 'E-mail must be valid',
+            (v) => !!v || 'Username is required',
+            (v) =>
+                v.length <= 50 ||
+                'Username must be shorter or equal to 50 characters',
+            (v) =>
+                v.length >= 3 ||
+                'Username must be longer or equal to 3 characters',
         ],
         passwordRules: [
             (v) => !!v || 'Password is required',
-            (v) => v.length >= 6 || 'Password must be longer than 6 characters',
+            (v) =>
+                v.length >= 6 ||
+                'Password must be longer or equal to 6 characters',
         ],
         confirm: '',
         confirmRules: [
@@ -89,8 +82,8 @@ export default {
         registerUser() {
             this.$axios
                 .post('/user', this.form)
-                .then((_) => this.$root.$emit('register::success'))
-                .catch((_) =>
+                .then(() => this.$root.$emit('register::success'))
+                .catch(() =>
                     this.$root.$emit(
                         'toast',
                         'Please choose another username',