fix(jans-cedarling): fix token handling (#10761)

* feat(jans-cedarling): fix tokens input Signed-off-by: SafinWasi <[email protected]> * chore: update dockerfile Signed-off-by: SafinWasi <[email protected]> --------- Signed-off-by: SafinWasi <[email protected]>
JanssenProject · Jan 30, 2025 · 2533e30 · 2533e30
1 parent c342a05
commit 2533e30
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/jans-cedarling/flask-sidecar/Dockerfile b/jans-cedarling/flask-sidecar/Dockerfile
@@ -31,7 +31,7 @@ RUN pip3 install "poetry==$POETRY_VERSION" gunicorn \
 # ===============
 # Project setup
 # ===============
-ENV JANS_SOURCE_VERSION=81b061d8a2777afafe3ea9b36859561715da5839
+ENV JANS_SOURCE_VERSION=0e628d72acbb674d9ea1fc2a290d010ef603ed24
 
 COPY docker-entrypoint.sh /
 RUN chmod +x /docker-entrypoint.sh

diff --git a/jans-cedarling/flask-sidecar/main/base/cedarling/cedarling.py b/jans-cedarling/flask-sidecar/main/base/cedarling/cedarling.py
@@ -19,8 +19,7 @@
 from cedarling_python import (
     ResourceData,
     Request,
-    AuthorizeResultResponse,
-    Tokens
+    AuthorizeResultResponse
 )
 from main.logger import logger
 from flask import Flask
@@ -119,7 +118,13 @@ def authorize(self,
         id_token = subject["properties"].get("id_token", None)
         userinfo_token = subject["properties"].get("userinfo_token", None)
         try:
-            tokens = Tokens(access_token, id_token, userinfo_token)
+            tokens={}
+            if access_token is not None:
+                tokens["access_token"] = access_token
+            if id_token is not None:
+                tokens["id_token"] = id_token
+            if userinfo_token is not None:
+                tokens["userinfo_token"] = userinfo_token
             request = Request(tokens, action_entity, resource_entity, context)
             authorize_result = self._cedarling.authorize(request)
         except Exception as e: