Skip to content

Oauth token support #357

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
gpocentek merged 3 commits into from
Nov 9, 2017
Merged

Oauth token support #357

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9651e0
Adds oauth token support
nathschmidt Nov 2, 2017
c84308d
Fixed up linting issue
nathschmidt Nov 2, 2017
aa14acb
Fixed up linting issue
nathschmidt Nov 2, 2017
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
28 changes: 18 additions & 10 deletions gitlab/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,10 @@ class Gitlab(object):
api_version (str): Gitlab API version to use (3 or 4)
"""

def __init__(self, url, private_token=None, email=None, password=None,
ssl_verify=True, http_username=None, http_password=None,
timeout=None, api_version='3', session=None):
def __init__(self, url, private_token=None, oauth_token=None, email=None,
password=None, ssl_verify=True, http_username=None,
http_password=None, timeout=None, api_version='3',
session=None):

self._api_version = str(api_version)
self._server_version = self._server_revision = None
Expand All @@ -81,7 +82,8 @@ def __init__(self, url, private_token=None, email=None, password=None,
self.timeout = timeout
#: Headers that will be used in request to GitLab
self.headers = {}
self._set_token(private_token)
self._set_token(private_token, oauth_token)

#: The user email
self.email = email
#: The user password (associated with email)
Expand Down Expand Up @@ -289,12 +291,18 @@ def set_token(self, token):
DeprecationWarning)
self._set_token(token)

def _set_token(self, token):
self.private_token = token if token else None
if token:
self.headers["PRIVATE-TOKEN"] = token
elif "PRIVATE-TOKEN" in self.headers:
del self.headers["PRIVATE-TOKEN"]
def _set_token(self, private_token, oauth_token=None):
self.private_token = private_token if private_token else None
self.oauth_token = oauth_token if oauth_token else None

if private_token:
self.headers["PRIVATE-TOKEN"] = private_token
if 'Authorization' in self.headers:
del self.headers["Authorization"]
elif oauth_token:
self.headers['Authorization'] = "Bearer %s" % oauth_token
if "PRIVATE-TOKEN" in self.headers:
del self.headers["PRIVATE-TOKEN"]

def set_credentials(self, email, password):
"""Sets the email/login and password for authentication.
Expand Down