Add email field to user model

Author: npalaska

lib/pbench/server/api/resources/db_models.py

@@ -14,15 +14,16 @@ class UserModel(db.Model):
     lastName = db.Column(db.String(255), unique=False, nullable=False)
     password = db.Column(db.String(255), nullable=False)
     registered_on = db.Column(db.DateTime, nullable=False)
-    # ToDo: decide if we want the email field
+    email = db.Column(db.String(255), unique=False, nullable=False)
 
-    def __init__(self, username, firstName, lastName, password):
+    def __init__(self, username, firstName, lastName, email, password):
         self.username = username
         self.firstName = firstName
         self.lastName = lastName
         self.password = bcrypt.generate_password_hash(
             password, app.config.get('BCRYPT_LOG_ROUNDS')
         ).decode()
+        self.email = email
         self.registered_on = datetime.datetime.now()
 
     def __str__(self):

lib/pbench/server/api/resources/pbench_users.py

@@ -14,15 +14,17 @@ class RegisterUser(Resource):
     def post(self):
         # get the post data
         post_data = request.get_json()
-        # check if user already exists
-        user = UserModel.query.filter_by(email=post_data.get('username')).first()
+        # check if user already exist
+        user = UserModel.query.filter_by(username=post_data.get('username')).first()
         if not user:
+
             try:
                 user = UserModel(
                     username=post_data.get('username'),
                     password=post_data.get('password'),
                     firstName=post_data.get('firstName'),
                     lastName=post_data.get('lastName'),
+                    email=post_data.get('email'),
                 )
 
                 # insert the user
@@ -105,8 +107,8 @@ def post(self):
         if auth_header:
             auth_token = auth_header.split(" ")[1]
 
-            resp = UserModel.decode_auth_token(auth_token)
-            if not isinstance(resp, str):
+            user_id = UserModel.decode_auth_token(auth_token)
+            if not isinstance(user_id, str):
                 # Add the token to the blacklist
                 blacklist.add(auth_token)
                 response_object = {
@@ -118,7 +120,7 @@ def post(self):
             else:
                 response_object = {
                     'status': 'fail',
-                    'message': resp,
+                    'message': user_id,
                     'status_code': 401
                 }
                 return make_response(jsonify(response_object))
@@ -154,9 +156,9 @@ def get(self):
                 return make_response(jsonify(response_object))
 
         if auth_token:
-            resp = UserModel.decode_auth_token(auth_token)
-            if not isinstance(resp, str):
-                user = UserModel.query.filter_by(id=resp).first()
+            user_id = UserModel.decode_auth_token(auth_token)
+            if not isinstance(user_id, str):
+                user = UserModel.query.filter_by(id=user_id).first()
                 response_object = {
                     'status': 'success',
                     'data': {
@@ -169,7 +171,7 @@ def get(self):
                 return make_response(jsonify(response_object))
             response_object = {
                 'status': 'fail',
-                'message': resp,
+                'message': user_id,
                 'status_code': 403
             }
             return make_response(jsonify(response_object))