Skip to content
Open
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
4 changes: 2 additions & 2 deletions tableauserverclient/server/request_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -997,8 +997,8 @@ def import_from_csv_req(self, csv_content: bytes, users: Iterable[UserItem]):
raise ValueError("User cannot have both authSetting and idpConfigurationId.")
elif user.idp_configuration_id is not None:
user_element.attrib["idpConfigurationId"] = user.idp_configuration_id
else:
user_element.attrib["authSetting"] = user.auth_setting or "ServerDefault"
elif user.auth_setting is not None:
user_element.attrib["authSetting"] = user.auth_setting

parts = {
"tableau_user_import": ("tsc_users_file.csv", csv_content, "file"),
Expand Down
2 changes: 1 addition & 1 deletion test/test_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ def test_bulk_add(server: TSC.Server) -> None:
for user, xml_user in zip(users, xml_users):
assert user.name == xml_user.get("name")
if user.idp_configuration_id is None:
assert xml_user.get("authSetting") == (user.auth_setting or "ServerDefault")
assert xml_user.get("authSetting") == user.auth_setting
else:
assert xml_user.get("idpConfigurationId") == user.idp_configuration_id
assert xml_user.get("authSetting") is None
Expand Down
Loading