revise some assumptions about input data, make sure the tests all pass

Author: adorton-adobe

tests/test_functional.py

@@ -51,23 +51,6 @@ def test_user_adobeid_unicode():
                                 "useAdobeID": True}
 
 
-def test_user_adobeid_unicode_error_unicode_dot_above():
-    with pytest.raises(ValueError) as excinfo:
-        UserAction(email=u"lwałę[email protected]")
-    assert excinfo.type == ArgumentError
-    if six.PY2:
-        assert excinfo.match(u"lwałę[email protected]".encode('utf8'))
-        with pytest.raises(ValueError) as excinfo:
-            UserAction(email=u"lwałę[email protected]".encode('utf8'))
-        assert excinfo.type == ArgumentError
-        assert excinfo.match(u"lwałę[email protected]".encode('utf8'))
-
-
-def test_user_adobeid_unicode_error_trailing_dot():
-    with pytest.raises(ValueError):
-        UserAction(email=u"[email protected]")
-
-
 def test_user_enterpriseid():
     user = UserAction(id_type=IdentityTypes.enterpriseID, email="[email protected]")
     assert user.wire_dict() == {"do": [], "user": "[email protected]"}
@@ -88,11 +71,6 @@ def test_user_federatedid_username():
     assert user.wire_dict() == {"do": [], "user": "dbrotsky", "domain": "k.on-the-side.net"}
 
 
-def test_user_federatedid_username_unicode_error():
-    with pytest.raises(ValueError):
-        UserAction(id_type=IdentityTypes.federatedID, username=u"lwałęsa", domain="k.on-the-side.net")
-
-
 def test_create_user_adobeid():
     user = UserAction(email="[email protected]")
     user.create()
@@ -220,15 +198,6 @@ def test_different_email_username():
                                 "user": "[email protected]"}
 
 
-def test_malformed_email_type_username():
-    """
-    Test email-type username with malformed email address
-    """
-    user = UserAction(id_type=IdentityTypes.federatedID, email="[email protected]")
-    with pytest.raises(ValueError):
-        user.update(username="@[email protected]")
-
-
 def test_update_user_adobeid():
     user = UserAction(id_type=IdentityTypes.adobeID, email="[email protected]")
     user.update(first_name="Johnny", last_name="Danger")

umapi_client/functional.py

@@ -83,12 +83,29 @@ def __init__(self, id_type=IdentityTypes.adobeID, email=None, username=None, dom
         self.id_type = id_type
         self.email = None
         self.domain = domain
+        if username is not None:
+            if email and username.lower() == email.lower():
+                # ignore the username if it's the same as the email (policy default)
+                username = None
+                if domain:
+                    self.domain = domain
+            elif id_type is not IdentityTypes.federatedID:
+                raise ArgumentError("Username must match email except for Federated ID")
         if email is not None:
+            if '@' not in email:
+                raise ArgumentError("Invalid email address: %s" % email)
             self.email = email
-            if self.domain is None:
+            if not self.domain:
                 atpos = email.index('@')
                 self.domain = email[atpos + 1:]
-        if id_type == IdentityTypes.adobeID:
+        elif not username:
+                raise ArgumentError("No user identity specified.")
+        elif not domain:
+            raise ArgumentError("Both username and domain must be specified")
+
+        if username:
+            Action.__init__(self, user=username, domain=self.domain, **kwargs)
+        elif id_type == IdentityTypes.adobeID:
             # by default if two users have the same email address, the UMAPI server will prefer the matching
             # Federated or Enterprise ID user; so we use the undocumented option to prefer the AdobeID match
             Action.__init__(self, user=email, useAdobeID=True, **kwargs)
@@ -116,6 +133,8 @@ def create(self, first_name=None, last_name=None, country=None, email=None,
                 raise ArgumentError("You must specify email when creating a user")
         elif self.email is None:
             self.email = email
+        elif self.email.lower() != email.lower():
+            raise ArgumentError("Specified email (%s) doesn't match user's email (%s)" % (email, self.email))
         create_params["email"] = self.email
         if on_conflict in IfAlreadyExistsOptions.__members__:
             on_conflict = IfAlreadyExistsOptions[on_conflict]
@@ -145,6 +164,8 @@ def update(self, email=None, username=None, first_name=None, last_name=None, cou
         :param country: new country for this user
         :return: the User, so you can do User(...).update(...).add_to_groups(...)
         """
+        if self.id_type != IdentityTypes.federatedID and email != username:
+            raise ArgumentError("Username and email address must match except for Federated ID types")
         updates = {}
         for k, v in six.iteritems(dict(email=email, username=username,
                                        firstname=first_name, lastname=last_name,