In step with time

.github/workflows/python-ci.yml

@@ -21,6 +21,7 @@ jobs:
           - '3.7'
           - '3.8'
           - '3.9'
+          - '3.10'
 
     steps:
     - uses: actions/checkout@v2

setup.py

@@ -68,7 +68,7 @@ def run_tests(self):
         "Programming Language :: Python :: 3.10",
         "Topic :: Software Development :: Libraries :: Python Modules"],
     install_requires=[
-        "cryptojwt==1.6.1",
+        "cryptojwt>=1.7.1",
         "pyOpenSSL",
         "filelock>=3.0.12",
         'pyyaml>=5.1.2'

src/oidcmsg/configure.py

@@ -51,19 +51,30 @@ def add_base_path(conf: dict, base_path: str, attributes: List[str], attribute_t
     return conf
 
 
+def _conv(val, domain, port):
+    if isinstance(val, str) and ("{domain}" in val or "{port}" in val):
+        return val.format(domain=domain, port=port)
+
+    return val
+
+
 def set_domain_and_port(conf: dict, uris: List[str], domain: str, port: int):
+    update = {}
     for key, val in conf.items():
-        if key in uris:
-            if not val:
-                continue
+        if not val:
+            continue
 
-            if isinstance(val, list):
-                _new = [v.format(domain=domain, port=port) for v in val]
-            else:
-                _new = val.format(domain=domain, port=port)
-            conf[key] = _new
+        if isinstance(val, list):
+            _new = [_conv(v, domain=domain, port=port) for v in val]
         elif isinstance(val, dict):
-            conf[key] = set_domain_and_port(val, uris, domain, port)
+            _new = set_domain_and_port(val, uris, domain, port)
+        else:
+            _new = _conv(val, domain=domain, port=port)
+
+        if _new != val:
+            update[key] = _new
+    if update:
+        conf.update(update)
     return conf