diff --git a/app/auth.py b/app/auth.py index 54a6f5a..343cfec 100644 --- a/app/auth.py +++ b/app/auth.py @@ -1,32 +1,32 @@ import sqlite3 -#def __init__(self, path: str) -> None: -# self.db_connection = sqlite3.connect(path) -# cursor = self.db_connection.cursor() -# cursor.execute(''' -# CREATE TABLE IF NOT EXISTS Tokens ( -# TOKEN TEXT PRIMARY KEY NOT NULL, -# USER TEXT NOT NULL, -# NAME TEXT NOT NULL -# ) -# ''') -# -# cursor.execute(''' -# CREATE TABLE IF NOT EXISTS Domains ( -# DOMAIN TEXT PRIMARY KEY NOT NULL, -# USER TEXT NOT NULL -# ) -# ''') -# -# self.db_connection.commit() -# cursor.close() +def init_db(path: str) -> None: + with sqlite3.connect(path) as connection: + cursor = connection.cursor() + cursor.execute(''' + CREATE TABLE IF NOT EXISTS Tokens ( + TOKEN TEXT PRIMARY KEY NOT NULL, + USERID INTEGER NOT NULL, + NAME TEXT NOT NULL + ) + ''') + + cursor.execute(''' + CREATE TABLE IF NOT EXISTS Domains ( + DOMAIN TEXT PRIMARY KEY NOT NULL, + USERID INTEGER NOT NULL + ) + ''') + + connection.commit() + cursor.close() def check_token_domain(db_path: str, token: str, domain: str) -> bool: with sqlite3.connect(db_path) as connection: cursor = connection.cursor() cursor.execute(''' SELECT COUNT(*) FROM Tokens - JOIN Domains ON Tokens.user = Domains.user + JOIN Domains ON Tokens.userid = Domains.userid WHERE token = ? AND domain = ? ''', (token,domain)) diff --git a/app/main.py b/app/main.py index 9f502a2..f54200d 100644 --- a/app/main.py +++ b/app/main.py @@ -73,10 +73,12 @@ def update_addr(): return jsonify({"status": "500", "code": "internal-server-error", "comment": "An error occurred while processing request"}), 500 return jsonify({"status": "200", "code": "ok", "comment": "Updated successfully"}) - except: + except Exception as e: + print(e, flush=True) return jsonify({"status": "500", "code": "internal-server-error", "comment": "An error occurred while processing request"}), 500 if __name__ == '__main__': + auth.init_db(DB_PATH) app.run(host="0.0.0.0", port=8080, debug=True)