From 7ebd66d53c34a7106126a10e5da916cbabc01062 Mon Sep 17 00:00:00 2001 From: hok7z Date: Fri, 2 Dec 2022 23:12:00 +0200 Subject: [PATCH] Fix log in --- app.py | 2 +- apps/admin.py | 7 +++---- apps/auth.py | 28 +++++++++++----------------- templates/admin.html | 13 ------------- 4 files changed, 15 insertions(+), 35 deletions(-) delete mode 100644 templates/admin.html diff --git a/app.py b/app.py index 21fac38..d4ca0f1 100644 --- a/app.py +++ b/app.py @@ -17,5 +17,5 @@ if __name__ == '__main__': from database import build_database build_database() logging.info("Build database models") - + app.run(host="0.0.0.0") diff --git a/apps/admin.py b/apps/admin.py index 41c47a6..5881f41 100644 --- a/apps/admin.py +++ b/apps/admin.py @@ -3,9 +3,8 @@ from werkzeug.security import generate_password_hash admin = Blueprint('admin',__name__) -@admin.route("/admin") +@admin.route("/") def admin_page(): if ( "username" in session): - return render_template("admin.html",username=session["username"]) - - return redirect(url_for("login/")) + return render_template("index.html",username=session["username"]) + return redirect(url_for("auth.login_page")) diff --git a/apps/auth.py b/apps/auth.py index a64c33a..16d4433 100644 --- a/apps/auth.py +++ b/apps/auth.py @@ -1,33 +1,27 @@ from flask import Blueprint,render_template,request,redirect,url_for,session from werkzeug.security import check_password_hash - +from flask import flash from database import WebUser auth = Blueprint('auth',__name__) -@auth.route("/") @auth.route("/login",methods=["GET"]) def login_template(): return render_template("login.html") @auth.route("/login",methods=["POST"]) -def login(): - username = request.form.get("username") - password = request.form.get("password") +def login_page(): + username = request.form["username"] + password = request.form["password"] - if (not username) or (not password): - return "Enter username/password" + user = WebUser.get_or_none(WebUser.username == username) - # TODO: Write simple frontened (if username is None or password is None) - if (WebUser.userExists(username)): - user = WebUser.get(WebUser.username == username) - - if ( check_password_hash(user.password_hash,password)): - session["username"] = username - return redirect(url_for("admin.admin_page")) - else: - return "Password not valid" - return "User not exist" + if (user) and (check_password_hash(user.password_hash,password)): + session["username"] = username + return redirect(url_for("admin.admin_page")) + + flash("password/username not valid") + return redirect(url_for("auth.login_page")) @auth.route("/logout") def logout(): diff --git a/templates/admin.html b/templates/admin.html deleted file mode 100644 index 9e67ca7..0000000 --- a/templates/admin.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Web group moderator - - - - Admin panel - - -