temporary fix to deal with different email-type username and email address

Author: adorton-adobe

user_sync/connector/umapi.py

@@ -49,6 +49,9 @@ def __init__(self, name, caller_options):
         """
         self.name = 'umapi' + name
         caller_config = user_sync.config.DictConfig(self.name + ' configuration', caller_options)
+        self.trusted = caller_config.get_bool('trusted', True)
+        if self.trusted is None:
+            self.trusted = False
         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

@@ -702,7 +702,7 @@ def get_identity_type_from_umapi_user(self, umapi_user):
             self.logger.error('Found adobe user with no identity type, using %s: %s', identity_type, umapi_user)
         return identity_type
 
-    def create_umapi_commands_for_directory_user(self, directory_user, do_update=False):
+    def create_umapi_commands_for_directory_user(self, directory_user, do_update=False, console_trusted=False):
         """
         Make the umapi commands to create this user, based on his directory attributes and type.
         Update the attributes of an existing user if do_update is True.
@@ -742,7 +742,7 @@ def create_umapi_commands_for_directory_user(self, directory_user, do_update=Fal
         else:
             attributes['option'] = 'ignoreIfAlreadyExists'
         commands.add_user(attributes)
-        if update_username is not None:
+        if update_username is not None and not console_trusted:
             commands.update_user({"email": directory_user['email'], "username": update_username})
         return commands
 
@@ -761,7 +761,8 @@ def create_umapi_user(self, user_key, groups_to_add, umapi_info, umapi_connector
         :type umapi_connector: user_sync.connector.umapi.UmapiConnector
         """
         directory_user = self.directory_user_by_user_key[user_key]
-        commands = self.create_umapi_commands_for_directory_user(directory_user, self.will_update_user_info(umapi_info))
+        commands = self.create_umapi_commands_for_directory_user(directory_user, self.will_update_user_info(umapi_info),
+                                                                 umapi_connector.trusted)
         if not commands:
             return
         if self.will_process_groups():