Fixed tests.

Author: rohe

tests/request123456.jwt

@@ -1 +1 @@
-eyJhbGciOiJSUzI1NiIsImtpZCI6IlNVc3dOaTFNUkZsRFQwWTJZalUxWjFSZlFsbzJTM2RFYTNGVFRrVjNMVGhGY25oRFRIRjVlbGsyVlEifQ.eyJyZXNwb25zZV90eXBlIjogImNvZGUiLCAic3RhdGUiOiAic3RhdGUiLCAicmVkaXJlY3RfdXJpIjogImh0dHBzOi8vZXhhbXBsZS5jb20vY2xpL2F1dGh6X2NiIiwgInNjb3BlIjogIm9wZW5pZCIsICJub25jZSI6ICJWNVFGVUxMWGpBS0lOS3V3Y2JlVU43OHRuWkZ2MGloYyIsICJjbGllbnRfaWQiOiAiY2xpZW50X2lkIiwgImlzcyI6ICJjbGllbnRfaWQiLCAiaWF0IjogMTYxNzg3MDI0NiwgImF1ZCI6IFsiaHR0cHM6Ly9leGFtcGxlLmNvbSJdfQ.itHjMHec6T2py2zDxaAS11tFAYdsTZ-SY3AV2j5SCTHPfk9CkXa6g6s_t0oVvcdzLVXaqQ1iU9WqOeirwj4UDxCTHulPzBOcBuC3WbCki2HT9EPI88Lov-kCuz_4juw97lIyU1BkaofaZJSjRcEW_fOY0KuP7BKIDmthTLTWxEGMoMXmXcs_QD13tz0IWjrkqjwbcKjbUxrvGHJbOnOBGwgHPPm46otDMO-hQrtvTOGz4PbdD5XZ4imDV0bJkx72ITpAfM8iODmd9sKrOWkEZEhsRG1ugXa8RgOPNLsLTLjTpzWiVeczJHOiE5H4EC-uwzXiRDiShq-q7VbTKocyYw
+eyJhbGciOiJSUzI1NiIsImtpZCI6IlNVc3dOaTFNUkZsRFQwWTJZalUxWjFSZlFsbzJTM2RFYTNGVFRrVjNMVGhGY25oRFRIRjVlbGsyVlEifQ.eyJyZXNwb25zZV90eXBlIjogImNvZGUiLCAic3RhdGUiOiAic3RhdGUiLCAicmVkaXJlY3RfdXJpIjogImh0dHBzOi8vZXhhbXBsZS5jb20vY2xpL2F1dGh6X2NiIiwgInNjb3BlIjogIm9wZW5pZCIsICJub25jZSI6ICI4TjRoNW1DMXlUZ2FSZlM4YjhFQUNKREFSZTNFWjRDciIsICJjbGllbnRfaWQiOiAiY2xpZW50X2lkIiwgImlzcyI6ICJjbGllbnRfaWQiLCAiaWF0IjogMTYzMjU1NDEyNywgImF1ZCI6IFsiaHR0cHM6Ly9leGFtcGxlLmNvbSJdfQ.i41o35EdqXxjd_po9tL3PssPLhHime9coujYsnDcfFG3Fhc0AllQSO_cMPe_mKfqCfkpYg--ibohGS5OEIK_h2i9j7IILpCeXf9NWqesWastyUkuAEjrYOhmTx2UfWw5SOVRs3wi2FIsOiaf64gEe1T6dgmU9T0NzGWAa5pk9GAftv3RoOsz16riLgMSl8xBsP1ReSQINsbO6pmnlAY2xqEmJNprs0Vsb63Rt0NiiNe5e36RNkDzV-uhRZY6wfNKgcn5ygcwPvcJJErAbP5k-kkgQRwiBsz5E-rdH69jXpc9WJJddO9hA9DkcrVVTSi7wJa0oqLR1XxBTspBQNbt4w

tests/test_13_oidc_service.py

@@ -68,7 +68,7 @@ def create_request(self):
         }
         entity = Entity(services=DEFAULT_OIDC_SERVICES, keyjar=CLI_KEY, config=client_config)
         entity.client_get("service_context").issuer = 'https://example.com'
-        self.service = entity.client_get("service",'authorization')
+        self.service = entity.client_get("service", 'authorization')
 
     def test_construct(self):
         req_args = {
@@ -137,13 +137,12 @@ def test_request_init(self):
     def test_request_init_request_method(self):
         req_args = {'response_type': 'code', 'state': 'state'}
         self.service.endpoint = 'https://example.com/authorize'
-        _info = self.service.get_request_parameters(request_args=req_args,
-                                                    request_method='value')
+        _info = self.service.get_request_parameters(request_args=req_args, request_method='value')
         assert set(_info.keys()) == {'url', 'method', 'request'}
         msg = AuthorizationRequest().from_urlencoded(
             self.service.get_urlinfo(_info['url']))
-        assert set(msg.to_dict()) == {'client_id', 'redirect_uri', 'request',
-                                      'response_type', 'state', 'scope', 'nonce'}
+        assert set(msg.to_dict()) == {'client_id', 'redirect_uri', 'request', 'response_type',
+                                      'scope'}
         _jws = jws.factory(msg['request'])
         assert _jws
         _resp = _jws.verify_compact(
@@ -267,7 +266,7 @@ def create_request(self):
         }
         entity = Entity(keyjar=CLI_KEY, config=client_config, services=DEFAULT_OIDC_SERVICES)
         entity.client_get("service_context").issuer = 'https://example.com'
-        self.service = entity.client_get("service",'authorization')
+        self.service = entity.client_get("service", 'authorization')
 
     def test_construct_code(self):
         req_args = {
@@ -318,7 +317,7 @@ def create_request(self):
         }
         entity = Entity(keyjar=CLI_KEY, config=client_config, services=DEFAULT_OIDC_SERVICES)
         entity.client_get("service_context").issuer = 'https://example.com'
-        self.service = entity.client_get("service",'accesstoken')
+        self.service = entity.client_get("service", 'accesstoken')
 
         # add some history
         auth_request = AuthorizationRequest(
@@ -409,7 +408,7 @@ def create_service(self):
         }
         entity = Entity(keyjar=CLI_KEY, config=client_config, services=DEFAULT_OIDC_SERVICES)
         entity.client_get("service_context").issuer = 'https://example.com'
-        self.service = entity.client_get("service",'provider_info')
+        self.service = entity.client_get("service", 'provider_info')
 
     def test_construct(self):
         _req = self.service.construct()
@@ -601,7 +600,7 @@ def create_request(self):
         }
         entity = Entity(keyjar=CLI_KEY, config=client_config, services=DEFAULT_OIDC_SERVICES)
         entity.client_get("service_context").issuer = 'https://example.com'
