jaaql-middleware-python 4.27.0__tar.gz → 4.27.1__tar.gz

{jaaql-middleware-python-4.27.0/jaaql_middleware_python.egg-info → jaaql-middleware-python-4.27.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaaql-middleware-python
-Version: 4.27.0
+Version: 4.27.1
 Summary: The jaaql package, allowing for rapid development and deployment of RESTful HTTP applications
 Home-page: https://github.com/JAAQL/JAAQL-middleware-python
 Author: Software Quality Measurement and Improvement bv

{jaaql-middleware-python-4.27.0 → jaaql-middleware-python-4.27.1}/jaaql/constants.py

@@ -183,5 +183,5 @@ ROLE__postgres = "postgres"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "4.27.0"
+VERSION = "4.27.1"
 

{jaaql-middleware-python-4.27.0 → jaaql-middleware-python-4.27.1}/jaaql/mvc/model.py

@@ -572,6 +572,20 @@ WHERE
 
         kwargs = {}
         if self.use_fapi_advanced:
+            token_request_payload = {
+                **token_request_payload,
+                "iss": database_user_registry[KG__database_user_registry__client_id],
+                "aud": discovery.get("pushed_authorization_request_endpoint"),
+                "jti": str(uuid.uuid4()),
+                "iat": int(time.time()),
+                "exp": int(time.time()) + 300  # Token valid for 5 minutes
+            }
+            token_request_payload = {
+                "client_id": database_user_registry[KG__database_user_registry__client_id],
+                "request": jwt.encode(token_request_payload, self.fapi_pem, algorithm="PS256", headers={
+                    "kid": self.jwks["keys"][0]["kid"]
+                })
+            }
             kwargs["verify"] = True
             kwargs["cert"] = (f"/etc/letsencrypt/live/{self.application_url}/fullchain.pem", f"/etc/letsencrypt/live/{self.application_url}/privkey.pem")
         else:
@@ -791,7 +805,7 @@ WHERE
         par_endpoint = par_endpoint.replace("localhost", "host.docker.internal")
 
         par_payload = {
-            "client_id": client_id,
+            "client_id": database_user_registry[KG__database_user_registry__client_id],
             "response_type": "code",
             "code_challenge_method": "S256",
             "scope": " ".join(["openid"]),  # should later be default scopes, may cause issues now
@@ -803,8 +817,22 @@ WHERE
 
         kwargs = {}
         if self.use_fapi_advanced:
+            payload = {
+                **par_payload,
+                "iss": database_user_registry[KG__database_user_registry__client_id],
+                "aud": discovery.get("pushed_authorization_request_endpoint"),
+                "jti": str(uuid.uuid4()),
+                "iat": int(time.time()),
+                "exp": int(time.time()) + 300  # Token valid for 5 minutes
+            }
+            par_payload = {
+                "client_id": database_user_registry[KG__database_user_registry__client_id],
+                "request": jwt.encode(payload, self.fapi_pem, algorithm="PS256", headers={
+                    "kid": self.jwks["keys"][0]["kid"]
+                })
+            }
             kwargs["verify"] = True
-            kwargs["cert"] = ("/tmp/client_cert.pem", "/tmp/client_key.pem")
+            kwargs["cert"] = (f"/etc/letsencrypt/live/{self.application_url}/fullchain.pem", f"/etc/letsencrypt/live/{self.application_url}/privkey.pem")
         else:
             payload = {
                 "iss": database_user_registry[KG__database_user_registry__client_id],

{jaaql-middleware-python-4.27.0 → jaaql-middleware-python-4.27.1/jaaql_middleware_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaaql-middleware-python
-Version: 4.27.0
+Version: 4.27.1
 Summary: The jaaql package, allowing for rapid development and deployment of RESTful HTTP applications
 Home-page: https://github.com/JAAQL/JAAQL-middleware-python
 Author: Software Quality Measurement and Improvement bv