bug fixes

Author: ksh7

api/models.py

@@ -33,6 +33,9 @@ def set_password(self, password):
     def check_password(self, password):
         return check_password_hash(self.password, password)
 
+    def update_email(self, new_email):
+        self.email = new_email
+
     def update_username(self, new_username):
         self.username = new_username
 
@@ -50,7 +53,7 @@ def get_by_email(cls, email):
     def toDICT(self):
 
         cls_dict = {}
-        cls_dict['id'] = self.id
+        cls_dict['_id'] = self.id
         cls_dict['username'] = self.username
         cls_dict['email'] = self.email
 

api/routes.py

@@ -41,10 +41,14 @@ def check_if_token_revoked(jwt_header, jwt_payload):
                                             "password": fields.String(required=True, min_length=4, max_length=16)
                                             })
 
-user_edit_model = rest_api.model('UserEditModel', {"username": fields.String(required=True, min_length=2, max_length=32),
-                                                   "password": fields.String(required=True, min_length=4, max_length=16)
+user_edit_model = rest_api.model('UserEditModel', {"userID": fields.String(required=True, min_length=1, max_length=32),
+                                                   "username": fields.String(required=True, min_length=2, max_length=32),
+                                                   "email": fields.String(required=True, min_length=4, max_length=64)
                                                    })
 
+logout_model = rest_api.model('LogoutModel', {"token": fields.String(required=True)})
+
+
 """
     Flask-Restx routes
 """
@@ -77,7 +81,7 @@ def post(self):
 
         return {"success": True,
                 "userID" : new_user.id,
-                "msg": "The user was succesfully registered"}, 200
+                "msg": "The user was successfully registered"}, 200
 
 
 @rest_api.route('/api/users/login')
@@ -132,29 +136,28 @@ def post(self):
         req_data = request.get_json()
 
         _new_username = req_data.get("username")
-        _new_password = req_data.get("password")
+        _new_email = req_data.get("email")
 
         if _new_username:
             current_user.update_username(_new_username)
 
-        if _new_password:
-            current_user.set_password(_new_password)
+        if _new_email:
+            current_user.update_email(_new_email)
 
         current_user.save()
 
-        return {"success": True,
-                "msg": "User details updated successfully!"}, 200
+        return {"success": True}, 200
 
 
 @rest_api.route('/api/users/logout')
 class LogoutUser(Resource):
     """
-       Edits User's username or password or both using 'user_edit_model' input
+       Logs out User using 'logout_model' input
     """
 
-    @rest_api.expect(user_edit_model)
+    @rest_api.expect(logout_model, validate=True)
     @jwt_required()
-    def delete(self):
+    def post(self):
 
         user_email = get_jwt_identity()
         current_user = Users.get_by_email(user_email)
@@ -167,4 +170,4 @@ def delete(self):
         jwt_block.save()
 
         return {"success": True,
-                "msg": "JWT Token revoked successfully!"}, 200
+                "msg": "JWT Token revoked successfully"}, 200

tests.py

@@ -27,10 +27,10 @@ def client():
 
 def test_user_signup(client):
     """
-       Tests /users/signup API
+       Tests /users/register API
     """
     response = client.post(
-        "api/users/signup",
+        "api/users/register",
         data=json.dumps(
             {
                 "username": DUMMY_USERNAME,
@@ -41,16 +41,16 @@ def test_user_signup(client):
         content_type="application/json")
 
     data = json.loads(response.data.decode())
-    assert response.status_code == 201
-    assert "User with (%s, %s) created successfully!" % (DUMMY_USERNAME, DUMMY_EMAIL) in data["msg"]
+    assert response.status_code == 200
+    assert "The user was successfully registered" in data["msg"]
 
 
 def test_user_signup_invalid_data(client):
     """
-       Tests /users/signup API: invalid data like email field empty
+       Tests /users/register API: invalid data like email field empty
     """
     response = client.post(
-        "api/users/signup",
+        "api/users/register",
         data=json.dumps(
             {
                 "username": DUMMY_USERNAME,
@@ -81,7 +81,7 @@ def test_user_login_correct(client):
 
     data = json.loads(response.data.decode())
     assert response.status_code == 200
-    assert data["access_token"] != ""
+    assert data["token"] != ""
 
 
 def test_user_login_error(client):