fix config parsing

synapse_sso_proconnect/proconnect_mapping.py

@@ -15,16 +15,16 @@
 
 @attr.s(slots=True, frozen=True, auto_attribs=True)
 class ProConnectMappingConfig:
-    mapper_new_old_domain:Dict[str, str]= {}
+    user_id_lookup_fallback_rules:Dict[str, str]= {}
 
 class ProConnectMappingProvider(OidcMappingProvider[ProConnectMappingConfig]):
-    def __init__(self, config: Dict[str, str], module_api: ModuleApi):
+    def __init__(self, config: ProConnectMappingConfig, module_api: ModuleApi):
         self.module_api = module_api
-        self.config_mapper = self.parse_config(config)
+        self._config=config
 
     @staticmethod
-    def parse_config(config_dict: Dict[str, str]) -> ProConnectMappingConfig:
-        return ProConnectMappingConfig(**config_dict)
+    def parse_config(config: Dict[str, Any]) -> ProConnectMappingConfig:
+        return ProConnectMappingConfig(**config)
 
     def get_remote_user_id(self, userinfo: UserInfo) -> str:
         return userinfo.sub
@@ -85,9 +85,8 @@ async def search_user_id_by_threepid(self, email: str):
 
         # If userId is not found, attempt replacements
         if not userId:
-
             # Iterate through all mappings
-            for old_value, new_value in  self.config_mapper.mapper_new_old_domain.items():
+            for old_value, new_value in  self._config.user_id_lookup_fallback_rules.items():
                 # Check if the key (old_value) exists within the email
                 if old_value in email:
                     # Replace the old value with the new value

tests/test_proconnect_mapping.py

@@ -15,14 +15,15 @@ def create_module(config
         else "test-old" if email == "[email protected]"  
         else None
     )
-    return ProConnectMappingProvider(config, module_api)
+    parsed_config = ProConnectMappingProvider.parse_config(config)
+    return ProConnectMappingProvider(parsed_config, module_api)
 
 
 class ProConnectMappingTest(aiounittest.AsyncTestCase):
     #def setUp(self) -> None:
 
     async def test_with_map_should_replace(self):
-        self.module = create_module({"mapper_new_old_domain":{"new.fr": "beta.fr"}}) 
+        self.module = create_module({"user_id_lookup_fallback_rules":{"new.fr": "beta.fr"}}) 
         # Call the tested function with an email that requires replacement
         user_id = await self.module.search_user_id_by_threepid("[email protected]")   
         # Assertions
@@ -32,7 +33,7 @@ async def test_with_map_should_replace(self):
 
 
     async def test_replace_by_priority(self):
-        self.module = create_module({"mapper_new_old_domain":{
+        self.module = create_module({"user_id_lookup_fallback_rules":{
             "[email protected]":"[email protected]",
             "new.fr": "beta.fr"}})#replace by domain leads to a dead-end but it lower in the list
 
@@ -44,7 +45,7 @@ async def test_replace_by_priority(self):
         self.assertEqual(user_id, "test-old")  # Should match the replaced email
 
     async def test_with_map_should_not_replace(self):
-        self.module = create_module({"mapper_new_old_domain":{"new.fr": "beta.fr"}}) 
+        self.module = create_module({"user_id_lookup_fallback_rules":{"new.fr": "beta.fr"}}) 
 
         # Call the tested function with an email that requires replacement
         user_id = await self.module.search_user_id_by_threepid("[email protected]")
@@ -54,7 +55,7 @@ async def test_with_map_should_not_replace(self):
 
     async def test_with_empty_map(self):
 
-        self.module = create_module({"mapper_new_old_domain":{}})
+        self.module = create_module({"user_id_lookup_fallback_rules":{}})
 
         # Call the tested function with an email that requires replacement
         user_id = await self.module.search_user_id_by_threepid("[email protected]")