Skip to content

#25 -- Add the functionality which allows users to connect to GraphSpace using auth token #28

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

Open
JingVT wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

#25 -- Add the functionality which allows users to connect to GraphSpace using auth token #28

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
db48126
add auth_token to client
JingVT Nov 6, 2018
0a90113
Update client.py
JingVT Nov 6, 2018
a66e1e8
Update client.py
JingVT Nov 6, 2018
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: 5 additions & 1 deletion docs/tutorial/tutorial.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ Start here to begin working with `graphspace-python`.
Connecting to GraphSpace
------------------------

You can connect to GraphSpace using your username and password.
You can connect to GraphSpace using your username and password,

>>> from graphspace_python.api.client import GraphSpace
>>> graphspace = GraphSpace('user1@example.com', 'user1')

or using your username and authentication key.
>>> from graphspace_python.api.client import GraphSpace
>>> graphspace = GraphSpace('user1@example.com', auth_token='Basic dXNlcjFAZXhhbXBsZS5jb206dXNlcjE=')

You can also set the api host using the :meth:`~graphspace_python.api.client.GraphSpace.set_api_host`
method if you are using a different server.

Expand Down
14 changes: 13 additions & 1 deletion graphspace_python/api/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,26 @@ class GraphSpace(object):
Groups
]

def __init__(self, username, password):
def __init__(self, username=None, password=None, auth_token=None):
"""Construct a new 'GraphSpace' client object.

Args:
username (str): Email of the user.
password (str): Password of the user.
auth_token (str): Basic authorization value

User can connect to GraphSpace using username and password or username and auth_token.
Example:
>>> from graphspace_python.api.client import GraphSpace
>>> graphspace = GraphSpace('user1@example.com', 'user1')
OR
>>> from graphspace_python.api.client import GraphSpace
>>> graphspace = GraphSpace('user1@example.com', auth_token='Basic dXNlcjFAZXhhbXBsZS5jb206dXNlcjE=')
"""
# self.auth_token = 'Basic %s' % base64.b64encode('{0}:{1}'.format(username, password))
if auth_token is not None:
userpass = base64.b64decode(auth_token[len('Basic')+1:]) #'username:password'
password = userpass[len(username)+1:]
self.auth_token = requests.auth.HTTPBasicAuth(username, password)
self.username = username
self.api_host = API_HOST
Expand Down