Skip to content
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

Jump to bottom

Added OAuth 2.0 authorization to Shopping API #369

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Added OAuth 2.0 authorization to Shopping API #369

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9675f78
Add files via upload
xjxckk Feb 17, 2022
640cf52
Update connection.py
xjxckk Feb 19, 2022
ad881d8
Update connection.py
xjxckk Feb 19, 2022
3499a58
Add files via upload
xjxckk Mar 28, 2022
f67802f
Delete connection.py
xjxckk Mar 28, 2022
b1dd060
Add files via upload
xjxckk Mar 28, 2022
818bf08
Add files via upload
xjxckk Mar 28, 2022
4c0c41f
Update __init__.py
xjxckk May 13, 2022
5e8f5c9
Update connection.py
xjxckk May 13, 2022
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
49 changes: 43 additions & 6 deletions ebaysdk/shopping/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@
from ebaysdk.config import Config
from ebaysdk.utils import getNodeText, dict2xml

## Added this / https://github.com/timotheus/ebaysdk-python/issues/347
from base64 import b64encode

from requests.structures import CaseInsensitiveDict
import json
import datetime
import requests


class Connection(BaseConnection):
"""Shopping API class
Expand Down Expand Up @@ -66,6 +74,18 @@ def __init__(self, **kwargs):
self.config = Config(domain=kwargs.get('domain', 'open.api.ebay.com'),
connection_kwargs=kwargs,
config_file=kwargs.get('config_file', 'ebay.yaml'))

## Added this
self.time_of_last_token = datetime.datetime.min

# Building OAuth token
client_id = self.config.get('appid', '')
client_secret = self.config.get('certid', '')
token_string = f'{client_id}:{client_secret}'
token_bytes = token_string.encode('ascii')
token_base64 = b64encode(token_bytes)
self.final_token = token_base64.decode('ascii')
## End of changes

# override yaml defaults with args sent to the constructor
self.config.set('domain', kwargs.get('domain', 'open.api.ebay.com'))
Expand All @@ -79,7 +99,6 @@ def __init__(self, **kwargs):
self.config.set('proxy_host', None)
self.config.set('proxy_port', None)
self.config.set('appid', None)
self.config.set('iaf_token', None)
self.config.set('version', '799')
self.config.set('trackingid', None)
self.config.set('trackingpartnercode', None)
Expand Down Expand Up @@ -146,10 +165,28 @@ def build_request_headers(self, verb):
headers.update({
"X-EBAY-API-TRACKING-PARTNER-CODE": self.config.get('trackingpartnercode')
})

if self.config.get('iaf_token', None):
headers["X-EBAY-API-IAF-TOKEN"] = self.config.get('iaf_token')


## Added this / https://github.com/timotheus/ebaysdk-python/issues/347

time_now = datetime.datetime.now()
time_difference_last_token = time_now - self.time_of_last_token
# print('Time difference last token', time_difference_last_token)
if time_difference_last_token.total_seconds() > 3600:
url = 'https://api.ebay.com/identity/v1/oauth2/token'
headers = CaseInsensitiveDict()
headers['Content-Type'] = 'application/x-www-form-urlencoded'
headers['Authorization'] = f'Basic {self.final_token}'
data = 'grant_type=client_credentials&scope=https%3A%2F%2Fapi.ebay.com%2Foauth%2Fapi_scope'
response = requests.post(url, headers=headers, data=data)
response_dict = response.json()
print('Oauth2.0 token request response:', json.dumps(response_dict, indent=4))
access_token = response_dict['access_token']
# previous_access_token = access_token
request.headers['X-EBAY-API-IAF-TOKEN'] = access_token

self.time_of_last_token = time_now

## End of changes

return headers

Expand Down Expand Up @@ -249,7 +286,7 @@ def _get_resp_body_errors(self):
self._resp_codes = resp_codes

if self.config.get('warnings') and len(warnings) > 0:
log.warning("%s: %s\n\n" % (self.verb, "\n".join(warnings)))
log.warn("%s: %s\n\n" % (self.verb, "\n".join(warnings)))

if self.response.reply.Ack == 'Failure':
if self.config.get('errors'):
Expand Down