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

fix: Pick the right purchase from ios response #3921

Merged
merged 3 commits into from
Mar 16, 2023
Merged

fix: Pick the right purchase from ios response #3921

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8306443
fix: Pick the right purchase from ios response
jawad-khan Mar 8, 2023
eaba166
fix: fixed review objections
jawad-khan Mar 9, 2023
3f64f30
fix: fixed test case
jawad-khan Mar 9, 2023
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
18 changes: 18 additions & 0 deletions ecommerce/extensions/iap/processors/base_iap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ def handle_processor_response(self, response, basket=None):
)
raise GatewayError(validation_response)

if self.NAME == 'ios-iap':
validation_response = self.parse_ios_response(validation_response, product_id)

transaction_id = response.get('transactionId', self._get_transaction_id_from_receipt(validation_response))
# original_transaction_id is primary identifier for a purchase on iOS
original_transaction_id = response.get('originalTransactionId', self._get_attribute_from_receipt(
Expand Down Expand Up @@ -147,6 +150,21 @@ def handle_processor_response(self, response, basket=None):
card_type=None
)

def parse_ios_response(self, response, product_id):
"""
iOS response have multiple receipts data, and we need to select the purchase we just made
jawad-khan marked this conversation as resolved.
Show resolved Hide resolved
with the given product id.
"""
purchases = response['receipt'].get('in_app', [])
for purchase in purchases:
if purchase['product_id'] == product_id and \
response['receipt']['receipt_creation_date_ms'] == purchase['purchase_date_ms']:

response['receipt']['in_app'] = [purchase]
break

return response

def record_processor_response(self, response, transaction_id=None, basket=None, original_transaction_id=None): # pylint: disable=arguments-differ
"""
Save the processor's response to the database for auditing.
Expand Down
57 changes: 39 additions & 18 deletions ecommerce/extensions/iap/tests/processors/test_ios_iap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,41 @@ def setUp(self):
u"IOSInAppPurchase's response was recorded in entry [{entry_id}]."
)
self.RETURN_DATA = {
'transactionId': 'transactionId.ios.test.purchased',
'originalTransactionId': 'originalTransactionId.ios.test.purchased',
'productId': 'ios.test.purchased',
'transactionId': '2000000279135357',
'originalTransactionId': '2000000279135357',
'productId': 'org.edx.mobile.integrationtest',
'purchaseToken': 'inapp:org.edx.mobile:ios.test.purchased',
}
self.mock_validation_response = {
'environment': 'Sandbox',
'receipt': {
'bundle_id': 'org.edx.mobile',
'in_app': [
{
'in_app_ownership_type': 'PURCHASED',
'original_transaction_id': '2000000279124188',
'product_id': 'org.edx.mobile.test_product1',
'purchase_date_ms': '1676562309000',
'transaction_id': '2000000279124188'
},
{
'in_app_ownership_type': 'PURCHASED',
'original_transaction_id': '2000000279128532',
'product_id': 'org.edx.mobile.test_product3',
'purchase_date_ms': '1676562544000',
'transaction_id': '2000000279128532'
},
{
'in_app_ownership_type': 'PURCHASED',
'original_transaction_id': '2000000279135357',
'product_id': 'org.edx.mobile.integrationtest',
'purchase_date_ms': '1676562978000',
'transaction_id': '2000000279135357'
}
],
'receipt_creation_date_ms': '1676562978000',
}
}
jawad-khan marked this conversation as resolved.
Show resolved Hide resolved

def _get_receipt_url(self):
"""
Expand Down Expand Up @@ -124,14 +154,13 @@ def test_handle_processor_response_payment_error(self, mock_ios_validator):
"""
Verify that appropriate PaymentError is raised in absence of originalTransactionId parameter.
"""
mock_ios_validator.return_value = {
'resource': {
'orderId': 'orderId.ios.test.purchased'
}
}
modified_validation_response = self.mock_validation_response
modified_validation_response['receipt']['in_app'][2].pop('original_transaction_id')
mock_ios_validator.return_value = modified_validation_response
with self.assertRaises(PaymentError):
modified_return_data = self.RETURN_DATA
modified_return_data.pop('originalTransactionId')

self.processor.handle_processor_response(modified_return_data, basket=self.basket)

@mock.patch.object(BaseIAP, '_is_payment_redundant')
Expand All @@ -141,11 +170,7 @@ def test_handle_processor_response_redundant_error(self, mock_ios_validator, moc
Verify that appropriate RedundantPaymentNotificationError is raised in case payment with same
originalTransactionId exists with another user
"""
mock_ios_validator.return_value = {
'resource': {
'orderId': 'orderId.ios.test.purchased'
}
}
mock_ios_validator.return_value = self.mock_validation_response
mock_payment_redundant.return_value = True

with self.assertRaises(RedundantPaymentNotificationError):
Expand All @@ -156,11 +181,7 @@ def test_handle_processor_response(self, mock_ios_validator): # pylint: disable
"""
Verify that the processor creates the appropriate PaymentEvent and Source objects.
"""
mock_ios_validator.return_value = {
'resource': {
'orderId': 'orderId.ios.test.purchased'
}
}
mock_ios_validator.return_value = self.mock_validation_response

handled_response = self.processor.handle_processor_response(self.RETURN_DATA, basket=self.basket)
self.assertEqual(handled_response.currency, self.basket.currency)
Expand Down