Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions tableauserverclient/server/endpoint/users_endpoint.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import copy
import logging
from typing import List, Tuple
from typing import List, Optional, Tuple

from .endpoint import QuerysetEndpoint, api
from .exceptions import MissingRequiredFieldError
Expand Down Expand Up @@ -64,11 +64,13 @@ def update(self, user_item: UserItem, password: str = None) -> UserItem:

# Delete 1 user by id
@api(version="2.0")
def remove(self, user_id: str) -> None:
def remove(self, user_id: str, map_assets_to: Optional[str] = None) -> None:
if not user_id:
error = "User ID undefined."
raise ValueError(error)
url = "{0}/{1}".format(self.baseurl, user_id)
if map_assets_to is not None:
url += f"?mapAssetsTo={map_assets_to}"
self.delete_request(url)
logger.info("Removed single user (ID: {0})".format(user_id))

Expand Down
10 changes: 10 additions & 0 deletions test/test_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,16 @@ def test_remove(self) -> None:
m.delete(self.baseurl + "/dd2239f6-ddf1-4107-981a-4cf94e415794", status_code=204)
self.server.users.remove("dd2239f6-ddf1-4107-981a-4cf94e415794")

def test_remove_with_replacement(self) -> None:
with requests_mock.mock() as m:
m.delete(
self.baseurl
+ "/dd2239f6-ddf1-4107-981a-4cf94e415794"
+ "?mapAssetsTo=4cc4c17f-898a-4de4-abed-a1681c673ced",
status_code=204,
)
self.server.users.remove("dd2239f6-ddf1-4107-981a-4cf94e415794", "4cc4c17f-898a-4de4-abed-a1681c673ced")

def test_remove_missing_id(self) -> None:
self.assertRaises(ValueError, self.server.users.remove, "")

Expand Down