Skip to content
This repository has been archived by the owner on Dec 15, 2018. It is now read-only.

Improve headers, add locale #211

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

Improve headers, add locale #211

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bafdee0
improve headers, add locale
Jul 14, 2017
1193099
use variables for params and headers
Jul 15, 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
29 changes: 21 additions & 8 deletions pgoapi/auth_ptc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,33 @@

class AuthPtc(Auth):

PTC_LOGIN_URL1 = 'https://sso.pokemon.com/sso/oauth2.0/authorize?client_id=mobile-app_pokemon-go&redirect_uri=https%3A%2F%2Fwww.nianticlabs.com%2Fpokemongo%2Ferror'
PTC_LOGIN_URL2 = 'https://sso.pokemon.com/sso/login?service=http%3A%2F%2Fsso.pokemon.com%2Fsso%2Foauth2.0%2FcallbackAuthorize'
PTC_LOGIN_URL1 = 'https://sso.pokemon.com/sso/oauth2.0/authorize'
PTC_LOGIN_URL2 = 'https://sso.pokemon.com/sso/login'
PTC_LOGIN_OAUTH = 'https://sso.pokemon.com/sso/oauth2.0/accessToken'
PTC_LOGIN_CLIENT_SECRET = 'w8ScCUXJQc6kXKw8FiOhd8Fixzht18Dq3PEVkUCP5ZPxtgyWsbTvWHFLm2wNY0JR'

def __init__(self, username=None, password=None, user_agent=None, timeout=None):
def __init__(self, username=None, password=None, user_agent=None, timeout=None, locale=None):
Auth.__init__(self)

self._auth_provider = 'ptc'

self._session = requests.session()
self._session.headers = {'User-Agent': user_agent or 'pokemongo/1 CFNetwork/811.4.18 Darwin/16.5.0', 'Host': 'sso.pokemon.com', 'X-Unity-Version': '5.5.1f1'}
self._username = username
self._password = password
self.timeout = timeout or 15

self.locale = locale or 'en_US'
self.timeout = timeout or 10

self._session = requests.session()

self._session.headers = {
'Accept': '*/*',
'Host': 'sso.pokemon.com',
'Connection': 'keep-alive',
'User-Agent': user_agent or 'pokemongo/1 CFNetwork/811.4.18 Darwin/16.5.0',
'Accept-Language': self.locale.lower().replace('_', '-'),
'Accept-Encoding': 'gzip-deflate',
'X-Unity-Version': '5.5.1f1'
}

def set_proxy(self, proxy_config):
self._session.proxies = proxy_config
Expand All @@ -70,7 +82,7 @@ def user_login(self, username=None, password=None, retry=True):
now = get_time()

try:
r = self._session.get(self.PTC_LOGIN_URL1, timeout=self.timeout)
r = self._session.get(self.PTC_LOGIN_URL1, params={'client_id': 'mobile-app_pokemon-go', 'redirect_uri': 'https://www.nianticlabs.com/pokemongo/error', 'locale': self.locale}, timeout=self.timeout)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make these params a variable, like in the other changes

except Timeout:
raise AuthTimeoutException('Auth GET timed out.')
except RequestException as e:
Expand All @@ -82,13 +94,14 @@ def user_login(self, username=None, password=None, retry=True):
'_eventId': 'submit',
'username': self._username,
'password': self._password,
'locale': self.locale
})
except (ValueError, AttributeError) as e:
self.log.error('PTC User Login Error - invalid JSON response: {}'.format(e))
raise AuthException('Invalid JSON response: {}'.format(e))

try:
r = self._session.post(self.PTC_LOGIN_URL2, data=data, timeout=self.timeout, allow_redirects=False)
r = self._session.post(self.PTC_LOGIN_URL2, params={'service': 'http://sso.pokemon.com/sso/oauth2.0/callbackAuthorize'}, headers={'Content-Type': 'application/x-www-form-urlencoded'}, data=data, timeout=self.timeout, allow_redirects=False)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

except Timeout:
raise AuthTimeoutException('Auth POST timed out.')
except RequestException as e:
Expand Down
17 changes: 11 additions & 6 deletions pgoapi/pgoapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@ def __init__(self, provider=None, oauth2_refresh_token=None, username=None, pass
self._hash_server_token = None

self._session = requests.session()
self._session.headers.update({'User-Agent': 'Niantic App'})
self._session.headers.update({
'User-Agent': 'Niantic App',
'Accept': '*/*',
'Content-Type': 'application/x-www-form-urlencoded',
'Accept-Language': 'en-us'
})
self._session.verify = True

if proxy_config is not None:
Expand All @@ -77,9 +82,9 @@ def set_logger(self, logger=None):
def get_api_version():
return 6702

def set_authentication(self, provider=None, oauth2_refresh_token=None, username=None, password=None, proxy_config=None, user_agent=None, timeout=None):
def set_authentication(self, provider=None, oauth2_refresh_token=None, username=None, password=None, proxy_config=None, user_agent=None, timeout=None, locale=None):
if provider == 'ptc':
self._auth_provider = AuthPtc(user_agent=user_agent, timeout=timeout)
self._auth_provider = AuthPtc(user_agent=user_agent, timeout=timeout, locale=locale)
elif provider == 'google':
self._auth_provider = AuthGoogle()
elif provider is None:
Expand Down Expand Up @@ -153,9 +158,9 @@ def app_simulation_login(self):
# Send empty initial request
request = self.create_request()
response = request.call()

time.sleep(1.5)

# Send GET_PLAYER only
request = self.create_request()
request.get_player(player_locale = {'country': 'US', 'language': 'en', 'timezone': 'America/Chicago'})
Expand Down Expand Up @@ -248,7 +253,7 @@ def call(self, use_dict = True):

response = None
execute = True

while execute:
execute = False

Expand Down