Merge branch 'v2'

Author: adorton-adobe

setup.py

@@ -52,7 +52,7 @@
           'cryptography',
           'PyJWT',
           'six',
-          'enum34'
+          'enum34;python_version<"3.4"',
       ],
       setup_requires=[
           'pytest-runner',

tests/test_connections.py

@@ -416,13 +416,13 @@ def test_complex_group_split():
     user.commands = [{
         "add": {
             GroupTypes.usergroup.name: add_groups,
-            GroupTypes.product.name: add_products,
+            GroupTypes.group.name: add_products,
         },
     }]
     assert user.maybe_split_groups(10) is True
     assert len(user.commands) == 15
-    assert len([c for c in user.commands if 'product' in c['add']]) == 3
-    assert GroupTypes.product.name not in user.commands[3]['add']
+    assert len([c for c in user.commands if 'group' in c['add']]) == 3
+    assert GroupTypes.group.name not in user.commands[3]['add']
 
 
 def test_split_remove_all():
@@ -439,7 +439,7 @@ def test_split_remove_all():
     user.add_to_groups(groups=add_groups)
     assert user.maybe_split_groups(10) is True
     assert user.wire_dict() == {'do': [{'remove': 'all'},
-                                       {'add': {'product': ['G1',
+                                       {'add': {'group': ['G1',
                                                             'G2',
                                                             'G3',
                                                             'G4',
@@ -449,7 +449,7 @@ def test_split_remove_all():
                                                             'G8',
                                                             'G9',
                                                             'G10']}},
-                                       {'add': {'product': ['G11']}}],
+                                       {'add': {'group': ['G11']}}],
                                 'user': '[email protected]'}
 
 

tests/test_functional.py

@@ -236,21 +236,21 @@ def test_update_user_federatedid_username():
 def test_add_org_federatedid():
     user = UserAction(id_type=IdentityTypes.federatedID, email="[email protected]")
     user.add_to_groups()
-    assert user.wire_dict() == {"do": [{"add": {"product": []}}],
+    assert user.wire_dict() == {"do": [{"add": {"group": []}}],
                                 "user": "[email protected]"}
 
 
 def test_add_products_federatedid():
     user = UserAction(id_type=IdentityTypes.federatedID, email="[email protected]")
     user.add_to_groups(groups=["Photoshop", "Illustrator"])
-    assert user.wire_dict() == {"do": [{"add": {"product": ["Photoshop", "Illustrator"]}}],
+    assert user.wire_dict() == {"do": [{"add": {"group": ["Photoshop", "Illustrator"]}}],
                                 "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ạ"]}}],
+    assert user.wire_dict() == {"do": [{"add": {"group": ["Photoshop", u"Người vẽ minh hoạ"]}}],
                                 "user": "[email protected]"}
 
 
@@ -283,8 +283,8 @@ def test_add_to_usergroups_federatedid_unicode():
 
 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")
-    assert user.wire_dict() == {"do": [{"remove": {"product": ["Photoshop", "Illustrator"]}}],
+    user.remove_from_groups(groups=["Photoshop", "Illustrator"], group_type="group")
+    assert user.wire_dict() == {"do": [{"remove": {"group": ["Photoshop", "Illustrator"]}}],
                                 "user": "[email protected]"}
 
 

umapi_client/functional.py

@@ -33,10 +33,11 @@ class IdentityTypes(Enum):
 
 
 class GroupTypes(Enum):
+    # product use is deprecated!
     product = 1
-    # group = product  # deprecated!
     usergroup = 2
     productConfiguration = 3
+    group = 4
 
 
 class RoleTypes(Enum):
@@ -185,7 +186,7 @@ def add_to_groups(self, groups=None, all_groups=False, group_type=None):
         is simply to do an "add to organization Everybody group", so we let that be done.
         :param groups: list of group names the user should be added to
         :param all_groups: a boolean meaning add to all (don't specify groups or group_type in this case)
-        :param group_type: the type of group (defaults to "product")
+        :param group_type: the type of group (defaults to "group")
         :return: the User, so you can do User(...).add_to_groups(...).add_role(...)
         """
         if all_groups:
@@ -196,7 +197,7 @@ def add_to_groups(self, groups=None, all_groups=False, group_type=None):
             if not groups:
                 groups = []
             if not group_type:
-                group_type = GroupTypes.product
+                group_type = GroupTypes.group
             elif group_type in GroupTypes.__members__:
                 group_type = GroupTypes[group_type]
             if group_type not in GroupTypes:
@@ -209,7 +210,7 @@ def remove_from_groups(self, groups=None, all_groups=False, group_type=None):
         Remove user from some PLC groups, or all of them.
         :param groups: list of group names the user should be removed from
         :param all_groups: a boolean meaning remove from all (don't specify groups or group_type in this case)
-        :param group_type: the type of group (defaults to "product")
+        :param group_type: the type of group (defaults to "group")
         :return: the User, so you can do User(...).remove_from_groups(...).add_role(...)
         """
         if all_groups:
@@ -220,7 +221,7 @@ def remove_from_groups(self, groups=None, all_groups=False, group_type=None):
             if not groups:
                 raise ArgumentError("You must specify groups from which to remove the user")
             if not group_type:
-                group_type = GroupTypes.product
+                group_type = GroupTypes.group
             elif group_type in GroupTypes.__members__:
                 group_type = GroupTypes[group_type]
             if group_type not in GroupTypes:

umapi_client/version.py

@@ -18,4 +18,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-__version__ = "2.12"
+__version__ = "2.13"