From ed707afeab5ba42169c371317bc428d7f5e7acfa Mon Sep 17 00:00:00 2001
From: jakobsn <jakob_sn_@hotmail.com>
Date: Thu, 28 Nov 2019 15:50:25 +0100
Subject: [PATCH] Remove phone number field

---
 src/app/models/register.py |  2 +-
 src/app/views/forms.py     |  5 +----
 src/app/views/register.py  | 14 +++++++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/app/models/register.py b/src/app/models/register.py
index 0a00582..bc796d6 100644
--- a/src/app/models/register.py
+++ b/src/app/models/register.py
@@ -1,6 +1,6 @@
 from models.database import db
 
-def set_user(username, password, full_name, company, email, phone_number, 
+def set_user(username, password, full_name, company, email, 
         street_address, city, state, postal_code, country):
     """
     Register a new user in the database
diff --git a/src/app/views/forms.py b/src/app/views/forms.py
index 25ae338..ce77267 100644
--- a/src/app/views/forms.py
+++ b/src/app/views/forms.py
@@ -26,10 +26,7 @@ register_form = form.Form(
     form.Textbox("postal_code", num, description="Postal code"),
     form.Textbox("country", description="Country"),
     form.Password("password", vpass, description="Password"),
-    form.Button("Register", type="submit", description="Register"),
-    validators = [
-        form.Validator("User already exists", lambda i: models.login.get_user_id_by_name(i.username) == None)
-    ]
+    form.Button("Register", type="submit", description="Register")
 )
 
 def get_task_form_elements(identifier=0, task_title="", task_description="", budget=""):
diff --git a/src/app/views/register.py b/src/app/views/register.py
index 2d6c807..7fc8ed5 100644
--- a/src/app/views/register.py
+++ b/src/app/views/register.py
@@ -36,10 +36,14 @@ class Register:
         if not r.validates():
             return render.register(nav, r, "All fields must be valid.")
 
-        models.register.set_user(data.username, hashlib.md5(b'TDT4237' + data.password.encode('utf-8')).hexdigest(), 
-        data.full_name, data.company, data.phone_number, data.street_address, 
-        data.city, data.state, data.postal_code, data.country)
-        message += "User registered!"
+        # Check if user exists
+        if models.login.get_user_id_by_name(data.username):
+            return render.register(nav, r, "Invalid user, already exists.")
+
+        models.register.set_user(data.username, 
+            hashlib.md5(b'TDT4237' + data.password.encode('utf-8')).hexdigest(), 
+            data.full_name, data.company, data.email, data.street_address, 
+            data.city, data.state, data.postal_code, data.country)
         
-        return render.register(nav, register_form, message)
+        return render.register(nav, register_form, "User registered!")