added group functionality
This commit is contained in:
@@ -11,11 +11,10 @@ import datetime
|
||||
auth_bp = Blueprint("auth", __name__)
|
||||
|
||||
# =====================================================
|
||||
# SECRET KEY (only your program has this)
|
||||
# SECRET KEY (only for this program)
|
||||
# =====================================================
|
||||
# Generate once using: Fernet.generate_key()
|
||||
_SECRET_KEY = b'YFK7QCyTzhyLO4vqrnRxvDAI5uu8mXEYrInEjbRoQgs='
|
||||
|
||||
fernet = Fernet(_SECRET_KEY)
|
||||
|
||||
# =====================================================
|
||||
@@ -62,9 +61,6 @@ def is_cookie_ok_to_autologin(cookie_content):
|
||||
return user
|
||||
return 0
|
||||
|
||||
|
||||
|
||||
|
||||
#. @auth_bp.route("/", methods=["GET", "POST"])
|
||||
@auth_bp.route("/login", methods=["GET", "POST"])
|
||||
def login():
|
||||
@@ -73,7 +69,7 @@ def login():
|
||||
userid = is_cookie_ok_to_autologin(username)
|
||||
if userid>0:
|
||||
user = User.query.filter_by(id=userid).first()
|
||||
if user and user.is_approved:
|
||||
if user and user.is_approved and user.group_id>0:
|
||||
login_user(user)
|
||||
return redirect(url_for("lists.home"))
|
||||
|
||||
@@ -82,9 +78,10 @@ def login():
|
||||
if user and user.check_password(request.form["password"]):
|
||||
if not user.is_approved:
|
||||
return render_template("pending.html")
|
||||
login_user(user)
|
||||
return redirect(url_for("lists.home"))
|
||||
flash("Invalid credentials")
|
||||
if user.group_id>0:
|
||||
login_user(user)
|
||||
return redirect(url_for("lists.home"))
|
||||
flash("Invalid key credentials.")
|
||||
Log.info(f"Authorization failure for user '{request.form["name"]}' ")
|
||||
|
||||
|
||||
@@ -98,8 +95,11 @@ def register():
|
||||
if request.method == "POST":
|
||||
user = User(name=request.form["name"])
|
||||
user.set_password(request.form["password"])
|
||||
db.session.add(user)
|
||||
db.session.commit()
|
||||
group_id = user.get_group_id(request.form["password"])
|
||||
if group_id > 0:
|
||||
user.group_id = group_id
|
||||
db.session.add(user)
|
||||
db.session.commit()
|
||||
return render_template("pending.html")
|
||||
return render_template("register.html")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user