Merge pull request #35 from its-dirg/account-linking-enable

Remove 'enable' config param for AccountLinking.

Author: RebeckaG

example/plugins/microservices/account_linking.yaml.example

@@ -1,7 +1,6 @@
 module: satosa.micro_services.account_linking.AccountLinking
 name: AccountLinking
 config:
-  enable: Yes
   api_url: "https://localhost:8167"
   redirect_url: "https://localhost:8167/approve"
   sign_key: "pki/account_linking.key"

src/satosa/micro_services/account_linking.py

@@ -28,15 +28,11 @@ def __init__(self, config, *args, **kwargs):
         :param config: The SATOSA proxy config
         """
         super().__init__(*args, **kwargs)
-        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.signing_key = RSAKey(key=rsa_load(config["sign_key"]), use="sig", alg="RS256")
-            self.endpoint = "/handle_account_linking"
-            logger.info("Account linking is active")
-        else:
-            logger.info("Account linking is not active")
+        self.api_url = config["api_url"]
+        self.redirect_url = config["redirect_url"]
+        self.signing_key = RSAKey(key=rsa_load(config["sign_key"]), use="sig", alg="RS256")
+        self.endpoint = "/handle_account_linking"
+        logger.info("Account linking is active")
 
     def _handle_al_response(self, context):
         """
@@ -74,9 +70,6 @@ def process(self, context, internal_response):
         :return: response
         """
 
-        if not self.enabled:
-            return super().process(context, internal_response)
-
         status_code, message = self._get_uuid(context, internal_response.auth_info.issuer, internal_response.user_id)
 
         if status_code == 200:

tests/satosa/micro_services/test_account_linking.py

@@ -1,6 +1,5 @@
 import json
 import re
-from unittest.mock import Mock
 
 import pytest
 import requests
@@ -36,16 +35,6 @@ def create_account_linking(self, account_linking_config):
                                               base_url="https://satosa.example.com")
         self.account_linking.next = lambda ctx, data: data
 
-    def test_disable_account_linking(self, account_linking_config):
-        account_linking_config["enable"] = False
-        account_linking = AccountLinking(account_linking_config, name="AccountLinking",
-                                         base_url="https://satosa.example.com")
-        mock_next_callback = Mock()
-        account_linking.next = mock_next_callback
-        assert account_linking.enabled is False
-        account_linking.process(None, None)
-        assert mock_next_callback.called
-
     @responses.activate
     def test_existing_account_linking_with_known_known_uuid(self, account_linking_config, internal_response, context):
         uuid = "uuid"