Skip to content

add oauth api-proxy base url #5

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
yagss merged 1 commit into from
Jul 23, 2019
Merged

add oauth api-proxy base url #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions pipedrive/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@


class Client:
flow_base_url = "https://oauth.pipedrive.com/oauth/"
oauth_flow_base_url = "https://oauth.pipedrive.com/oauth/"
oauth_api_base_url = "https://api-proxy.pipedrive.com/"
oauth_end = "authorize?"
token_end = "token"
api_version = "v1/"
Expand All @@ -30,7 +31,7 @@ def make_request(self, method, endpoint, data=None, json=None, **kwargs):
if self.token:
if self.oauth:
self.header["Authorization"] = "Bearer " + self.token
url = '{0}{1}{2}'.format(self.api_base_url, self.api_version, endpoint)
url = '{0}{1}'.format(self.oauth_api_base_url, endpoint)
else:
url = '{0}{1}{2}?api_token={3}'.format(self.api_base_url, self.api_version, endpoint, self.token)
if method == "get":
Expand Down Expand Up @@ -108,15 +109,15 @@ def get_oauth_uri(self, redirect_uri, state=None):
}
if state is not None:
params['state'] = state
url = self.flow_base_url + self.oauth_end + urlencode(params)
url = self.oauth_flow_base_url + self.oauth_end + urlencode(params)
print(url)
return url
else:
raise Exception("The attributes necessary to get the url were not obtained.")

def exchange_code(self, redirect_uri, code):
if redirect_uri is not None and code is not None:
url = self.flow_base_url + self.token_end
url = self.oauth_flow_base_url + self.token_end
authorization = '{0}:{1}'.format(self.client_id, self.client_secret)
header = {'content-type': 'application/x-www-form-urlencoded',
'Authorization': 'Basic {0}'.format(b64encode(authorization.encode('UTF-8')).decode('UTF-8'))}
Expand All @@ -128,7 +129,7 @@ def exchange_code(self, redirect_uri, code):

def refresh_token(self, refresh_token):
if refresh_token is not None:
url = self.flow_base_url + self.token_end
url = self.oauth_flow_base_url + self.token_end
authorization = '{0}:{1}'.format(self.client_id, self.client_secret)
header = {'content-type': 'application/x-www-form-urlencoded',
'Authorization': 'Basic {0}'.format(b64encode(authorization.encode('UTF-8')).decode('UTF-8'))}
Expand Down