rename firstname and lastname params to reflect API

Author: adorton-adobe

tests/test_connections.py

@@ -443,9 +443,9 @@ def test_split_add_user():
     :return:
     """
     user = UserAction(user="user@example.com")
-    user.create(id_type=IdentityType.enterpriseID, first_name="Example", last_name="User",
+    user.create(id_type=IdentityType.enterpriseID, firstname="Example", lastname="User",
                 country="US", email="user@example.com")
-    user.update(first_name="EXAMPLE")
+    user.update(firstname="EXAMPLE")
     assert user.maybe_split_groups(10) is False
     assert len(user.commands) == 2
     assert user.wire_dict() == {'do': [{'createEnterpriseID': {'country': 'US',

tests/test_functional.py

@@ -73,7 +73,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",
+    user.create(email="user@example.com", firstname="Example", lastname="User",
                 id_type=IdentityType.enterpriseID)
     assert user.wire_dict() == {"do": [{"createEnterpriseID": {"email": "user@example.com",
                                                                "firstname": "Example", "lastname": "User",
@@ -83,7 +83,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",
+    user.create(email="user@example.com", firstname="Example", lastname="User",
                 country="US", id_type=IdentityType.federatedID)
     assert user.wire_dict() == {"do": [{"createFederatedID": {"email": "user@example.com",
                                                               "firstname": "Example", "lastname": "User",
@@ -92,7 +92,7 @@ def test_create_user_federatedid():
                                 "user": "user@example.com"}
 
     user = UserAction(user="user@example.com")
-    user.create(email="user@example.com", first_name="Example", last_name="User",
+    user.create(email="user@example.com", firstname="Example", lastname="User",
                 country="US")
     assert user.wire_dict() == {"do": [{"createFederatedID": {"email": "user@example.com",
                                                               "firstname": "Example", "lastname": "User",
@@ -103,7 +103,7 @@ def test_create_user_federatedid():
 
 def test_create_user_federatedid_username():
     user = UserAction(user="user", domain="example.com")
-    user.create(first_name="Example", last_name="User", country="US", email="user@example.com")
+    user.create(firstname="Example", lastname="User", country="US", email="user@example.com")
     assert user.wire_dict() == {"do": [{"createFederatedID": {"email": "user@example.com",
                                                               "firstname": "Example", "lastname": "User",
                                                               "country": "US",
@@ -124,7 +124,7 @@ def test_create_user_email_username_domain():
 def test_different_email_username():
     # pass username to identify user on create
     user = UserAction(user="user.username@example.com")
-    user.create(email="user.email@example.com", first_name="User", last_name="Name", country="US")
+    user.create(email="user.email@example.com", firstname="User", lastname="Name", country="US")
     assert user.wire_dict() == {"do": [{"createFederatedID": {"email": "user.email@example.com",
                                                               "firstname": "User",
                                                               "lastname": "Name",
@@ -135,15 +135,15 @@ def test_different_email_username():
 
 def test_update_user_adobeid():
     user = UserAction(user="user@example.com", use_adobe_id=True)
-    user.update(first_name="User Updated", last_name="Name Updated")
+    user.update(firstname="User Updated", lastname="Name Updated")
     assert user.wire_dict() == {"do": [{"update": {"firstname": "User Updated", "lastname": "Name Updated"}}],
                                 "user": "user@example.com",
                                 "useAdobeID": True}
 
 
 def test_update_user():
     user = UserAction(user="user@example.com")
-    user.update(first_name="User Updated", last_name="Name Updated")
+    user.update(firstname="User Updated", lastname="Name Updated")
     assert user.wire_dict() == {"do": [{"update": {"firstname": "User Updated", "lastname": "Name Updated"}}],
                                 "user": "user@example.com"}
 

umapi_client/functional.py

@@ -77,16 +77,16 @@ def __str__(self):
     def __repr__(self):
         return "UserAction "+str(self.__dict__)
 
-    def create(self, email, first_name=None,
-               last_name=None, country=None, id_type=IdentityType.federatedID,
+    def create(self, email, firstname=None,
+               lastname=None, country=None, id_type=IdentityType.federatedID,
                on_conflict=IfAlreadyExistsOption.ignoreIfAlreadyExists):
         """
         Create the user on the Adobe back end.
         See [Issue 32](https://github.com/adobe-apiplatform/umapi-client.py/issues/32): because
         we retry create calls if they time out, the default conflict handling for creation is to ignore the
         create call if the user already exists (possibly from an earlier call that timed out).
-        :param first_name: (optional) user first name
-        :param last_name: (optional) user last name
+        :param firstname: (optional) user first name
+        :param lastname: (optional) user last name
         :param country: (optional except for Federated ID) user 2-letter ISO country code
         :param email: user email, if not already specified at create time
         :param on_conflict: IfAlreadyExistsOption (or string name thereof) controlling creation of existing users
@@ -96,7 +96,7 @@ def create(self, email, first_name=None,
             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
+        # first validate the params: email, on_conflict, firstname, lastname, country
         create_params = {}
         create_params["email"] = email
         if on_conflict in IfAlreadyExistsOption.__members__:
@@ -105,8 +105,8 @@ def create(self, email, first_name=None,
             raise ArgumentError("on_conflict must be one of {}".format([o.name for o in IfAlreadyExistsOption]))
         if on_conflict != IfAlreadyExistsOption.errorIfAlreadyExists:
             create_params["option"] = on_conflict.name
-        if first_name: create_params["firstname"] = first_name
-        if last_name: create_params["lastname"] = last_name
+        if firstname: create_params["firstname"] = firstname
+        if lastname: create_params["lastname"] = lastname
         if country: create_params["country"] = country
 
         # each type is created using a different call
@@ -118,18 +118,18 @@ def create(self, email, first_name=None,
         else:
             return self.insert(createFederatedID=dict(**create_params))
 
-    def update(self, email=None, username=None, first_name=None, last_name=None):
+    def update(self, email=None, username=None, firstname=None, lastname=None):
         """
         Update values on an existing user.  See the API docs for what kinds of update are possible.
         :param email: new email for this user
         :param username: new username for this user
-        :param first_name: new first name for this user
-        :param last_name: new last name for this user
+        :param firstname: new first name for this user
+        :param lastname: new last name for this user
         :return: the User, so you can do User(...).update(...).add_to_groups(...)
         """
         updates = {}
         for k, v in dict(email=email, username=username,
-                         firstname=first_name, lastname=last_name).items():
+                         firstname=firstname, lastname=lastname).items():
             if v:
                 updates[k] = v
         return self.append(update=updates)