From 0049ff4b47a3db0bef34ff9d6c31803b3e9d2444 Mon Sep 17 00:00:00 2001
From: ornanovitch <73481cdb-ce91-4a23-9016-8507f6f0fe43@users.tedomum.net>
Date: Sun, 30 Jun 2024 10:30:21 +0000
Subject: [PATCH] Merge branch
'131-bouton-se-souvenir-de-moi-ne-fonctionne-pas-avec-2fa' into 'dev'
Resolve "Bouton "Se souvenir de moi" ne fonctionne pas avec 2FA"
Closes #131
See merge request acides/hiboo!73
---
hiboo/account/login.py | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hiboo/account/login.py b/hiboo/account/login.py
index 7d76bdab..5bbfc550 100644
--- a/hiboo/account/login.py
+++ b/hiboo/account/login.py
@@ -3,27 +3,23 @@ from hiboo.account import blueprint, forms
from flask_babel import lazy_gettext as _
from flask import session
from authlib.jose import JsonWebToken
-from io import BytesIO
import datetime
import flask_login
import flask
-import pyotp
-import qrcode
-import base64
@blueprint.route("/signin/password", methods=["GET", "POST"])
def signin_password():
form = forms.LoginForm()
if form.validate_on_submit():
user = models.User.login(form.username.data, form.password.data)
+ if form.remember_me.data is True:
+ session.permanent = True
if user and models.Auth.TOTP in user.auths and user.auths[models.Auth.TOTP].enabled:
session["username"] = user.username
return flask.redirect(utils.url_for(".signin_totp"))
elif user:
flask_login.login_user(user)
- if form.remember_me.data is True:
- session.permanent = True
return flask.redirect(utils.url_or_intent(".home"))
else:
flask.flash(_("Wrong credentials"), "danger")
--
GitLab