fix(utils/token.py): Code review fix

https://g.codrs.ru/Hackaton/Backend/pulls/2#issuecomment-24

api/auth/loginapi.py

@@ -1,4 +1,4 @@
-from flask import Blueprint, request
+from flask import Blueprint, request, jsonify
 from model.user import user
 
 loginBP =  Blueprint("loginapi", __name__)
@@ -8,5 +8,5 @@ def login():
     email = request.form['email']
     password = request.form['password']
     #if(isvalid(email, password)):
-    us = user.initialize(email, password)
+    us = user(email, password)
-    return us.toJSON()
+    return jsonify(us.toDictionary())

app.py

@@ -1,5 +1,8 @@
 from flask import Flask
-from api.loginapi import loginBP
+from api.auth.loginapi import loginBP
+from utils.loadDotEnv import initializeENV
+
+state = initializeENV()
 
 app = Flask(__name__)
 

model/user.py

@@ -9,14 +9,12 @@ class user:
     role: str
     token: str
 
-    @classmethod
+    def __init__(self, email: str, passwd: str):
-    def initialize(cls, email:str, passwd:str):
         #us = getUsModel() #возвращает словарь
-        id = 1#us['id']
+        self.id = 1#us['id']
-        name = 'Bob'#us['name']
+        self.name = 'Bob'#us['name']
-        role = 'Backend'#us['role']
+        self.role = 'Backend'#us['role']
-        token = generateKey(email, passwd)
+        self.token = generateKey(email, passwd)
-        return cls(id=id, name=name, role=role, token=token)
 
-    def toJSON(self):
+    def toDictionary(self):
-        return json.dumps({"token": f'{self.token}', "user": {"id": self.id, "role": f'{self.role}', "name": f'{self.name}'}})
+        return {"user": {"id": self.id, "name": self.name, "role": self.role}, "token": self.token}

utils/token.py

@@ -3,5 +3,5 @@ import os
 
 def generateKey(email, passwd):
     key = os.getenv('KEY')
-    encoded = jwt.encode({f"{email}": f"{passwd}"}, key, algorithm="HS256")
+    encoded = jwt.encode({email: passwd}, key, algorithm="HS256")
     return encoded