mirror of
https://github.com/FliegendeWurst/googleplay-api.git
synced 2024-10-18 06:50:45 +00:00
Revert "Added proxy config for requests"
This reverts commit d422074ea8.
This commit is contained in:
Domenico Iezzi
parent
6e8a02527b
commit
b99ceb8410
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,4 +6,3 @@ __pycache__/
|
||||
build/
|
||||
dist/
|
||||
*.egg-info/
|
||||
.idea/
|
||||
@ -1,15 +1,15 @@
|
||||
#!/usr/bin/python
|
||||
|
||||
|
||||
from base64 import b64decode, urlsafe_b64encode
|
||||
from itertools import chain
|
||||
from Crypto.Util import asn1
|
||||
from Crypto.PublicKey import RSA
|
||||
from Crypto.Hash import SHA
|
||||
from Crypto.Cipher import PKCS1_OAEP
|
||||
from clint.textui import progress
|
||||
|
||||
import requests
|
||||
from Crypto.Cipher import PKCS1_OAEP
|
||||
from Crypto.Hash import SHA
|
||||
from Crypto.PublicKey import RSA
|
||||
from Crypto.Util import asn1
|
||||
from clint.textui import progress
|
||||
from base64 import b64decode, urlsafe_b64encode
|
||||
from itertools import chain
|
||||
|
||||
from . import googleplay_pb2, config, utils
|
||||
|
||||
@ -45,12 +45,9 @@ class GooglePlayAPI(object):
|
||||
CHECKINURL = BASE + "checkin"
|
||||
AUTHURL = BASE + "auth"
|
||||
|
||||
proxies_config = None
|
||||
|
||||
def __init__(self, debug=False, device_codename='bacon',
|
||||
locale=None, timezone=None,
|
||||
sim_operator=None, cell_operator=None,
|
||||
proxies_config=proxies_config):
|
||||
sim_operator=None, cell_operator=None):
|
||||
self.authSubToken = None
|
||||
self.gsfId = None
|
||||
self.debug = debug
|
||||
@ -113,8 +110,7 @@ class GooglePlayAPI(object):
|
||||
|
||||
stringRequest = request.SerializeToString()
|
||||
res = requests.post(self.CHECKINURL, data=stringRequest,
|
||||
headers=headers, verify=ssl_verify,
|
||||
proxies=self.proxies_config, )
|
||||
headers=headers, verify=ssl_verify)
|
||||
response = googleplay_pb2.AndroidCheckinResponse()
|
||||
response.ParseFromString(res.content)
|
||||
|
||||
@ -127,8 +123,7 @@ class GooglePlayAPI(object):
|
||||
request2.accountCookie.append(ac2dmToken)
|
||||
stringRequest = request2.SerializeToString()
|
||||
requests.post(self.CHECKINURL, data=stringRequest,
|
||||
headers=headers, verify=ssl_verify,
|
||||
proxies=self.proxies_config, )
|
||||
headers=headers, verify=ssl_verify)
|
||||
|
||||
return response.androidId
|
||||
|
||||
@ -140,15 +135,13 @@ class GooglePlayAPI(object):
|
||||
upload.deviceConfiguration.CopyFrom(self.deviceBuilder.getDeviceConfig())
|
||||
headers = self.getDefaultHeaders()
|
||||
headers["X-DFE-Enabled-Experiments"] = "cl:billing.select_add_instrument_by_default"
|
||||
headers[
|
||||
"X-DFE-Unsupported-Experiments"] = "nocache:billing.use_charging_poller,market_emails,buyer_currency,prod_baseline,checkin.set_asset_paid_app_field,shekel_test,content_ratings,buyer_currency_in_app,nocache:encrypted_apk,recent_changes"
|
||||
headers["X-DFE-Unsupported-Experiments"] = "nocache:billing.use_charging_poller,market_emails,buyer_currency,prod_baseline,checkin.set_asset_paid_app_field,shekel_test,content_ratings,buyer_currency_in_app,nocache:encrypted_apk,recent_changes"
|
||||
headers["X-DFE-Client-Id"] = "am-android-google"
|
||||
headers["X-DFE-SmallestScreenWidthDp"] = "320"
|
||||
headers["X-DFE-Filter-Level"] = "3"
|
||||
stringRequest = upload.SerializeToString()
|
||||
res = requests.post(self.UPLOADURL, data=stringRequest,
|
||||
headers=headers, verify=ssl_verify,
|
||||
proxies=self.proxies_config, )
|
||||
headers=headers, verify=ssl_verify)
|
||||
googleplay_pb2.ResponseWrapper.FromString(res.content)
|
||||
|
||||
def login(self, email=None, password=None, gsfId=None, authSubToken=None):
|
||||
@ -166,8 +159,7 @@ class GooglePlayAPI(object):
|
||||
encryptedPass = self.encrypt_password(email, password).decode('utf-8')
|
||||
# AC2DM token
|
||||
params = self.deviceBuilder.getLoginParams(email, encryptedPass)
|
||||
response = requests.post(self.AUTHURL, data=params, verify=ssl_verify,
|
||||
proxies=self.proxies_config, )
|
||||
response = requests.post(self.AUTHURL, data=params, verify=ssl_verify)
|
||||
data = response.text.split()
|
||||
params = {}
|
||||
for d in data:
|
||||
@ -204,8 +196,7 @@ class GooglePlayAPI(object):
|
||||
|
||||
def getAuthSubToken(self, email, passwd):
|
||||
requestParams = self.deviceBuilder.getAuthParams(email, passwd)
|
||||
response = requests.post(self.AUTHURL, data=requestParams, verify=ssl_verify,
|
||||
proxies=self.proxies_config, )
|
||||
response = requests.post(self.AUTHURL, data=requestParams, verify=ssl_verify)
|
||||
data = response.text.split()
|
||||
params = {}
|
||||
for d in data:
|
||||
@ -236,8 +227,7 @@ class GooglePlayAPI(object):
|
||||
previousParams.pop('EncryptedPasswd')
|
||||
response = requests.post(self.AUTHURL,
|
||||
data=previousParams,
|
||||
verify=ssl_verify,
|
||||
proxies=self.proxies_config, )
|
||||
verify=ssl_verify)
|
||||
data = response.text.split()
|
||||
params = {}
|
||||
for d in data:
|
||||
@ -265,13 +255,11 @@ class GooglePlayAPI(object):
|
||||
if datapost is not None:
|
||||
response = requests.post(url, data=str(datapost),
|
||||
headers=headers, verify=ssl_verify,
|
||||
timeout=60,
|
||||
proxies=self.proxies_config, )
|
||||
timeout=60)
|
||||
else:
|
||||
response = requests.get(url, headers=headers,
|
||||
verify=ssl_verify,
|
||||
timeout=60,
|
||||
proxies=self.proxies_config, )
|
||||
timeout=60)
|
||||
|
||||
message = googleplay_pb2.ResponseWrapper.FromString(response.content)
|
||||
if message.commands.displayErrorMessage != "":
|
||||
@ -469,13 +457,11 @@ class GooglePlayAPI(object):
|
||||
if not progress_bar:
|
||||
return requests.get(url, headers=headers,
|
||||
cookies=cookies, verify=ssl_verify,
|
||||
timeout=60,
|
||||
proxies=self.proxies_config, ).content
|
||||
timeout=60).content
|
||||
response_content = bytes()
|
||||
response = requests.get(url, headers=headers,
|
||||
cookies=cookies, verify=ssl_verify,
|
||||
stream=True, timeout=60,
|
||||
proxies=self.proxies_config, )
|
||||
stream=True, timeout=60)
|
||||
total_length = int(response.headers.get('content-length'))
|
||||
chunk_size = 32 * (1 << 10) # 32 KB
|
||||
bar = progress.Bar(expected_size=(total_length >> 10))
|
||||
@ -522,8 +508,7 @@ class GooglePlayAPI(object):
|
||||
url = "https://android.clients.google.com/fdfe/%s" % path
|
||||
response = requests.get(url, headers=headers,
|
||||
params=params, verify=ssl_verify,
|
||||
timeout=60,
|
||||
proxies=self.proxies_config, )
|
||||
timeout=60)
|
||||
resObj = googleplay_pb2.ResponseWrapper.FromString(response.content)
|
||||
if resObj.commands.displayErrorMessage != "":
|
||||
raise RequestError(resObj.commands.displayErrorMessage)
|
||||
@ -588,8 +573,7 @@ class GooglePlayAPI(object):
|
||||
url = self.FDFE + path
|
||||
response = requests.post(url, headers=headers,
|
||||
params=params, verify=ssl_verify,
|
||||
timeout=60,
|
||||
proxies=self.proxies_config, )
|
||||
timeout=60)
|
||||
|
||||
resObj = googleplay_pb2.ResponseWrapper.FromString(response.content)
|
||||
if resObj.commands.displayErrorMessage != "":
|
||||
|
||||
Loading…
Reference in New Issue
Block a user