change how domain is set for UserAction

Author: adorton-adobe

user_sync/connector/connector_umapi.py

@@ -326,9 +326,15 @@ def get_next_request_id(self):
         return request_id
 
     def create_action(self, commands):
+        # "user" field identifies the user in the action command it is
+        # either email or username
         user = commands.user
         domain = commands.domain
 
+        # cannot construct the action if domain is not None and there is an
+        # email-like identifier in use
+        if '@' in user:
+            domain = None
         try:
             action = umapi_client.UserAction(user, domain,
                                              requestID=self.get_next_request_id())

user_sync/engine/umapi.py

@@ -670,8 +670,6 @@ def get_commands(key):
             id_type, username, domain, _ = self.parse_user_key(key)
             if '@' in username and username.lower() in self.email_override:
                 username = self.email_override[username.lower()]
-            if not domain:
-                domain = None
             return user_sync.connector.connector_umapi.Commands(username, domain)
 
         # do the secondary umapis first, in case we are deleting user accounts from the primary umapi at the end