Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add --token-file option #243

Merged
merged 2 commits into from
Apr 27, 2023
Merged

add --token-file option #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1def6e8
Update session.py
jacalata Mar 11, 2023
a4437f5
update test for new functionality
jacalata Mar 24, 2023
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
21 changes: 10 additions & 11 deletions tabcmd/commands/auth/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ def __init__(self):
self.token_name = None
self.token_value = None
self.password_file = None
self.token_file = None
self.site_name = None # The site name, e.g 'alpodev'
self.site_id = None # The site id, e.g 'abcd-1234-1234-1244-1234'
self.server_url = None
Expand Down Expand Up @@ -69,7 +70,8 @@ def _update_session_data(self, args):
if self.site_name == "default":
self.site_name = ""
self.logging_level = args.logging_level or self.logging_level
self.password_file = args.password_file
self.password_file = args.password_file or self.password_file
self.token_file = args.token_file or self.token_file
self.token_name = args.token_name or self.token_name
self.token_value = args.token_value or self.token_value

Expand Down Expand Up @@ -136,8 +138,8 @@ def _create_new_credential(self, password, credential_type):
def _create_new_token_credential(self):
if self.token_value:
token = self.token_value
elif self.password_file:
token = Session._read_password_from_file(self.password_file)
elif self.token_file:
token = Session._read_password_from_file(self.token_file)
elif self._allow_prompt():
token = getpass.getpass("Token:")
else:
Expand Down Expand Up @@ -274,17 +276,11 @@ def create_session(self, args, logger):
self.logger = logger or log(__class__.__name__, self.logging_level)

credentials = None
if args.password:
if args.password or args.password_file:
self._end_session()
# we don't save the password anywhere, so we pass it along directly
credentials = self._create_new_credential(args.password, Session.PASSWORD_CRED_TYPE)
elif args.password_file:
self._end_session()
if args.username:
credentials = self._create_new_credential(args.password, Session.PASSWORD_CRED_TYPE)
else:
credentials = self._create_new_credential(args.password, Session.TOKEN_CRED_TYPE)
elif args.token_value:
elif args.token_value or args.token_file:
self._end_session()
credentials = self._create_new_token_credential()
else: # no login arguments given - look for saved info
Expand Down Expand Up @@ -333,6 +329,7 @@ def _clear_data(self):
self.server = None
self.last_login_using = None
self.password_file = None
self.token_file = None

self.last_command = None
self.tableau_server = None
Expand Down Expand Up @@ -380,6 +377,7 @@ def _read_from_json(self):
self.token_value = auth["personal_access_token"]
self.last_login_using = auth["last_login_using"]
self.password_file = auth["password_file"]
self.token_file = auth["token_file"]
self.no_prompt = auth["no_prompt"]
self.no_certcheck = auth["no_certcheck"]
self.certificate = auth["certificate"]
Expand Down Expand Up @@ -428,6 +426,7 @@ def _serialize_for_save(self):
"personal_access_token": self.token_value,
"last_login_using": self.last_login_using,
"password_file": self.password_file,
"token_file": self.token_file,
"no_prompt": self.no_prompt,
"no_certcheck": self.no_certcheck,
"certificate": self.certificate,
Expand Down
5 changes: 3 additions & 2 deletions tests/commands/test_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
server=None,
token_name=None,
token_value=None,
token_file=None,
logging_level=None,
no_certcheck=None,
no_prompt=False,
Expand Down Expand Up @@ -293,14 +294,14 @@ def test_create_session_first_time_with_password_file_as_token(
mock_path = _set_mocks_for_json_file_exists(mock_path, False)
test_args = Namespace(**vars(args_to_mock))
test_args.token_name = "mytoken"
test_args.password_file = "filename"
test_args.token_file = "filename"
with mock.patch("builtins.open", mock.mock_open(read_data="my_token")):
new_session = Session()
auth = new_session.create_session(test_args, None)

assert auth is not None, auth
assert auth.auth_token is not None, auth.auth_token
assert new_session.password_file == "filename", new_session
assert new_session.token_file == "filename", new_session
assert mock_tsc.has_been_called()

@mock.patch("tableauserverclient.Server")
Expand Down