remove_from_organization should succeed, even if account deletion fails.

Author: adobeDan

tests/test_functional.py

@@ -237,8 +237,10 @@ def test_remove_from_organization_delete_federatedid():
 
 def test_remove_from_organization_delete_adobeid():
     user = UserAction(id_type=IdentityTypes.adobeID, email="[email protected]")
-    with pytest.raises(ValueError):
-        user.remove_from_organization(delete_account=True)
+    user.remove_from_organization(delete_account=True)
+    assert user.wire_dict() == {"do": [{"removeFromOrg": {"deleteAccount": True}}],
+                                "user": "[email protected]",
+                                "useAdobeID": True}
 
 
 def test_delete_account_enterpriseid():

umapi_client/functional.py

@@ -288,9 +288,7 @@ def remove_from_organization(self, delete_account=False):
         :param delete_account: Whether to delete the account after removing from the organization (default false)
         :return: None, because you cannot follow this command with another.
         """
-        if delete_account and self.id_type == IdentityTypes.adobeID:
-            raise ValueError("You cannot delete an Adobe ID account.")
-        self.append(removeFromOrg={"deleteAccount": delete_account == True})
+        self.append(removeFromOrg={"deleteAccount": True if delete_account else False})
         return None
 
     def delete_account(self):