Merge pull request #42 from adobe-apiplatform/v2

Fix #41: handle unicode strings in Python 2.7.  Prep for release of v2.4.

Author: adobeDan

HISTORY.md

@@ -62,3 +62,11 @@ Enhancement release:
     * document all accepted `auth_dict` keys
 * (No Issue)
     * certify for Python 3.6
+
+### Version 2.4
+
+Bug fix release:
+
+* [Issue 41](https://github.com/adobe-apiplatform/umapi-client.py/issues/41)
+    * accept unicode strings from Python 2.7 clients
+    * do unicode-compliant validation of usernames and email addresses

tests/test_functional.py

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 # Copyright (c) 2016-2017 Adobe Systems Incorporated.  All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -36,11 +38,33 @@ def test_user_adobeid():
                                 "useAdobeID": True}
 
 
+def test_user_adobeid_unicode():
+    user = UserAction(email=u"lwałę[email protected]")
+    assert user.wire_dict() == {"do": [],
+                                "user": u"lwałę[email protected]",
+                                "useAdobeID": True}
+
+
+def test_user_adobeid_unicode_error_trailing_dot():
+    with pytest.raises(ValueError):
+        UserAction(email=u"lwałę[email protected]")
+
+
+def test_user_adobeid_unicode_error_unicode_dot_above():
+    with pytest.raises(ValueError):
+        UserAction(email=u"l˙wałę[email protected]")
+
+
 def test_user_enterpriseid():
     user = UserAction(id_type=IdentityTypes.enterpriseID, email="[email protected]")
     assert user.wire_dict() == {"do": [], "user": "[email protected]"}
 
 
+def test_user_enterpriseid_unicode():
+    user = UserAction(id_type=IdentityTypes.enterpriseID, email=u"lwałę[email protected]")
+    assert user.wire_dict() == {"do": [], "user": u"lwałę[email protected]"}
+
+
 def test_user_enterpriseid_username():
     with pytest.raises(ValueError):
         UserAction(id_type=IdentityTypes.enterpriseID, username="dbrotsky", domain="o.on-the-side.net")
@@ -51,11 +75,21 @@ def test_user_federatedid():
     assert user.wire_dict() == {"do": [], "user": "[email protected]"}
 
 
+def test_user_federatedid_unicode():
+    user = UserAction(id_type=IdentityTypes.federatedID, email=u"lwałę[email protected]")
+    assert user.wire_dict() == {"do": [], "user": u"lwałę[email protected]"}
+
+
 def test_user_federatedid_username():
     user = UserAction(id_type=IdentityTypes.federatedID, username="dbrotsky", domain="k.on-the-side.net")
     assert user.wire_dict() == {"do": [], "user": "dbrotsky", "domain": "k.on-the-side.net"}
 
 
+def test_user_federatedid_username_unicode():
+    user = UserAction(id_type=IdentityTypes.federatedID, username=u"lwałęsa", domain="k.on-the-side.net")
+    assert user.wire_dict() == {"do": [], "user": u"lwałęsa", "domain": "k.on-the-side.net"}
+
+
 def test_create_user_adobeid():
     user = UserAction(email="[email protected]")
     user.create()
@@ -91,6 +125,16 @@ def test_create_user_federatedid():
                                 "user": "[email protected]"}
 
 
+def test_create_user_federated_id_unicode():
+    user = UserAction(id_type=IdentityTypes.federatedID, email=u"lwałę[email protected]")
+    user.create(first_name="Lech", last_name=u"Wałęsa", country="PL")
+    assert user.wire_dict() == {"do": [{"createFederatedID": {"email": u"lwałę[email protected]",
+                                                              "firstname": "Lech", "lastname": u"Wałęsa",
+                                                              "country": "PL",
+                                                              "option": "ignoreIfAlreadyExists"}}],
+                                "user": u"lwałę[email protected]"}
+
+
 def test_create_user_federatedid_username():
     user = UserAction(id_type=IdentityTypes.federatedID, username="dbrotsky", domain="k.on-the-side.net")
     user.create(first_name="Daniel", last_name="Brotsky", country="US", email="[email protected]")
@@ -101,6 +145,16 @@ def test_create_user_federatedid_username():
                                 "user": "dbrotsky", "domain": "k.on-the-side.net"}
 
 
