Merge pull request #104 from Luci2015/v2

remove removeFromDomain action

Author: adorton-adobe

tests/test_functional.py

@@ -355,27 +355,12 @@ def test_remove_from_organization_delete_adobeid():
                                 "user": "[email protected]",
                                 "useAdobeID": True}
 
-
-def test_delete_account_enterpriseid():
-    user = UserAction(id_type=IdentityTypes.enterpriseID, email="[email protected]")
-    user.delete_account()
-    assert user.wire_dict() == {"do": [{"removeFromDomain": {}}],
-                                "user": "[email protected]"}
-
-
-def test_delete_account_adobeid():
-    user = UserAction(id_type=IdentityTypes.adobeID, email="[email protected]")
-    with pytest.raises(ValueError):
-        user.delete_account()
-
-
 def test_add_to_products():
     group = UserGroupAction(group_name="SampleUsers")
     group.add_to_products(products=["Photoshop", "Illustrator"])
     assert group.wire_dict() == {"do": [{"add": {"productConfiguration": ["Photoshop", "Illustrator"]}}],
                                  "usergroup": "SampleUsers"}
 
-
 def test_add_to_products_all():
     group = UserGroupAction(group_name="SampleUsers")
     group.add_to_products(all_products=True)

umapi_client/functional.py

@@ -278,18 +278,6 @@ def remove_from_organization(self, delete_account=False):
         self.append(removeFromOrg={"deleteAccount": True if delete_account else False})
         return None
 
-    def delete_account(self):
-        """
-        Delete a user's account.
-        Deleting the user's account can only be done if the user's domain is controlled by the authorized organization,
-        and removing the account will also remove the user from all organizations with access to that domain.
-        :return: None, because you cannot follow this command with another.
-        """
-        if self.id_type == IdentityTypes.adobeID:
-            raise ArgumentError("You cannot delete an Adobe ID account.")
-        self.append(removeFromDomain={})
-        return None
-
 
 class UsersQuery(QueryMultiple):
     """