geovisio 2.6.0__py3-none-any.whl → 2.7.1__py3-none-any.whl

geovisio/web/auth.py

@@ -1,9 +1,9 @@
 import flask
 from flask import current_app, url_for, session, redirect, request, jsonify
-import psycopg
-from typing import Any
+from flask_babel import gettext as _
 from urllib.parse import quote
 from geovisio import utils, errors
+from geovisio.utils import db
 from geovisio.utils.auth import Account, ACCOUNT_KEY
 from authlib.integrations.base_client.errors import MismatchingStateError
 
@@ -57,50 +57,50 @@ def auth():
         tokenResponse = utils.auth.oauth_provider.client.authorize_access_token()
     except MismatchingStateError as e:
         raise errors.InternalError(
-            "Impossible to finish authentication flow",
+            _("Impossible to finish authentication flow"),
             payload={
                 "details": {
                     "error": str(e),
-                    "tips": "You can try to clear your cookies and retry. If the problem persists, contact your instance administrator.",
+                    "tips": _("You can try to clear your cookies and retry. If the problem persists, contact your instance administrator."),
                 }
             },
             status_code=403,
         )
 
     oauth_info = utils.auth.oauth_provider.get_user_oauth_info(tokenResponse)
-    with psycopg.connect(current_app.config["DB_URL"]) as conn:
-        with conn.cursor() as cursor:
-            res = cursor.execute(
-                "INSERT INTO accounts (name, oauth_provider, oauth_id) VALUES (%(name)s, %(provider)s, %(id)s) ON CONFLICT (oauth_provider, oauth_id) DO UPDATE SET name = %(name)s RETURNING id, name",
-                {
-                    "provider": utils.auth.oauth_provider.name,
-                    "id": oauth_info.id,
-                    "name": oauth_info.name,
-                },
-            ).fetchone()
-            if res is None:
-                raise Exception("Impossible to insert user in database")
-            id, name = res
-            account = Account(
-                id=str(id),  # convert uuid to string for serialization
-                name=name,
-                oauth_provider=utils.auth.oauth_provider.name,
-                oauth_id=oauth_info.id,
-            )
-            session[ACCOUNT_KEY] = account.__dict__
-
-            next_url = session.pop(NEXT_URL_KEY, None)
-            if next_url:
-                response = flask.make_response(redirect(next_url))
-            else:
-                response = flask.make_response(redirect("/"))
-
-            # also store id/name in cookies for the front end to use those
-            max_age = current_app.config["PERMANENT_SESSION_LIFETIME"]
-            _set_cookie(response, "user_id", str(id), max_age=max_age)
-            _set_cookie(response, "user_name", quote(name), max_age=max_age)
-
-            return response
+    with db.cursor(current_app) as cursor:
+        res = cursor.execute(
+            "INSERT INTO accounts (name, oauth_provider, oauth_id) VALUES (%(name)s, %(provider)s, %(id)s) ON CONFLICT (oauth_provider, oauth_id) DO UPDATE SET name = %(name)s RETURNING id, name",
+            {
+                "provider": utils.auth.oauth_provider.name,
+                "id": oauth_info.id,
+                "name": oauth_info.name,
+            },
+        ).fetchone()
+        if res is None:
+            raise Exception("Impossible to insert user in database")
+        id, name = res
+        account = Account(
+            id=str(id),  # convert uuid to string for serialization
+            name=name,
+            oauth_provider=utils.auth.oauth_provider.name,
+            oauth_id=oauth_info.id,
+        )
+        session[ACCOUNT_KEY] = account.model_dump(exclude_none=True)
+        session.permanent = True
+
+        next_url = session.pop(NEXT_URL_KEY, None)
+        if next_url:
+            response = flask.make_response(redirect(next_url))
+        else:
+            response = flask.make_response(redirect("/"))
+
+        # also store id/name in cookies for the front end to use those
+        max_age = current_app.config["PERMANENT_SESSION_LIFETIME"]
+        _set_cookie(response, "user_id", str(id), max_age=max_age)
+        _set_cookie(response, "user_name", quote(name), max_age=max_age)
+
+        return response
 
 
 @bp.route("/logout")