diff --git a/.gitignore b/.gitignore index ea571fc..fda5dd1 100644 --- a/.gitignore +++ b/.gitignore @@ -165,5 +165,5 @@ cython_debug/ *# future/ .vscode/ -src/server.key -src/server.crt \ No newline at end of file +pyasync_server/server/server.key +pyasync_server/server/server.crt \ No newline at end of file diff --git a/pyasync_server/client/client.py b/pyasync_server/client/client.py index 32f2fab..0732e1b 100644 --- a/pyasync_server/client/client.py +++ b/pyasync_server/client/client.py @@ -3,9 +3,7 @@ """ import asyncio from pyasync_server.common.protocol import on_init, is_framed -from pyasync_server.common.utils import ( - send_package, -) +from pyasync_server.common.utils import send_package from pyasync_server.common.logging import show_status, STATUS from pyasync_server.common.compress import decompress from pyasync_server.client.package import unpack_and_process diff --git a/pyasync_server/server/actions.py b/pyasync_server/server/actions.py index f2a9d3e..8c50bc8 100644 --- a/pyasync_server/server/actions.py +++ b/pyasync_server/server/actions.py @@ -45,13 +45,16 @@ def database_test(sql): # write your own actions here def login(username, password): - if not os.path.exists("users.json"): + if not os.path.exists("./users.json"): + logger.error("users.json not found. Cannot login.") return False with open("users.json", "r") as f: users = json.load(f) if username in users and users[username] == password: + logger.info(f"User {username} logged in.") return True else: + logger.error(f"Invalid username or password for user {username}.") return False diff --git a/pyasync_server/server/users.json b/users.json similarity index 100% rename from pyasync_server/server/users.json rename to users.json