+def test_create_user_federatedid_username_unicode():
+    user = UserAction(id_type=IdentityTypes.federatedID, username=u"lwałęsa", domain="k.on-the-side.net")
+    user.create(first_name="Lech", last_name=u"Wałęsa", country="PL", email=u"lwałę[email protected]")
+    assert user.wire_dict() == {"do": [{"createFederatedID": {"email": u"lwałę[email protected]",
+                                                              "firstname": "Lech", "lastname": u"Wałęsa",
+                                                              "country": "PL",
+                                                              "option": "ignoreIfAlreadyExists"}}],
+                                "user": u"lwałęsa", "domain": "k.on-the-side.net"}
+
+
 def test_create_user_federatedid_username_email():
     user = UserAction(id_type=IdentityTypes.federatedID, username="dbrotsky", domain="k.on-the-side.net",
                       email="[email protected]")
@@ -126,6 +180,13 @@ def test_update_user_federatedid():
                                 "user": "[email protected]"}
 
 
+def test_update_user_federatedid_unicode():
+    user = UserAction(id_type=IdentityTypes.federatedID, email="[email protected]")
+    user.update(first_name=u"André", last_name="Danger")
+    assert user.wire_dict() == {"do": [{"update": {"firstname": u"André", "lastname": "Danger"}}],
+                                "user": "[email protected]"}
+
+
 def test_update_user_enterpriseid_username():
     user = UserAction(id_type=IdentityTypes.enterpriseID, email="[email protected]")
     with pytest.raises(ValueError):
@@ -153,6 +214,13 @@ def test_add_products_federatedid():
                                 "user": "[email protected]"}
 
 
+def test_add_products_federatedid_unicode():
+    user = UserAction(id_type=IdentityTypes.federatedID, email="[email protected]")
+    user.add_to_groups(groups=["Photoshop", u"Người vẽ minh hoạ"])
+    assert user.wire_dict() == {"do": [{"add": {"product": ["Photoshop", u"Người vẽ minh hoạ"]}}],
+                                "user": "[email protected]"}
+
+
 def test_add_to_groups_federatedid_all():
     user = UserAction(id_type=IdentityTypes.federatedID, email="[email protected]")
     user.add_to_groups(all_groups=True)
@@ -173,6 +241,13 @@ def test_add_to_usergroups_federatedid():
                                 "user": "[email protected]"}
 
 
+def test_add_to_usergroups_federatedid_unicode():
+    user = UserAction(id_type=IdentityTypes.federatedID, email="[email protected]")
+    user.add_to_groups(groups=["Photoshop", u"Người vẽ minh hoạ"], group_type=GroupTypes.usergroup)
+    assert user.wire_dict() == {"do": [{"add": {"usergroup": ["Photoshop", u"Người vẽ minh hoạ"]}}],
+                                "user": "[email protected]"}
+
+
 def test_remove_from_products_federatedid():
     user = UserAction(id_type=IdentityTypes.federatedID, email="[email protected]")
     user.remove_from_groups(groups=["Photoshop", "Illustrator"], group_type="product")
@@ -200,6 +275,13 @@ def test_add_role_enterpriseid():
                                 "user": "[email protected]"}
 
 
+def test_add_role_enterpriseid_unicode():
+    user = UserAction(id_type=IdentityTypes.enterpriseID, email="[email protected]")
+    user.add_role(groups=[u"người quản lý"])
+    assert user.wire_dict() == {"do": [{"addRoles": {"admin": [u"người quản lý"]}}],
+                                "user": "[email protected]"}
+
+
 def test_add_role_enterpriseid_error():
     user = UserAction(id_type=IdentityTypes.enterpriseID, email="[email protected]")
     with pytest.raises(ValueError):
@@ -228,6 +310,14 @@ def test_remove_from_organization_adobeid():
                                 "useAdobeID": True}
 
 
+def test_remove_from_organization_adobeid_unicode():
+    user = UserAction(id_type='adobeID', email=u"lwałę[email protected]")
+    user.remove_from_organization()
+    assert user.wire_dict() == {"do": [{"removeFromOrg": {"deleteAccount": False}}],
+                                "user": u"lwałę[email protected]",
+                                "useAdobeID": True}
+
+
 def test_remove_from_organization_delete_federatedid():
     user = UserAction(id_type=IdentityTypes.federatedID, email="[email protected]")
     user.remove_from_organization(delete_account=True)
@@ -303,6 +393,13 @@ def test_add_users():
                                  "usergroup": "SampleUsers"}
 
 
+def test_add_users_unicode():
+    group = UserGroupAction(group_name=u"người quản lý")
+    group.add_users(users=[u"lwałę[email protected]", u"tkolář@test1.on-the-side.net"])
+    assert group.wire_dict() == {"do": [{"add": {"user": [u"lwałę[email protected]", u"tkolář@test1.on-the-side.net"]}}],
+                                 "usergroup": u"người quản lý"}
+
+
 def test_add_users_error():
     group = UserGroupAction(group_name="SampleUsers")
     with pytest.raises(ValueError):