update T2E users as if they are the linked identity type

Author: adorton-adobe

user_sync/app.py

@@ -457,7 +457,7 @@ def begin_work(config_loader):
             raise AssertionException(
                 "Failed to enable dynamic group mappings. 'dynamic_group_member_attribute' is not defined in config")
     primary_name = '.primary' if secondary_umapi_configs else ''
-    umapi_primary_connector = user_sync.connector.umapi.UmapiConnector(primary_name, primary_umapi_config)
+    umapi_primary_connector = user_sync.connector.umapi.UmapiConnector(primary_name, primary_umapi_config, True)
     umapi_other_connectors = {}
     for secondary_umapi_name, secondary_config in six.iteritems(secondary_umapi_configs):
         umapi_secondary_conector = user_sync.connector.umapi.UmapiConnector(".secondary.%s" % secondary_umapi_name,

user_sync/connector/umapi.py

@@ -46,7 +46,7 @@ class UmapiConnector(object):
     # class-level flag that determines if we are creating a UMAPI connection
     # set to False if using in a unit test
     create_conn = True
-    def __init__(self, name, caller_options):
+    def __init__(self, name, caller_options, is_primary=False):
         """
         :type name: str
         :type caller_options: dict
@@ -57,6 +57,7 @@ def __init__(self, name, caller_options):
         if self.trusted is None:
             self.trusted = False
         self.uses_business_id = caller_config.get_bool('uses_business_id', True)
+        self.is_primary = is_primary
         builder = user_sync.config.OptionsBuilder(caller_config)
         builder.set_string_value('logger_name', self.name)
         builder.set_bool_value('test_mode', False)

user_sync/rules.py

@@ -27,6 +27,7 @@
 import user_sync.connector.umapi
 import user_sync.error
 import user_sync.identity_type
+from user_sync.connector.umapi import UmapiConnector
 from user_sync.post_sync.manager import PostSyncData
 from user_sync.helper import normalize_string, CSVAdapter, JobStats
 
@@ -113,6 +114,7 @@ def __init__(self, caller_options):
         self.primary_users_created = set()
         self.secondary_users_created = set()
         self.updated_user_keys = set()
+        self.primary_users_by_email: dict[str, dict] = {}
 
         # stray key input path comes in, stray_list_output_path goes out
         self.stray_key_map = {}
@@ -912,7 +914,7 @@ def update_umapi_user(self, umapi_info, user_key, attributes_to_update=None, gro
         commands.add_groups(groups_to_add)
         return commands
 
-    def update_umapi_users_for_connector(self, umapi_info, umapi_connector):
+    def update_umapi_users_for_connector(self, umapi_info, umapi_connector: UmapiConnector):
         """
         This is the main function that goes over adobe users and looks for and processes differences.
         It is called with a particular organization that it should manage groups against.
@@ -950,6 +952,9 @@ def update_umapi_users_for_connector(self, umapi_info, umapi_connector):
         # Walk all the adobe users, getting their group data, matching them with directory users,
         # and adjusting their attribute and group data accordingly.
         for umapi_user in umapi_users:
+            # if target is ESM, then treat existing AdobeID (i.e. businessID) as linked identity type
+            if umapi_connector.uses_business_id and umapi_user['email'] in self.primary_users_by_email:
+                umapi_user['type'] = self.primary_users_by_email[umapi_user['email']]['type']
             # let save adobeID users to a seperate list
             self.filter_adobeID_user(umapi_user)
             # get the basic data about this user; initialize change markers to "no change"
@@ -979,6 +984,9 @@ def update_umapi_users_for_connector(self, umapi_info, umapi_connector):
 
             self.map_email_override(umapi_user)
 
+            if umapi_connector.is_primary:
+                self.primary_users_by_email[umapi_user['email']] = umapi_user
+
             directory_user = filtered_directory_user_by_user_key.get(user_key)
             if directory_user is None:
                 # There's no selected directory user matching this adobe user