From 495e4d7bece2d661b73dac4e484d9ef11fdf304f Mon Sep 17 00:00:00 2001
From: hay-kot <hay-kot@pm.me>
Date: Thu, 11 Mar 2021 22:35:31 -0800
Subject: [PATCH] sign up data validation

---
 frontend/src/components/Login/SignUpForm.vue | 23 ++++++++++++++++----
 mealie/routes/users/sign_up.py               |  6 ++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/Login/SignUpForm.vue b/frontend/src/components/Login/SignUpForm.vue
index b81a15d6f..3ae885fdf 100644
--- a/frontend/src/components/Login/SignUpForm.vue
+++ b/frontend/src/components/Login/SignUpForm.vue
@@ -21,12 +21,13 @@
       have a valid invitation link. If you haven't recieved an invitation you
       are unable to sign-up. To recieve a link, contact the sites administrator.
       <v-divider class="mt-3"></v-divider>
-      <v-form>
+      <v-form ref="signUpForm">
         <v-text-field
           v-model="user.name"
           light="light"
           prepend-icon="mdi-account"
           validate-on-blur
+          :rules="[existsRule]"
           label="Display Name"
           type="email"
         ></v-text-field>
@@ -35,6 +36,7 @@
           light="light"
           prepend-icon="mdi-email"
           validate-on-blur
+          :rules="[existsRule, emailRule]"
           :label="$t('login.email')"
           type="email"
         ></v-text-field>
@@ -43,10 +45,10 @@
           light="light"
           class="mb-2s"
           prepend-icon="mdi-lock"
+          validate-on-blur
           :label="$t('login.password')"
           :type="showPassword ? 'text' : 'password'"
-          :append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'"
-          @click:append="showPassword = !showPassword"
+          :rules="[minRule]"
         ></v-text-field>
         <v-text-field
           v-model="user.passwordConfirm"
@@ -56,6 +58,9 @@
           :label="$t('login.password')"
           :type="showPassword ? 'text' : 'password'"
           :append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'"
+          :rules="[
+            user.password === user.passwordConfirm || 'Password must match',
+          ]"
           @click:append="showPassword = !showPassword"
         ></v-text-field>
       </v-form>
@@ -80,7 +85,9 @@
 
 <script>
 import api from "@/api";
+import { validators } from "@/mixins/validators";
 export default {
+  mixins: [validators],
   data() {
     return {
       loading: false,
@@ -126,10 +133,18 @@ export default {
         admin: false,
       };
 
-      await api.signUps.createUser(this.token, userData);
+      let successUser = false;
+      if (this.$refs.signUpForm.validate()) {
+        let response = await api.signUps.createUser(this.token, userData);
+        successUser = response.snackbar.text.includes("Created");
+      }
+
       this.$emit("user-created");
 
       this.loading = false;
+      if (successUser) {
+        this.$router.push("/");
+      }
     },
   },
 };
diff --git a/mealie/routes/users/sign_up.py b/mealie/routes/users/sign_up.py
index 537fd44b9..8a9f45d7b 100644
--- a/mealie/routes/users/sign_up.py
+++ b/mealie/routes/users/sign_up.py
@@ -56,12 +56,12 @@ async def create_user_with_token(
     """ Creates a user with a valid sign up token """
 
     # Validate Token
-    db_entry = db.sign_ups.get(session, token, limit=1)
+    db_entry: SignUpOut = db.sign_ups.get(session, token, limit=1)
     if not db_entry:
-        return {"details": "invalid token"}
+        return SnackResponse.error("Invalid Token")
 
     # Create User
-    new_user.admin = db_entry.get("admin")
+    new_user.admin = db_entry.admin
     new_user.password = get_password_hash(new_user.password)
     data = db.users.create(session, new_user.dict())