release v1: 65 held-out tasks, 78 bootstrap records, r2e_local adapter, manifest ae94c40b (part 5)
0b7eb60 verified | diff --git a/inapppy/appstore.py b/inapppy/appstore.py | |
| index 84bbc2e..96599c1 100644 | |
| --- a/inapppy/appstore.py | |
| +++ b/inapppy/appstore.py | |
| from inapppy.errors import InAppPyValidationError | |
| from requests.exceptions import RequestException | |
| import requests | |
| - | |
| +# https://developer.apple.com/library/content/releasenotes/General/ValidateAppStoreReceipt/Chapters/ValidateRemotely.html | |
| +# `Table 2-1 Status codes` | |
| api_result_ok = 0 | |
| api_result_errors = { | |
| 21000: InAppPyValidationError('Bad json'), | |
| api_result_errors = { | |
| 21004: InAppPyValidationError('Shared secret mismatch'), | |
| 21005: InAppPyValidationError('Server is unavailable'), | |
| 21006: InAppPyValidationError('Subscription has expired'), | |
| + | |
| + # two following errors can use auto_retry_wrong_env_request. | |
| 21007: InAppPyValidationError('Sandbox receipt was sent to the production env'), | |
| 21008: InAppPyValidationError('Production receipt was sent to the sandbox env'), | |
| } | |
| class AppStoreValidator(object): | |
| bundle_id = None | |
| sandbox = None | |
| url = None | |
| + auto_retry_wrong_env_request = False | |
| - def __init__(self, bundle_id, sandbox=False): | |
| + def __init__(self, bundle_id, sandbox=False, auto_retry_wrong_env_request=False): | |
| + """ Constructor for AppStoreValidator | |
| + | |
| + :param bundle_id: apple bundle id | |
| + :param sandbox: sandbox mode ? | |
| + :param auto_retry_wrong_env_request: auto retry on wrong env ? | |
| + """ | |
| self.bundle_id = bundle_id | |
| self.sandbox = sandbox | |
| if not self.bundle_id: | |
| raise InAppPyValidationError('`bundle_id` cannot be empty') | |
| + self.auto_retry_wrong_env_request = auto_retry_wrong_env_request | |
| + | |
| self._change_url_by_sandbox() | |
| def _change_url_by_sandbox(self): | |
| class AppStoreValidator(object): | |
| def post_json(self, request_json): | |
| self._change_url_by_sandbox() | |
| - return requests.post(self.url, json=request_json).json() | |
| - | |
| - def validate(self, receipt, shared_secret=None): | |
| - receipt_json = {'receipt-data': receipt} | |
| - | |
| - # if shared secret is provided, attach it as `password`. | |
| - if shared_secret: | |
| - receipt_json['password'] = shared_secret | |
| - | |
| try: | |
| - api_response = self.post_json(receipt_json) | |
| + return requests.post(self.url, json=request_json).json() | |
| except (ValueError, RequestException): | |
| raise InAppPyValidationError('HTTP error') | |
| + def validate(self, receipt, shared_secret=None): | |
| + """ Validates receipt against apple services. | |
| + | |
| + :param receipt: receipt | |
| + :param shared_secret: optional shared secret. | |
| + :return: validation result or exception. | |
| + """ | |
| + receipt_json = {'receipt-data': receipt} | |
| + | |
| + if shared_secret: | |
| + receipt_json['password'] = shared_secret | |
| + | |
| + # Do a request. | |
| + api_response = self.post_json(receipt_json) | |
| status = api_response['status'] | |
| + | |
| + # Check retry case. | |
| + if self.auto_retry_wrong_env_request and status in [21007, 21008]: | |
| + # switch environment | |
| + self.sandbox = not self.sandbox | |
| + | |
| + api_response = self.post_json(receipt_json) | |
| + status = api_response['status'] | |
| + | |
| if status != api_result_ok: | |
| error = api_result_errors.get(status, InAppPyValidationError('Unknown API status')) | |
| error.raw_response = api_response | |
| diff --git a/setup.py b/setup.py | |
| index 8fab1fd..df0ca90 100644 | |
| --- a/setup.py | |
| +++ b/setup.py | |
| from setuptools import setup | |
| setup( | |
| name='inapppy', | |
| - version='0.4', | |
| + version='0.5', | |
| packages=['inapppy'], | |
| install_requires=['rsa', 'requests'], | |
| description="In-app purchase validation library for Apple AppStore and GooglePlay.", | |