Fix identity type enum name

Author: adorton-adobe

tests/test_connections.py

@@ -30,7 +30,7 @@
 
 from umapi_client import Connection
 from umapi_client import ArgumentError, UnavailableError, ServerError, RequestError
-from umapi_client import UserAction, IdentityTypes, UserGroupAction
+from umapi_client import UserAction, IdentityType, UserGroupAction
 from umapi_client import __version__ as umapi_version
 from umapi_client.auth import JWTAuth
 
@@ -443,7 +443,7 @@ def test_split_add_user():
     :return:
     """
     user = UserAction(user="user@example.com")
-    user.create(id_type=IdentityTypes.enterpriseID, first_name="Example", last_name="User",
+    user.create(id_type=IdentityType.enterpriseID, first_name="Example", last_name="User",
                 country="US", email="user@example.com")
     user.update(first_name="EXAMPLE")
     assert user.maybe_split_groups(10) is False

tests/test_functional.py

@@ -25,7 +25,7 @@
 from conftest import MockResponse
 from umapi_client import ArgumentError, RequestError
 from umapi_client import Connection
-from umapi_client import IdentityTypes
+from umapi_client import IdentityType
 from umapi_client import UserAction, UserGroupAction
 from umapi_client import UsersQuery
 
@@ -54,7 +54,7 @@ def test_user_username():
 
 def test_create_user_adobeid():
     user = UserAction(user="user@example.com")
-    user.create(email="user@example.com", id_type=IdentityTypes.adobeID)
+    user.create(email="user@example.com", id_type=IdentityType.adobeID)
     assert user.wire_dict() == {"do": [{"addAdobeID": {"email": "user@example.com",
                                                        "option": "ignoreIfAlreadyExists"}}],
                                 "user": "user@example.com",
@@ -63,7 +63,7 @@ def test_create_user_adobeid():
 
 def test_create_user_adobeid_country():
     user = UserAction(user="user@example.com")
-    user.create(email="user@example.com", country="US", id_type=IdentityTypes.adobeID)
+    user.create(email="user@example.com", country="US", id_type=IdentityType.adobeID)
     assert user.wire_dict() == {"do": [{"addAdobeID": {"email": "user@example.com",
                                                        "country": "US",
                                                        "option": "ignoreIfAlreadyExists"}}],
@@ -74,7 +74,7 @@ def test_create_user_adobeid_country():
 def test_create_user_enterpriseid():
     user = UserAction(user="user@example.com")
     user.create(email="user@example.com", first_name="Example", last_name="User",
-                id_type=IdentityTypes.enterpriseID)
+                id_type=IdentityType.enterpriseID)
     assert user.wire_dict() == {"do": [{"createEnterpriseID": {"email": "user@example.com",
                                                                "firstname": "Example", "lastname": "User",
                                                                "option": "ignoreIfAlreadyExists"}}],
@@ -84,7 +84,7 @@ def test_create_user_enterpriseid():
 def test_create_user_federatedid():
     user = UserAction(user="user@example.com")
     user.create(email="user@example.com", first_name="Example", last_name="User",
-                country="US", id_type=IdentityTypes.federatedID)
+                country="US", id_type=IdentityType.federatedID)
     assert user.wire_dict() == {"do": [{"createFederatedID": {"email": "user@example.com",
                                                               "firstname": "Example", "lastname": "User",
                                                               "country": "US",

umapi_client/__init__.py

@@ -22,7 +22,7 @@
 from .auth import JWTAuth, OAuthS2S
 from .connection import Connection
 from .error import BatchError, ClientError, RequestError, ServerError, UnavailableError, ArgumentError
-from .functional import IdentityTypes, IfAlreadyExistsOptions
+from .functional import IdentityType, IfAlreadyExistsOptions
 from .functional import UserAction, UserQuery, UsersQuery
 from .functional import UserGroupAction, GroupsQuery
 from .version import __version__

umapi_client/functional.py

@@ -25,7 +25,7 @@
 from .error import ArgumentError, UnsupportedError
 
 
-class IdentityTypes(Enum):
+class IdentityType(Enum):
     adobeID = 1
     enterpriseID = 2
     federatedID = 3
@@ -78,7 +78,7 @@ def __repr__(self):
         return "UserAction "+str(self.__dict__)
 
     def create(self, email, first_name=None,
-               last_name=None, country=None, id_type=IdentityTypes.federatedID,
+               last_name=None, country=None, id_type=IdentityType.federatedID,
                on_conflict=IfAlreadyExistsOptions.ignoreIfAlreadyExists):
         """
         Create the user on the Adobe back end.
@@ -92,10 +92,10 @@ def create(self, email, first_name=None,
         :param on_conflict: IfAlreadyExistsOption (or string name thereof) controlling creation of existing users
         :return: the User, so you can do User(...).create(...).add_to_groups(...)
         """
-        if id_type in IdentityTypes.__members__:
-            id_type = IdentityTypes[id_type]
-        if id_type not in IdentityTypes:
-            raise ArgumentError("Identity type (%s) must be one of %s" % (id_type, [i.name for i in IdentityTypes]))
+        if id_type in IdentityType.__members__:
+            id_type = IdentityType[id_type]
+        if id_type not in IdentityType:
+            raise ArgumentError("Identity type (%s) must be one of %s" % (id_type, [i.name for i in IdentityType]))
         # first validate the params: email, on_conflict, first_name, last_name, country
         create_params = {}
         create_params["email"] = email
@@ -110,10 +110,10 @@ def create(self, email, first_name=None,
         if country: create_params["country"] = country
 
         # each type is created using a different call
-        if id_type == IdentityTypes.adobeID:
+        if id_type == IdentityType.adobeID:
             self.frame['useAdobeID'] = True
             return self.insert(addAdobeID=dict(**create_params))
-        elif id_type == IdentityTypes.enterpriseID:
+        elif id_type == IdentityType.enterpriseID:
             return self.insert(createEnterpriseID=dict(**create_params))
         else:
             return self.insert(createFederatedID=dict(**create_params))