add two auth types

Author: jacalata

tableauserverclient/models/user_item.py

@@ -86,6 +86,8 @@ class Auth:
         SAML = "SAML"
         TableauIDWithMFA = "TableauIDWithMFA"
         ServerDefault = "ServerDefault"
+        TableauID = "TableauID"
+        Local = "Local"
 
     def __init__(
         self, name: Optional[str] = None, site_role: Optional[str] = None, auth_setting: Optional[str] = None
@@ -394,7 +396,7 @@ def process_file_for_import(
                         if not validate_only:
                             user: UserItem = UserItem.CSVImport.create_user_model_from_line(line, logger)
                             users.append(user)
-                        valid.append(line)
+                        valid.append(" ".join(line))
                     except Exception as e:
                         failed.append((" ".join(line), e))
             return users, valid, failed
@@ -419,6 +421,7 @@ def _validate_import_line_or_throw(line, logger) -> None:
 
             if len(line) > UserItem.CSVImport.ColumnType.MAX:
                 raise AttributeError("Too many attributes in line")
+            # sometimes usernames are case sensitive
             username = line[UserItem.CSVImport.ColumnType.USERNAME.value]
             logger.debug(f"> details - {username}")
             UserItem.validate_username_or_throw(username)

tableauserverclient/server/endpoint/users_endpoint.py

@@ -1,3 +1,4 @@
+import _csv
 import copy
 import logging
 from typing import Optional
@@ -21,6 +22,10 @@ class Users(QuerysetEndpoint[UserItem]):
     users in the REST API and operate on the UserItem class. Only server and
     site administrators can access the user resources.
     """
+    def _check_user_id(self, user_item: UserItem):
+        if not user_item.id:
+            error = "User item missing ID."
+            raise MissingRequiredFieldError(error)
 
     @property
     def baseurl(self) -> str:
@@ -193,9 +198,7 @@ def update(self, user_item: UserItem, password: Optional[str] = None) -> UserIte
         >>> updated_user = server.users.update(user)
 
         """
-        if not user_item.id:
-            error = "User item missing ID."
-            raise MissingRequiredFieldError(error)
+        self._check_user_id(user_item)
 
         url = f"{self.baseurl}/{user_item.id}"
         update_req = RequestFactory.User.update_req(user_item, password)
@@ -424,9 +427,7 @@ def populate_workbooks(self, user_item: UserItem, req_options: Optional[RequestO
         >>> for wb in user.workbooks:
         >>>     print(wb.name)
         """
-        if not user_item.id:
-            error = "User item missing ID."
-            raise MissingRequiredFieldError(error)
+        self._check_user_id(user_item)
 
         def wb_pager():
             return Pager(lambda options: self._get_wbs_for_user(user_item, options), req_options)
@@ -436,6 +437,8 @@ def wb_pager():
     def _get_wbs_for_user(
         self, user_item: UserItem, req_options: Optional[RequestOptions] = None
     ) -> tuple[list[WorkbookItem], PaginationItem]:
+        
+        self._check_user_id(user_item)
         url = f"{self.baseurl}/{user_item.id}/workbooks"
         server_response = self.get_request(url, req_options)
         logger.info(f"Populated workbooks for user (ID: {user_item.id})")
@@ -500,9 +503,7 @@ def populate_groups(self, user_item: UserItem, req_options: Optional[RequestOpti
         >>> for group in user.groups:
         >>>     print(group.name)
         """
-        if not user_item.id:
-            error = "User item missing ID."
-            raise MissingRequiredFieldError(error)
+        self._check_user_id(user_item)
 
         def groups_for_user_pager():
             return Pager(

test/test_user_model.py

@@ -91,6 +91,31 @@ def test_get_user_detail_standard(self):
         assert test_user.site_role == "Unlicensed", test_user.site_role
         assert test_user.email == "email", test_user.email
 
+    def test_get_user_detail_variation(self):
+        test_line = ["username", "pword", "fname", "license", "admin", "pub", "email"]
+        test_user: TSC.UserItem = TSC.UserItem.CSVImport.create_user_model_from_line(test_line, UserDataTest.logger)
+        assert test_user.name == "username", test_user.name
+        assert test_user.fullname == "fname", test_user.fullname
+        assert test_user.site_role == "license", test_user.site_role
+        assert test_user.email == "email", test_user.email
+
+    def test_create_user_invalid_license(self):
+        test_line = ["username", "pword", "fname", "license", "site", "yes", "email"]
+        with self.assertRaises(AttributeError):
+            test_user: TSC.UserItem = TSC.UserItem.CSVImport.create_user_model_from_line(test_line, UserDataTest.logger)
+
+    def test_create_user_invalid_role(self):
+        test_line = ["username", "pword", "fname", "creator", "role", "yes", "email"]
+        with self.assertRaises(AttributeError):
+            test_user: TSC.UserItem = TSC.UserItem.CSVImport.create_user_model_from_line(test_line, UserDataTest.logger)
+
+        test_line = ["username", "pword", "fname", "license", "admin", "pub", "email"]
+        test_user: TSC.UserItem = TSC.UserItem.CSVImport.create_user_model_from_line(test_line, UserDataTest.logger)
+        assert test_user.name == "username", test_user.name
+        assert test_user.fullname == "fname", test_user.fullname
+        assert test_user.site_role == "license", test_user.site_role
+        assert test_user.email == "email", test_user.email
+
     def test_get_user_details_only_username(self):
         test_line = ["username"]
         test_user: TSC.UserItem = TSC.UserItem.CSVImport.create_user_model_from_line(test_line, UserDataTest.logger)