-        self.service = entity.client_get("service",'registration')
+        self.service = entity.client_get("service", 'registration')
 
     def test_construct(self):
         _req = self.service.construct()
@@ -638,7 +637,7 @@ def create_request(self):
         }
         entity = Entity(keyjar=CLI_KEY, config=client_config, services=DEFAULT_OIDC_SERVICES)
         entity.client_get("service_context").issuer = 'https://example.com'
-        self.service = entity.client_get("service",'userinfo')
+        self.service = entity.client_get("service", 'userinfo')
 
         entity.client_get("service_context").behaviour = {
             'userinfo_signed_response_alg': 'RS256',
@@ -780,7 +779,7 @@ def create_request(self):
             }}
         entity = Entity(keyjar=CLI_KEY, config=client_config, services=services)
         entity.client_get("service_context").issuer = 'https://example.com'
-        self.service = entity.client_get("service",'check_session')
+        self.service = entity.client_get("service", 'check_session')
 
     def test_construct(self):
         _state_interface = self.service.client_get("service_context").state
@@ -809,7 +808,7 @@ def create_request(self):
             }}
         entity = Entity(keyjar=CLI_KEY, config=client_config, services=services)
         entity.client_get("service_context").issuer = 'https://example.com'
-        self.service = entity.client_get("service",'check_id')
+        self.service = entity.client_get("service", 'check_id')
 
     def test_construct(self):
         _state_interface = self.service.client_get("service_context").state
@@ -839,7 +838,7 @@ def create_request(self):
             }}
         entity = Entity(keyjar=CLI_KEY, config=client_config, services=services)
         entity.client_get("service_context").issuer = 'https://example.com'
-        self.service = entity.client_get("service",'end_session')
+        self.service = entity.client_get("service", 'end_session')
 
     def test_construct(self):
         self.service.client_get("service_context").state.store_item(
@@ -880,7 +879,7 @@ def test_authz_service_conf():
     }
     entity = Entity(keyjar=CLI_KEY, config=client_config, services=services)
     entity.client_get("service_context").issuer = 'https://example.com'
-    service = entity.client_get("service",'authorization')
+    service = entity.client_get("service", 'authorization')
 
     req = service.construct()
     assert 'claims' in req
@@ -900,7 +899,7 @@ def test_add_jwks_uri_or_jwks_0():
     }
     entity = Entity(keyjar=CLI_KEY, config=client_config, services=DEFAULT_OIDC_SERVICES)
     entity.client_get("service_context").issuer = 'https://example.com'
-    service = entity.client_get("service",'registration')
+    service = entity.client_get("service", 'registration')
 
     req_args, post_args = add_jwks_uri_or_jwks({}, service)
     assert req_args['jwks_uri'] == 'https://example.com/jwks/jwks.json'
@@ -919,7 +918,7 @@ def test_add_jwks_uri_or_jwks_1():
         }
     }
     entity = Entity(keyjar=CLI_KEY, config=client_config, services=DEFAULT_OIDC_SERVICES)
-    service = entity.client_get("service",'registration')
+    service = entity.client_get("service", 'registration')
 
     req_args, post_args = add_jwks_uri_or_jwks({}, service)
     assert req_args['jwks_uri'] == 'https://example.com/jwks/jwks.json'
@@ -938,7 +937,7 @@ def test_add_jwks_uri_or_jwks_2():
     }
     entity = Entity(keyjar=CLI_KEY, config=client_config,
                     jwks_uri='https://example.com/jwks/jwks.json', services=DEFAULT_OIDC_SERVICES)
-    service = entity.client_get("service",'registration')
+    service = entity.client_get("service", 'registration')
 
     req_args, post_args = add_jwks_uri_or_jwks({}, service)
     assert req_args['jwks_uri'] == 'https://example.com/jwks/jwks.json'

tests/test_20_rp_handler_oidc.py

@@ -846,7 +846,7 @@ def rphandler_setup(self):
         self.issuer = 'https://github.com/login/oauth/authorize'
         self.mock_op = MockOP(issuer=self.issuer)
         self.rph = RPHandler(BASE_URL, client_configs=CLIENT_CONFIG,
-                             http_lib=self.mock_op, keyjar=KeyJar())
+                             http_lib=self.mock_op, keyjar=CLI_KEY)
 
     def test_finalize(self):
         auth_query = self.rph.begin(issuer_id='github')