c2cgeoportal-geoportal 2.9.0.185__py3-none-any.whl → 2.9.0.186__py3-none-any.whl

c2cgeoportal_geoportal/__init__.py

@@ -406,13 +406,29 @@ def create_get_user_from_request(
                         access_token_expires = dateutil.parser.isoparse(
                             user_info_remember["access_token_expires"]
                         )
-                        if access_token_expires < datetime.datetime.now():
+                        # If access_token_expires is not offset-aware make it offset-aware
+                        if access_token_expires.tzinfo is None:
+                            _LOG.warning(
+                                "access_token_expires is not offset-aware, "
+                                "make it offset-aware by replacing tzinfo with UTC"
+                            )
+                            access_token_expires = access_token_expires.replace(tzinfo=datetime.timezone.utc)
+                        if access_token_expires < datetime.datetime.now(datetime.timezone.utc):
                             if user_info_remember["refresh_token_expires"] is None:
                                 return None
                             refresh_token_expires = dateutil.parser.isoparse(
                                 user_info_remember["refresh_token_expires"]
                             )
-                            if refresh_token_expires < datetime.datetime.now():
+                            # If refresh_token_expires is not offset-aware make it offset-aware
+                            if refresh_token_expires.tzinfo is None:
+                                _LOG.warning(
+                                    "refresh_token_expires is not offset-aware, "
+                                    "make it offset-aware by replacing tzinfo with UTC"
+                                )
+                                refresh_token_expires = refresh_token_expires.replace(
+                                    tzinfo=datetime.timezone.utc
+                                )
+                            if refresh_token_expires < datetime.datetime.now(datetime.timezone.utc):
                                 return None
                             token_response = oidc.get_oidc_client(
                                 request, request.host

c2cgeoportal_geoportal/lib/oidc.py

@@ -269,14 +269,16 @@ class OidcRemember:
         remember_object: OidcRememberObject = {
             "access_token": token_response.access_token,
             "access_token_expires": (
-                datetime.datetime.now() + datetime.timedelta(seconds=token_response.expires_in)
+                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
                 else (
-                    datetime.datetime.now() + datetime.timedelta(seconds=token_response.refresh_expires_in)
+                    datetime.datetime.now(datetime.timezone.utc)
+                    + datetime.timedelta(seconds=token_response.refresh_expires_in)
                 ).isoformat()
             ),
             "username": None,

{c2cgeoportal_geoportal-2.9.0.185.dist-info → c2cgeoportal_geoportal-2.9.0.186.dist-info}/METADATA

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

{c2cgeoportal_geoportal-2.9.0.185.dist-info → c2cgeoportal_geoportal-2.9.0.186.dist-info}/RECORD

@@ -1,4 +1,4 @@
-c2cgeoportal_geoportal/__init__.py,sha256=yy2McB6HK2pGoLYAZ8sjkwXl_uxdKOVVmynOovyO0ks,38648
+c2cgeoportal_geoportal/__init__.py,sha256=A3Q4xMcX4stbklxdi-SlaloBsmS7CaVo7PkNLYxdSiU,39789
 c2cgeoportal_geoportal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 c2cgeoportal_geoportal/resources.py,sha256=n42Gns8DKw32GstDoUdNgud6xdAidaRwgAuNHqGH-c4,2158
 c2cgeoportal_geoportal/lib/__init__.py,sha256=_67fO_aXQZRnxPXcShHBcs38mdYU5ch0FNX89RwMTgA,10431
@@ -20,7 +20,7 @@ c2cgeoportal_geoportal/lib/lingva_extractor.py,sha256=pS-B5oTcEkW__XUop6rWKdpJhn
 c2cgeoportal_geoportal/lib/loader.py,sha256=vfjyuN2ry33Djc5KMTbibQ96uAw8oZyomAAwk0gbW5Q,2613
 c2cgeoportal_geoportal/lib/metrics.py,sha256=5HryUs6Rk6cmVvag5_FN-W2gcwsyJt3Xf9105TSO4mQ,4847
 c2cgeoportal_geoportal/lib/oauth2.py,sha256=1hXo78-8lg3OBvB0TK5zG5QawZnvroPhaVpTBtPZg8I,41107
-c2cgeoportal_geoportal/lib/oidc.py,sha256=r4O-htcKiyxUlzcNMkPJ3smaM7TkfHVT6bH1qYwm2Ss,13017
+c2cgeoportal_geoportal/lib/oidc.py,sha256=Uo6JAnKrWTaUY4_Kdl23cJFIP2C_OZjh8wWTsMB2Y-w,13095
 c2cgeoportal_geoportal/lib/wmstparsing.py,sha256=EWFXxZ_nK3vpx8H3dSKIJTnNAXoJmfhhHYkcG1bXluI,12379
 c2cgeoportal_geoportal/lib/xsd.py,sha256=V5dXPWTVIz04LoI5GDkorFnaLrLUhlw--c6NzWsAxfk,7031
 c2cgeoportal_geoportal/scaffolds/advance_create/cookiecutter.json,sha256=1LVOM-j_nd00J89q0EI3bQUvIysbidApaVHDibA2ydk,524
@@ -187,8 +187,8 @@ tests/test_mapserverproxy_route_predicate.py,sha256=SzILSSzIuilzIkUYVPZiVzLwW1du
 tests/test_raster.py,sha256=82NJ2MXgZlMqs0ytN-VgNw376iURdk4PkAg__dyh5ns,11948
 tests/test_wmstparsing.py,sha256=xjA8nJuXFl3H5Bfs4sJw_8qX8E8qvAALK7Hs2-DTP2A,9054
 tests/xmlstr.py,sha256=rkTKSU4FGjupBKLx75H8o-goB0KbQrxDvdpc6xVX_uQ,5985
-c2cgeoportal_geoportal-2.9.0.185.dist-info/METADATA,sha256=DpBClNsORTKNp1sGDEH6SHG3V3fYgx9f4qU9gQQ7PzQ,1923
-c2cgeoportal_geoportal-2.9.0.185.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9.0.185.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9.0.185.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9.0.185.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9.0.186.dist-info/METADATA,sha256=lpur6TbgQCA5eyey1tWS_Edq1Pq76_-_NltvtTChmtQ,1923
+c2cgeoportal_geoportal-2.9.0.186.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9.0.186.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9.0.186.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9.0.186.dist-info/RECORD,,