diff --git a/__pycache__/config.cpython-310.pyc b/__pycache__/config.cpython-310.pyc new file mode 100644 index 0000000..8eadce8 Binary files /dev/null and b/__pycache__/config.cpython-310.pyc differ diff --git a/__pycache__/models.cpython-310.pyc b/__pycache__/models.cpython-310.pyc new file mode 100644 index 0000000..2a7ce6f Binary files /dev/null and b/__pycache__/models.cpython-310.pyc differ diff --git a/app.py b/app.py index 14661c3..67b68c3 100644 --- a/app.py +++ b/app.py @@ -1,12 +1,12 @@ from flask import Flask -from .modules.userModuls import * +from modules.userModuls import * from flask_restful import Resource,Api app = Flask(__name__) api = Api(app) api.add_resource(home,'/') -api.add_resource(CreateUser,'/add-user') -api.add_resource(loginUser,'/login') +api.add_resource(CreateUser,'/user/register') +api.add_resource(loginUser,'/user/login') api.add_resource(GetDetailUser,'/user/detail/') api.add_resource(HardDeleteUser, '/user/hard-delete') api.add_resource(SoftDeleteUser, '/user/soft-delete') diff --git a/modules/__pycache__/userModuls.cpython-310.pyc b/modules/__pycache__/userModuls.cpython-310.pyc new file mode 100644 index 0000000..24e2d59 Binary files /dev/null and b/modules/__pycache__/userModuls.cpython-310.pyc differ diff --git a/modules/userModuls.py b/modules/userModuls.py index e9cc2e0..191d5ec 100644 --- a/modules/userModuls.py +++ b/modules/userModuls.py @@ -3,7 +3,7 @@ from bson import ObjectId from models import User,get_current_time from config import users_collection from flask_restful import Resource - +from werkzeug.security import generate_password_hash, check_password_hash class home (Resource): def get(self): return "hello world" @@ -28,26 +28,27 @@ class UserList (Resource): class CreateUser (Resource): def post(self): body=request.json + if body["username"] == "" or body["codemeli"] == "" or body["password"] == "": + return {"message": "Fields cannot be empty"}, 400 newUser = User() newUser.updated_at = None newUser.deleted_at = None newUser.username = body["username"] newUser.codemeli = body["codemeli"] - newUser.password = body["password"] + newUser.password = generate_password_hash(body["password"]) newUser.is_deleted = False - if body["username"] == "" or body["codemeli"] == "" or body["password"] == "": - return {"message": "Fields cannot be empty"}, 400 users_collection.insert_one(newUser.__dict__) return {'message':'You are registered successfully'},201 class loginUser (Resource): def post(self): body=request.json - find_user= users_collection.find_one({"username":body["username"],"password":body["password"]}) - if find_user ==None: - return {'message':'couldnt find'},404 - else: - return {'message':'You are login successfully'} + find_user= users_collection.find_one({"username":body["username"]}) + if find_user is None: + return {'message':"couldn't find"},404 + if check_password_hash(find_user["password"],body["password"]): + return {'message':'You are login successfully'} + return {'message':"invalid user"},404 class GetDetailUser(Resource): @@ -64,7 +65,6 @@ class GetDetailUser(Resource): class HardDeleteUser(Resource): - def delete(self): body = request.json id = body["id"]