Skip to content

Fix for issue #60 #61

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

Merged
t8y8 merged 3 commits into from
Oct 15, 2016
Merged

Fix for issue #60 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ce4fa3
Fix for issie #60. Make Sign Out a no-op when you are already signed out
t8y8 Oct 14, 2016
c8d1116
Responding to CR feedback. Make a method for exposing is_signed_in an…
t8y8 Oct 14, 2016
c186fd8
Adding another log statement
t8y8 Oct 15, 2016
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
3 changes: 3 additions & 0 deletions tableauserverclient/server/endpoint/auth_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ def sign_in(self, auth_req):

def sign_out(self):
url = "{0}/{1}".format(self.baseurl, 'signout')
# If there are no auth tokens you're already signed out. No-op
if not self.parent_srv.is_signed_in():
return
self.post_request(url, '')
self.parent_srv._clear_auth()
logger.info('Signed out')
7 changes: 6 additions & 1 deletion tableauserverclient/server/endpoint/sites_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,12 @@ def delete(self, site_id):
raise ValueError(error)
url = "{0}/{1}".format(self.baseurl, site_id)
self.delete_request(url)
logger.info('Deleted single site (ID: {0})'.format(site_id))
# If we deleted the site we are logged into
# then we are automatically logged out
if site_id == self.parent_srv.site_id:
logger.info('Deleting current site and clearing auth tokens')
self.parent_srv._clear_auth()
Copy link
Copy Markdown
Contributor

@LGraber LGraber Oct 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a log statement here.

logger.info('Deleted single site (ID: {0}) and signed out'.format(site_id))

# Create new site
def create(self, site_item):
Expand Down
3 changes: 3 additions & 0 deletions tableauserverclient/server/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,6 @@ def http_options(self):
@property
def session(self):
return self._session

def is_signed_in(self):
return self._auth_token is not None
2 changes: 1 addition & 1 deletion test/test_site.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def setUp(self):

# Fake signin
self.server._auth_token = 'j80k54ll2lfMZ0tv97mlPvvSCRyD0DOM'

self.server._site_id = '0626857c-1def-4503-a7d8-7907c3ff9d9f'
self.baseurl = self.server.sites.baseurl

def test_get(self):
Expand Down