From 8b48eb747f996072d1aa47364177454897d0a919 Mon Sep 17 00:00:00 2001 From: Valentin Lehuger Date: Wed, 9 Jan 2019 18:03:20 +0100 Subject: [PATCH] add oauth api-proxy base url --- pipedrive/client.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pipedrive/client.py b/pipedrive/client.py index 0b672e7..0284d92 100644 --- a/pipedrive/client.py +++ b/pipedrive/client.py @@ -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/" @@ -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": @@ -108,7 +109,7 @@ 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: @@ -116,7 +117,7 @@ def get_oauth_uri(self, redirect_uri, state=None): 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'))} @@ -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'))}