Basic class to provide the dump, flush and load methods.

Bumped version.

Author: rohe

src/oidcmsg/__init__.py

@@ -1,5 +1,5 @@
 __author__ = 'Roland Hedberg'
-__version__ = '1.1.5'
+__version__ = '1.2.0'
 
 import os
 

src/oidcmsg/impexp.py

@@ -1,4 +1,5 @@
 import copy
+from typing import List
 from typing import Optional
 from urllib.parse import quote_plus
 
@@ -26,32 +27,32 @@ class ImpExp:
     def __init__(self):
         pass
 
-    def _dump(self, cls, item, cutoff: Optional[list] = None):
+    def _dump(self, cls, item, exclude_attribute: Optional[list] = None):
         if cls in [None, "", [], {}]:
             val = item
         elif isinstance(item, Message):
             val = {qualified_name(item.__class__): item.to_dict()}
         elif cls == object:
             val = qualified_name(item)
         elif isinstance(cls, list):
-            val = [self._dump(cls[0], v, cutoff) for v in item]
+            val = [self._dump(cls[0], v, exclude_attribute) for v in item]
         else:
-            val = item.dump(cutoff=cutoff)
+            val = item.dump(exclude_attribute=exclude_attribute)
 
         return val
 
-    def dump(self, cutoff: Optional[list] = None) -> dict:
-        _cutoff = cutoff or []
+    def dump(self, exclude_attribute: Optional[List[str]] = None) -> dict:
+        _exclude_attribute = exclude_attribute or []
         info = {}
         for attr, cls in self.parameter.items():
-            if attr in _cutoff:
+            if attr in _exclude_attribute:
                 continue
 
             item = getattr(self, attr, None)
             if item is None:
                 continue
 
-            info[attr] = self._dump(cls, item, cutoff)
+            info[attr] = self._dump(cls, item, exclude_attribute)
 
         return info
 

tests/test_11_impexp.py

@@ -0,0 +1,88 @@
+from cryptojwt import KeyBundle
+from cryptojwt.key_bundle import build_key_bundle
+
+from oidcmsg.impexp import ImpExp
+from oidcmsg.oauth2 import AuthorizationResponse
+from oidcmsg.oidc import AuthorizationRequest
+
+KEYSPEC = [
+    {"type": "RSA", "use": ["sig"]},
+    {"type": "EC", "crv": "P-256", "use": ["sig"]},
+]
+
+
+class ImpExpTest(ImpExp):
+    parameter = {
+        "string": "",
+        "list": [],
+        "dict": {},
+        "message": AuthorizationRequest,
+        "response_class": object,
+        "key_bundle": KeyBundle,
+        "bundles": [KeyBundle]
+    }
+
+
+def test_dump_load():
+    b = ImpExpTest()
+    b.string = "foo"
+    b.list = ["a", "b", "c"]
+    b.dict = {"a": 1, "b": 2}
+    b.message = AuthorizationRequest(scope="openid", redirect_uri="https://example.com/cb",
+                                     response_type="code", client_id="abcdefg")
+    b.response_class = AuthorizationResponse
+    b.key_bundle = build_key_bundle(key_conf=KEYSPEC)
+    b.bundles = [build_key_bundle(key_conf=KEYSPEC)]
+    b.bundles.append(build_key_bundle(key_conf=KEYSPEC))
+
+    dump = b.dump()
+
+    b_copy = ImpExpTest().load(dump)
+    assert b_copy
+    assert b_copy.list == b.list
+    assert b_copy.dict == b.dict
+    # Message doesn't implement __eq__
+    assert b_copy.message.__class__ == b.message.__class__
+    assert b_copy.response_class == b.response_class
+    # KeyBundle doesn't implement __eq__
+    assert b_copy.key_bundle.keys() == b.key_bundle.keys()
+    assert len(b_copy.bundles) == 2
+    for kb in b_copy.bundles:
+        assert isinstance(kb, KeyBundle)
+
+
+def test_flush():
+    b = ImpExpTest()
+    b.string = "foo"
+    b.list = ["a", "b", "c"]
+    b.dict = {"a": 1, "b": 2}
+    b.message = AuthorizationRequest(scope="openid", redirect_uri="https://example.com/cb",
+                                     response_type="code", client_id="abcdefg")
+    b.response_class = AuthorizationResponse
+    b.key_bundle = build_key_bundle(key_conf=KEYSPEC)
+    b.bundles = [build_key_bundle(key_conf=KEYSPEC)]
+    b.bundles.append(build_key_bundle(key_conf=KEYSPEC))
+
+    dump = b.dump()
+
+    b.flush()
+
+    assert b.string == ""
+    assert b.list == []
+    assert b.dict == {}
+    assert b.message is None
+    assert b.response_class is None
+    assert b.key_bundle is None
+    assert b.bundles is None
+
+    b.load(dump)
+
+    assert b.string == "foo"
+    assert b.list == ["a", "b", "c"]
+    assert b.dict == {"a": 1, "b": 2}
+    assert isinstance(b.message, AuthorizationRequest)
+    assert b.response_class == AuthorizationResponse
+    assert isinstance(b.key_bundle, KeyBundle)
+    assert len(b.bundles) == 2
+    for kb in b.bundles:
+        assert isinstance(kb, KeyBundle)