Fixes

Author: App Generator

api/models.py

@@ -5,12 +5,14 @@
 
 from datetime import datetime
 
+import json
+from json import JSONEncoder
+
 from werkzeug.security import generate_password_hash, check_password_hash
 from flask_sqlalchemy import SQLAlchemy
 
 db = SQLAlchemy()
 
-
 class Users(db.Model):
     id = db.Column(db.Integer(), primary_key=True)
     username = db.Column(db.String(32), nullable=False)
@@ -45,6 +47,18 @@ def get_by_id(cls, id):
     def get_by_email(cls, email):
         return cls.query.filter_by(email=email).first()
 
+    def toDICT(self):
+        
+        cls_dict = {}
+        cls_dict['id'] = self.id
+        cls_dict['username'] = self.username
+        cls_dict['email'] = self.email
+
+        return cls_dict
+
+    def toJSON(self):
+
+        return json.dumps( self.toDICT() )
 
 class JWTTokenBlocklist(db.Model):
     id = db.Column(db.Integer(), primary_key=True)

api/routes.py

@@ -5,6 +5,8 @@
 
 from datetime import datetime, timezone
 
+import json
+
 from flask import request
 from flask_restx import Api, Resource, fields, abort
 from flask_jwt_extended import JWTManager, jwt_required, get_jwt, create_access_token, get_jwt_identity
@@ -48,7 +50,7 @@ def check_if_token_revoked(jwt_header, jwt_payload):
 """
 
 
-@rest_api.route('/api/users/signup')
+@rest_api.route('/api/users/register')
 class Register(Resource):
     """
        Creates a new user by taking 'signup_model' input
@@ -66,15 +68,16 @@ def post(self):
         user_exists = Users.get_by_email(_email)
         if user_exists:
             return {"success": False,
-                    "msg": "Sorry. This email already exists."}, 400
+                    "msg": "Email already exists"}, 400
 
         new_user = Users(username=_username, email=_email)
 
         new_user.set_password(_password)
         new_user.save()
 
         return {"success": True,
-                "msg": "User with (%s, %s) created successfully!" % (_username, _email)}, 201
+                "userID" : new_user.id,
+                "msg": "The user was succesfully registered"}, 200
 
 
 @rest_api.route('/api/users/login')
@@ -104,7 +107,9 @@ def post(self):
         # create access token uwing JWT
         access_token = create_access_token(identity=_email)
 
-        return {"access_token": access_token}, 200
+        return {"success": True,
+                "token": access_token,
+                "user" : user_exists.toJSON() }, 200
 
 
 @rest_api.route('/api/users/edit')