Upgrade to latest pyop

Signed-off-by: Ivan Kanakarakis <[email protected]>

Author: c00kiemon5ter

setup.py

@@ -15,7 +15,7 @@
     packages=find_packages('src/'),
     package_dir={'': 'src'},
     install_requires=[
-        "pyop >= 2.1.0",
+        "pyop >= 3.0.1",
         "pysaml2",
         "pycryptodomex",
         "requests",

src/satosa/frontends/openid_connect.py

@@ -125,7 +125,6 @@ def handle_authn_response(self, context, internal_resp, extra_id_token_claims=No
             auth_req,
             internal_resp.subject_id,
             extra_id_token_claims=extra_id_token_claims,
-            extra_scopes=self.config.get("extra_scopes"),
         )
 
         del context.state[self.name]
@@ -360,7 +359,6 @@ def userinfo_endpoint(self, context):
             response = self.provider.handle_userinfo_request(
                 request=urlencode(context.request),
                 http_headers=headers,
-                extra_scopes=self.config.get("extra_scopes"),
             )
             return Response(response.to_json(), content="application/json")
         except (BearerTokenError, InvalidAccessToken) as e:

tests/satosa/frontends/test_openid_connect.py

@@ -186,19 +186,21 @@ def test_provider_configuration_endpoint(self, context, frontend):
             "claims_parameter_supported": True,
             "request_parameter_supported": False,
             "request_uri_parameter_supported": False,
-            "scopes_supported": ["openid", "email"],
             "claims_supported": ["email"],
             "grant_types_supported": ["authorization_code", "implicit"],
             "issuer": BASE_URL,
-            "require_request_uri_registration": True,
+            "require_request_uri_registration": False,
             "token_endpoint_auth_methods_supported": ["client_secret_basic"],
             "version": "3.0"
         }
 
         http_response = frontend.provider_config(context)
         provider_config = ProviderConfigurationResponse().deserialize(http_response.message, "json")
 
-        assert provider_config.to_dict() == expected_capabilities
+        provider_config_dict = provider_config.to_dict()
+        scopes_supported = provider_config_dict.pop("scopes_supported")
+        assert all(scope in scopes_supported for scope in ["openid", "email"])
+        assert provider_config_dict == expected_capabilities
 
     def test_jwks(self, context, frontend):
         http_response = frontend.jwks(context)