c2cgeoportal-geoportal 2.9.0.324__py3-none-any.whl → 2.9.0.325__py3-none-any.whl

c2cgeoportal_geoportal/__init__.py

@@ -416,6 +416,9 @@ def create_get_user_from_request(
                         if access_token_expires < datetime.datetime.now(datetime.timezone.utc):
                             if user_info_remember["refresh_token_expires"] is None:
                                 return None
+                            refresh_token = request.cookies.get("refresh_token")
+                            if refresh_token is None:
+                                return None
                             refresh_token_expires = dateutil.parser.isoparse(
                                 user_info_remember["refresh_token_expires"]
                             )
@@ -432,7 +435,7 @@ def create_get_user_from_request(
                                 return None
                             token_response = oidc.get_oidc_client(
                                 request, request.host
-                            ).exchange_refresh_token(user_info_remember["refresh_token"])
+                            ).exchange_refresh_token(refresh_token)
                             user_info_remember = oidc.OidcRemember(request).remember(
                                 token_response, request.host
                             )

c2cgeoportal_geoportal/lib/oidc.py

@@ -87,9 +87,7 @@ class OidcRememberObject(TypedDict):
     The JSON object that is stored in a cookie to remember the user.
     """
 
-    access_token: str
     access_token_expires: str
-    refresh_token: str | None
     refresh_token_expires: str | None
     username: str | None
     display_name: str | None
@@ -269,13 +267,30 @@ class OidcRemember:
             raise HTTPUnauthorized("See server logs for details")
 
         openid_connect = self.authentication_settings.get("openid_connect", {})
+        self.request.response.set_cookie(
+            "access_token",
+            token_response.access_token,
+            max_age=token_response.expires_in,
+            secure=True,
+            httponly=True,
+            samesite="Lax",
+            domain=self.request.domain,
+        )
+        if token_response.refresh_expires_in is not None:
+            self.request.response.set_cookie(
+                "refresh_token",
+                token_response.refresh_token,
+                max_age=token_response.refresh_expires_in,
+                secure=True,
+                httponly=True,
+                samesite="Lax",
+                domain=self.request.domain,
+            )
         remember_object: OidcRememberObject = {
-            "access_token": token_response.access_token,
             "access_token_expires": (
                 datetime.datetime.now(datetime.timezone.utc)
                 + datetime.timedelta(seconds=token_response.expires_in)
             ).isoformat(),
-            "refresh_token": token_response.refresh_token,
             "refresh_token_expires": (
                 None
                 if token_response.refresh_expires_in is None

c2cgeoportal_geoportal/views/login.py

@@ -296,10 +296,11 @@ class Login:
         if self.authentication_settings.get("openid_connect", {}).get("enabled", False):
             client = oidc.get_oidc_client(self.request, self.request.host)
             if hasattr(client, "revoke_token"):
-                user_info = json.loads(self.request.authenticated_userid)
-                client.revoke_token(user_info["access_token"])
-                if user_info.get("refresh_token") is not None:
-                    client.revoke_token(user_info["refresh_token"])
+                access_token = self.request.cookies.get("access_token")
+                client.revoke_token(access_token)
+                refresh_token = self.request.cookies.get("refresh_token")
+                if refresh_token is not None:
+                    client.revoke_token(refresh_token)
 
         headers = forget(self.request)
 

{c2cgeoportal_geoportal-2.9.0.324.dist-info → c2cgeoportal_geoportal-2.9.0.325.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cgeoportal-geoportal
-Version: 2.9.0.324
+Version: 2.9.0.325
 Summary: c2cgeoportal geoportal
 Home-page: https://github.com/camptocamp/c2cgeoportal/
 Author: Camptocamp

{c2cgeoportal_geoportal-2.9.0.324.dist-info → c2cgeoportal_geoportal-2.9.0.325.dist-info}/RECORD

@@ -1,4 +1,4 @@
-c2cgeoportal_geoportal/__init__.py,sha256=hPoVL78ef1gwRn_thABVX63JpQ8huWorCJ6N4LtoR50,40070
+c2cgeoportal_geoportal/__init__.py,sha256=knkBNKoGXM6jjWtMXsp65W6r5M6Yij949MjtX4MioQ4,40227
 c2cgeoportal_geoportal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 c2cgeoportal_geoportal/resources.py,sha256=rDruIDlzwktqj_A-DFA7ZkWwkasVZ4KELCmUe61ghGI,2158
 c2cgeoportal_geoportal/lib/__init__.py,sha256=9BI0fqGiCOhegf7WmsP4_FxnlXzhZfguIwiIF1b2JI8,10431
@@ -20,7 +20,7 @@ c2cgeoportal_geoportal/lib/lingva_extractor.py,sha256=pS-B5oTcEkW__XUop6rWKdpJhn
 c2cgeoportal_geoportal/lib/loader.py,sha256=oN76GhbLbdmCWp3DFTq16HJSylnDApuS1Ea8D-DQA3o,2613
 c2cgeoportal_geoportal/lib/metrics.py,sha256=dAPdJtrtTPbwVuULZZ5dJC1JJCDbC0rJA7dtvsqIo40,4847
 c2cgeoportal_geoportal/lib/oauth2.py,sha256=03nV635IkGyu0EckvUc_0akG9YzpG3PSZ2ILt2TVieI,41107
-c2cgeoportal_geoportal/lib/oidc.py,sha256=h6mRllroNhp076q0pRGSnFoLDHO61zXLTfR1T6DfEK0,13400
+c2cgeoportal_geoportal/lib/oidc.py,sha256=PK6ot63GDg1LA82nVqvzNT8sI8-oyqk4vGpfm_MzCg0,13912
 c2cgeoportal_geoportal/lib/wmstparsing.py,sha256=KFMEv7Skqc9HFA1m7x2xQMu4Bk2gJsyp5XTGwLLXb7w,12379
 c2cgeoportal_geoportal/lib/xsd.py,sha256=_JDDlMIsvThb9DGmHS3XMazlRYG3AQK8kHQ4pq6sH8s,7031
 c2cgeoportal_geoportal/scaffolds/advance_create/cookiecutter.json,sha256=1LVOM-j_nd00J89q0EI3bQUvIysbidApaVHDibA2ydk,524
@@ -160,7 +160,7 @@ c2cgeoportal_geoportal/views/fulltextsearch.py,sha256=i6d0-1N2pNG6KWq9Bih_kD4TQA
 c2cgeoportal_geoportal/views/geometry_processing.py,sha256=IWzAgi29nytLIB3PdjoLqXUoSXEO9HcMjjNWEE9shv4,2958
 c2cgeoportal_geoportal/views/i18n.py,sha256=9e5VIGmKgOUTAn8R3ch98VXDpH70UZpHZ9hLkzHAW14,5343
 c2cgeoportal_geoportal/views/layers.py,sha256=qGO_eQw09pcG9KerEe5y7ktlgUqcJywBPMm4KE14g44,29226
-c2cgeoportal_geoportal/views/login.py,sha256=9nFtMzPAPVoUhS3KmojrX3tyeInVkwjwZRqfroF444k,29360
+c2cgeoportal_geoportal/views/login.py,sha256=xFLXpZtEYRI6UIX7zfoCB0lDPTgvGjkUBp0WjBEoHp0,29389
 c2cgeoportal_geoportal/views/mapserverproxy.py,sha256=zaTveZ0NK6KCcXWougfLNKqy5SIzlDUNnzGxQ0NVhKM,9498
 c2cgeoportal_geoportal/views/memory.py,sha256=s8l5ewxjl_kaK7sH45SmMdr3ZZqvpW4QLKCaSh9i5YA,3754
 c2cgeoportal_geoportal/views/ogcproxy.py,sha256=81S4du9IgTLe7t67QyjMNuUGZYkwaDY10hxPwLhizxg,5215
@@ -187,8 +187,8 @@ tests/test_mapserverproxy_route_predicate.py,sha256=aH5r5MliqE5RF4J7Q-luQQ6sgOcM
 tests/test_raster.py,sha256=IzwJMGti82B51aVfy2QbeNeJXn3B6bM-JnbYpt5KqB4,11948
 tests/test_wmstparsing.py,sha256=DMUFSrJAyRfOhosD8Ap5251NCxfaX7vmkWmexdc6CDU,9054
 tests/xmlstr.py,sha256=vozYRYG4sBPhasl4PemLUZxg-jAtQxUY5ntp1uDoxik,5985
-c2cgeoportal_geoportal-2.9.0.324.dist-info/METADATA,sha256=RVKIWjjrwJOIQqmyCQBiYRtCM679K7jc-RIV2whNwFc,2049
-c2cgeoportal_geoportal-2.9.0.324.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9.0.324.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9.0.324.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9.0.324.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9.0.325.dist-info/METADATA,sha256=xK_pSK9dNkAB-05iBrTZ2--AszDJzGF35M6NtIHJKXI,2049
+c2cgeoportal_geoportal-2.9.0.325.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9.0.325.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9.0.325.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9.0.325.dist-info/RECORD,,