Merge pull request #36 from its-dirg/consent-enable

Remove 'enable' config param for Consent

Author: RebeckaG

example/plugins/microservices/consent.yaml.example

@@ -1,7 +1,6 @@
-module: satosa.micro_services.account_linking.Consent
+module: satosa.micro_services.consent.Consent
 name: Consent
 config:
-  enable: Yes
   api_url: "https://127.0.0.1:8166"
   redirect_url: "https://localhost:8166/consent"
   sign_key: "pki/mykey.pem"

src/satosa/micro_services/consent.py

@@ -34,19 +34,15 @@ class Consent(ResponseMicroService):
     def __init__(self, config, internal_attributes, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.name = "consent"
-        self.enabled = ("enable" not in config or config["enable"])
-        if self.enabled:
-            self.api_url = config["api_url"]
-            self.redirect_url = config["redirect_url"]
-            self.locked_attr = None
-            if "user_id_to_attr" in internal_attributes:
-                self.locked_attr = internal_attributes["user_id_to_attr"]
-
-            self.signing_key = RSAKey(key=rsa_load(config["sign_key"]), use="sig", alg="RS256")
-            self.endpoint = "/handle_consent"
-            logger.info("Consent flow is active")
-        else:
-            logger.info("Consent flow is not active")
+        self.api_url = config["api_url"]
+        self.redirect_url = config["redirect_url"]
+        self.locked_attr = None
+        if "user_id_to_attr" in internal_attributes:
+            self.locked_attr = internal_attributes["user_id_to_attr"]
+
+        self.signing_key = RSAKey(key=rsa_load(config["sign_key"]), use="sig", alg="RS256")
+        self.endpoint = "/handle_consent"
+        logger.info("Consent flow is active")
 
     def _handle_consent_response(self, context):
         """
@@ -118,9 +114,6 @@ def process(self, context, internal_response):
         :param internal_response: the response
         :return: response
         """
-        if not self.enabled:
-            return super().process(context, internal_response)
-
         consent_state = context.state[STATE_KEY]
 
         internal_response.attributes = self._filter_attributes(internal_response.attributes, consent_state["filter"])

tests/satosa/micro_services/test_consent.py

@@ -87,17 +87,6 @@ def assert_registration_req(self, request, internal_response, sign_key_path, bas
         assert consent_args["locked_attrs"] == [USER_ID_ATTR]
         assert "id" in consent_args
 
-    def test_disabled_consent(self, consent_config):
-        consent_config["enable"] = False
-        consent_module = Consent(consent_config, {"attributes": {}}, name="Consent",
-                                 base_url="https://satosa.example.com")
-        mock_next_callback = Mock()
-        consent_module.next = mock_next_callback
-
-        assert consent_module.enabled is False
-        consent_module.process(None, None)
-        assert mock_next_callback.called
-
     @responses.activate
     def test_verify_consent_false_on_http_400(self, consent_config):
         consent_id = "1234"