[feature] 3.43.0 (#409)

* handle blik with code (#408)

Co-authored-by: Iulian Masar <iulian.masar@codegile.com>

* handle SCA context on get endpoints (#407)

Co-authored-by: Iulian Masar <iulian.masar@codegile.com>

---------

Co-authored-by: Iulian Masar <iulian.masar@codegile.com>

Author: iulian03

mangopay/query.py

@@ -47,7 +47,7 @@ class SelectQuery(BaseQuery):
     def __init__(self, model, *args, **kwargs):
         super(SelectQuery, self).__init__(model, 'GET')
 
-    def get(self, reference, handler=None, resource_model=None, without_client_id=False, **kwargs):
+    def get(self, reference, handler=None, resource_model=None, without_client_id=False, with_query_params=False, **kwargs):
         model = resource_model or self.model
         handler = handler or self.handler
 
@@ -57,7 +57,10 @@ def get(self, reference, handler=None, resource_model=None, without_client_id=Fa
         else:
             url = '%s' % meta_url
 
-        result, data = handler.request(self.method, url, without_client_id=without_client_id)
+        if with_query_params:
+            result, data = handler.request(self.method, url, without_client_id=without_client_id, **kwargs)
+        else:
+            result, data = handler.request(self.method, url, without_client_id=without_client_id)
 
         if 'errors' in data:
             if result.status_code == 404:

mangopay/resources.py

@@ -410,7 +410,7 @@ def is_client_wallet(cls, obj):
     def get(cls, *args, **kwargs):
         if len(args) == 1 and cls.is_client_wallet(args[0]):
             return ClientWallet.get(*tuple(args[0].split('_')), **kwargs)
-        return super(Wallet, cls).get(*args, **kwargs)
+        return super(Wallet, cls).get(with_query_params=True, *args, **kwargs)
 
 
 @python_2_unicode_compatible
@@ -1323,6 +1323,9 @@ class BlikPayIn(PayIn):
     statement_descriptor = CharField(api_name='StatementDescriptor')
     return_url = CharField(api_name='ReturnURL', required=True)
     redirect_url = CharField(api_name='RedirectURL')
+    code = CharField(api_name='Code')
+    ip_address = CharField(api_name='IpAddress')
+    browser_info = BrowserInfoField(api_name='BrowserInfo')
 
     class Meta:
         verbose_name = 'blik_payin'

tests/test_payins.py

@@ -8,7 +8,8 @@
     RecurringPayInRegistration, \
     RecurringPayInCIT, PayInRefund, RecurringPayInMIT, CardPreAuthorizedDepositPayIn, MbwayPayIn, PayPalWebPayIn, \
     GooglePayDirectPayIn, MultibancoPayIn, SatispayPayIn, BlikPayIn, KlarnaPayIn, IdealPayIn, GiropayPayIn, \
-    CardRegistration, BancontactPayIn, SwishPayIn, PayconiqV2PayIn, TwintPayIn, PayByBankPayIn, RecurringPayPalPayInCIT, RecurringPayPalPayInMIT
+    CardRegistration, BancontactPayIn, SwishPayIn, PayconiqV2PayIn, TwintPayIn, PayByBankPayIn, RecurringPayPalPayInCIT, \
+    RecurringPayPalPayInMIT
 from mangopay.utils import (Money, ShippingAddress, Shipping, Billing, Address, SecurityInfo, ApplepayPaymentData,
                             GooglepayPaymentData, DebitedBankAccount, LineItem, CardInfo)
 from tests import settings
@@ -771,6 +772,23 @@ def test_using_api_names_as_payin_attributes(self):
         self.assertIs(payin.Tag, payin.tag)
 
 
+def new_blik(user, credited_wallet):
+    pay_in = BlikPayIn()
+    pay_in.author = user
+    pay_in.credited_wallet = credited_wallet
+    pay_in.fees = Money()
+    pay_in.fees.amount = 300
+    pay_in.fees.currency = 'PLN'
+    pay_in.debited_funds = Money()
+    pay_in.debited_funds.amount = 1000
+    pay_in.debited_funds.currency = 'PLN'
+    pay_in.statement_descriptor = 'test'
+    pay_in.return_url = 'https://example.com?transactionId=wt_57b8f69d-cbcc-4202-9a4f-9a3f3668240b'
+    pay_in.redirect_url = 'https://r3.girogate.de/ti/dumbdummy?tx=140079495229&rs=oHkl4WvsgwtWpMptWpqWlFa90j0EzzO9&cs=e43baf1ae4a556dfb823fd304acc408580c193e04c1a9bcb26699b4185393b05'
+    pay_in.tag = 'Blik tag'
+    return pay_in
+
+
 class PayInsTestLive(BaseTestLive):
     @unittest.skip('Set a breakpoint after creating the mandate, navigate to mandate.redirect_url and confirm')
     def test_PayIns_DirectDebitDirect_Create(self):
@@ -1500,19 +1518,7 @@ def test_PayIns_BlikWeb_Create(self):
         credited_wallet.description = 'WALLET IN PLN'
         credited_wallet = Wallet(**credited_wallet.save())
 
-        pay_in = BlikPayIn()
-        pay_in.author = user
-        pay_in.credited_wallet = credited_wallet
-        pay_in.fees = Money()
-        pay_in.fees.amount = 300
-        pay_in.fees.currency = 'PLN'
-        pay_in.debited_funds = Money()
-        pay_in.debited_funds.amount = 1000
-        pay_in.debited_funds.currency = 'PLN'
-        pay_in.statement_descriptor = 'test'
-        pay_in.return_url = 'https://example.com?transactionId=wt_57b8f69d-cbcc-4202-9a4f-9a3f3668240b'
-        pay_in.redirect_url = 'https://r3.girogate.de/ti/dumbdummy?tx=140079495229&rs=oHkl4WvsgwtWpMptWpqWlFa90j0EzzO9&cs=e43baf1ae4a556dfb823fd304acc408580c193e04c1a9bcb26699b4185393b05'
-        pay_in.tag = 'Blik tag'
+        pay_in = new_blik(user, credited_wallet)
 
         result = BlikPayIn(**pay_in.save())
         fetched = BlikPayIn().get(result.id)
@@ -1527,6 +1533,34 @@ def test_PayIns_BlikWeb_Create(self):
         self.assertEqual("BLIK", result.payment_type)
         self.assertEqual("PAYIN", result.type)
 
+    def test_PayIns_BlikWebWithCode_Create(self):
+        user = BaseTestLive.get_john(True)
+
+        # create wallet
+        credited_wallet = Wallet()
+        credited_wallet.owners = (user,)
+        credited_wallet.currency = 'PLN'
+        credited_wallet.description = 'WALLET IN PLN'
+        credited_wallet = Wallet(**credited_wallet.save())
+
+        pay_in = new_blik(user, credited_wallet)
+        pay_in.code = '777365'
+        pay_in.ip_address = '159.180.248.187'
+        pay_in.browser_info = BaseTest.get_browser_info()
+
+        result = BlikPayIn(**pay_in.save())
+        fetched = BlikPayIn().get(result.id)
+
+        self.assertIsNotNone(result)
+        self.assertIsNotNone(fetched)
+        self.assertEqual(result.id, fetched.id)
+
+        self.assertEqual("CREATED", result.status)
+        self.assertEqual("BLIK", result.payment_type)
+        self.assertIsNotNone(result.code)
+        self.assertIsNotNone(result.ip_address)
+        self.assertIsNotNone(result.browser_info)
+
     def test_PayIns_KlarnaWeb_Create(self):
         user = BaseTestLive.get_john(True)
 

tests/test_users.py

@@ -6,6 +6,7 @@
 import requests
 import responses
 
+from mangopay.exceptions import APIError
 from mangopay.resources import (User, NaturalUser, Wallet,
                                 LegalUser, Transfer, Transaction, NaturalUserSca, LegalUserSca)
 from mangopay.utils import Money, Address
@@ -988,3 +989,14 @@ def test_Users_CloseLegalSca(self):
 
         self.assertEqual(user.id, closed.id)
         self.assertEqual('CLOSED', closed.user_status)
+
+    def test_users_GetTransactionsSca(self):
+        user = BaseTestLive.get_john()
+        with self.assertRaises(APIError):
+            Transaction.all(**{"user_id": user.id, "ScaContext": 'USER_PRESENT'})
+        try:
+            Transaction.all(**{"user_id": user.id, "ScaContext": 'USER_PRESENT'})
+        except APIError as ex:
+            self.assertTrue('PendingUserAction RedirectUrl' in ex.headers.get('www-authenticate'))
+        except Exception as ex:
+            self.assertTrue('PendingUserAction RedirectUrl' in ex.headers.get('www-authenticate'))

tests/test_wallets.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
-from tests import settings
-from tests.resources import NaturalUser, Wallet, Transfer
-
-from tests.test_base import BaseTest
-
+import time
 from datetime import date
 
 import responses
-import time
+
+from mangopay.exceptions import APIError
+from tests import settings
+from tests.resources import NaturalUser, Wallet, Transfer
+from tests.test_base import BaseTest, BaseTestLive
 
 
 class WalletsTest(BaseTest):
@@ -327,4 +327,22 @@ def test_retrieve_wallet_transactions(self):
         transactions = self.legal_user_wallet.transactions.all()
 
         self.assertEqual(len(transactions), 1)
-        self.assertEqual(transactions[0].type, 'TRANSFER')
+        self.assertEqual(transactions[0].type, 'TRANSFER')
+
+
+class WalletsTestLive(BaseTestLive):
+    def test_Wallets_get(self):
+        wallet = BaseTestLive.get_johns_wallet()
+        fetched = Wallet.get(wallet.id)
+        self.assertEqual(wallet.id, fetched.id)
+
+    def test_Wallets_getSca(self):
+        wallet = BaseTestLive.get_johns_wallet()
+        with self.assertRaises(APIError):
+            Wallet.get(wallet.id, ScaContext='USER_PRESENT')
+        try:
+            Wallet.get(wallet.id, ScaContext='USER_PRESENT')
+        except APIError as ex:
+            self.assertTrue('PendingUserAction RedirectUrl' in ex.headers.get('www-authenticate'))
+        except Exception as ex:
+            self.assertTrue('PendingUserAction RedirectUrl' in ex.headers.get('www-authenticate'))