Works with the new storage interface

Author: rohe

setup.py

@@ -68,7 +68,7 @@ def run_tests(self):
         "Topic :: Software Development :: Libraries :: Python Modules"],
     install_requires=[
         "pyyaml>=5.1.0",
-        'oidcmsg>=1.0.0',
+        'oidcmsg>=1.1.0',
     ],
     tests_require=[
         "responses",

src/oidcservice/__init__.py

@@ -9,7 +9,7 @@
 
 
 __author__ = 'Roland Hedberg'
-__version__ = '1.0.0'
+__version__ = '1.1.0'
 
 
 OIDCONF_PATTERN = "{}/.well-known/openid-configuration"

src/oidcservice/state_interface.py

@@ -53,6 +53,24 @@ def delete(self, key):
         except KeyError:
             pass
 
+    def __setitem__(self, key, value):
+        """Assign a value to a key."""
+        self._db[key] = value
+
+    def __getitem__(self, key):
+        """Return the value bound to a key."""
+        try:
+            return self._db[key]
+        except KeyError:
+            return None
+
+    def __delitem__(self, key):
+        """Delete a key and its value."""
+        try:
+            del self._db[key]
+        except KeyError:
+            pass
+
 
 class StateInterface:
     """A more powerful interface to a state DB."""
@@ -92,7 +110,7 @@ def store_item(self, item, item_type, key):
         except AttributeError:
             _state[item_type] = item
 
-        self.state_db.set(key, _state.to_json())
+        self.state_db[key] = _state.to_json()
 
     def get_iss(self, key):
         """
@@ -216,7 +234,7 @@ def store_x2state(self, value, state, xtyp):
         :param state: The state value
         :param xtyp: The type of value x is (e.g. nonce, ...)
         """
-        self.state_db.set(KEY_PATTERN[xtyp].format(value), state)
+        self.state_db[KEY_PATTERN[xtyp].format(value)] = state
         try:
             _val = self.state_db.get("ref{}ref".format(state))
         except KeyError:
@@ -227,7 +245,7 @@ def store_x2state(self, value, state, xtyp):
         else:
             refs = json.loads(_val)
             refs[xtyp] = value
-        self.state_db.set("ref{}ref".format(state), json.dumps(refs))
+        self.state_db["ref{}ref".format(state)] = json.dumps(refs)
 
     def get_state_by_x(self, value, xtyp):
         """
@@ -346,7 +364,7 @@ def create_state(self, iss, key=''):
                     'Invalid format. Leading and trailing "__" not allowed')
 
         _state = State(iss=iss)
-        self.state_db.set(key, _state.to_json())
+        self.state_db[key] = _state.to_json()
         return key
 
     def remove_state(self, state):

tests/test_09_client_auth.py

@@ -196,7 +196,7 @@ def test_construct(self, services):
 
     def test_construct_with_state(self, services):
         _srv = services['authorization']
-        _srv.state_db.set('FFFFF', State(iss='Issuer').to_json())
+        _srv.state_db['FFFFF'] = State(iss='Issuer').to_json()
 
         resp = AuthorizationResponse(code="code", state="FFFFF")
         _srv.store_item(resp, 'auth_response', 'FFFFF')
@@ -215,8 +215,7 @@ def test_construct_with_state(self, services):
 
     def test_construct_with_request(self, services):
         authz_service = services['authorization']
-        authz_service.service_context.state_db.set('EEEE', State(
-            iss='Issuer').to_json())
+        authz_service.service_context.state_db['EEEE'] = State(iss='Issuer').to_json()
         resp1 = AuthorizationResponse(code="auth_grant", state="EEEE")
         response = authz_service.parse_response(resp1.to_urlencoded(),
                                                 "urlencoded")

tests/test_14_pkce.py

@@ -75,7 +75,7 @@ def create_client(self):
     def test_add_code_challenge_default_values(self):
         auth_serv = self.service["authorization"]
         _state = State(iss='Issuer')
-        auth_serv.service_context.state_db.set('state', _state.to_json())
+        auth_serv.service_context.state_db['state'] = _state.to_json()
         request_args, _ = add_code_challenge({'state': 'state'}, auth_serv)
 
         # default values are length:64 method:S256
@@ -89,7 +89,7 @@ def test_add_code_challenge_default_values(self):
     def test_authorization_and_pkce(self):
         auth_serv = self.service["authorization"]
         _state = State(iss='Issuer')
-        auth_serv.service_context.state_db.set('state', _state.to_json())
+        auth_serv.service_context.state_db['state'] = _state.to_json()
 
         request = auth_serv.construct_request({"state": 'state', "response_type": "code"})
         assert set(request.keys()) == {'client_id', 'code_challenge',

tests/test_30_persistence.py

@@ -127,10 +127,8 @@ def build_service_context() -> object:
             "jwks_uri": "{}/static/jwks.json".format(RP_BASEURL),
             'jwks': RP_JWKS,
             'db_conf': {
-                'abstract_storage_cls':
-                    'oidcmsg.storage.extension.LabeledAbstractStorage',
                 'keyjar': {
-                    'handler': 'oidcmsg.storage.abfile.AbstractFileSystem',
+                    'handler': 'oidcmsg.storage.abfile.LabeledAbstractFileSystem',
                     'fdir': 'db/{issuer}/keyjar',
                     'key_conv': 'oidcmsg.storage.converter.QPKey',
                     'value_conv': 'cryptojwt.serialize.item.KeyIssuer',