From aabe6e3a061a382a29b0747b32a72ca2185ad175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= Date: Fri, 18 Feb 2022 17:40:06 +0100 Subject: [PATCH] Try fixing the auth --- Makefile | 4 +++- copanier/views/login.py | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d9d335f..28049d3 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,4 @@ serve: - ./venv/bin/copanier serve --reload \ No newline at end of file + ./venv/bin/copanier serve --reload +pserve: + ./venv/bin/gunicorn -k roll.worker.Worker copanier:app --bind 0.0.0.0:8000 diff --git a/copanier/views/login.py b/copanier/views/login.py index 28231fa..bef64ab 100644 --- a/copanier/views/login.py +++ b/copanier/views/login.py @@ -18,13 +18,18 @@ async def auth_required(request, response): else: setattr(config, 'DEMO_MODE', False) + logger = logging.getLogger('roll') + logger.info("auth required") if request.route.payload and not request.route.payload.get("unprotected"): + logger.info("unprotected") token = request.cookies.get("token") email = None if token: + logger.info("token detected") decoded = utils.read_token(token) email = decoded.get("sub") if not email: + logger.info("no email detected") response.redirect = f"/connexion?next={url(request.path)}" return response @@ -75,7 +80,6 @@ async def set_sesame(request, response, token): if not decoded: response.message("Sésame invalide :(", status="error") else: - response.message("Yay ! Le sésame a fonctionné. Bienvenue à bord ! :-)") response.cookies.set( name="token", value=token, @@ -83,6 +87,8 @@ async def set_sesame(request, response, token): max_age=60 * 60 * 24 * 7, samesite="Strict", ) + request.cookies = response.cookies + response.message("Yay ! Le sésame a fonctionné. Bienvenue à bord ! :-)") response.redirect = "/" @@ -109,4 +115,3 @@ async def desactivate_demo(request, response): saved_config.demo_mode_enabled = False saved_config.persist() response.redirect = "/" -