From 852579863c58e8d7e6f40f536f2a6941b0c7fca4 Mon Sep 17 00:00:00 2001
From: Sylvie Ye <sye@budget-insight.com>
Date: Mon, 17 Jun 2019 14:46:43 +0200
Subject: [PATCH] [cap/bank] transfer to others beneficiaries than recipient

Can do transfer on iban or phone with some banks,
add some transfer attributes to handle theses cases.

beneficiary_type: type of creditor like 'recipient' for beneficiary in recipient list, 'iban' or 'phone_number'
beneficiary_number: transfer creditor identifiant like 'FRXXXXXXXXXXXXXXXXXXXX' or '06XXXXXX'
beneficiary_label: creditor name for transfer to iban or other
accepted_beneficiary_types: all transfer beneficiary types implemented by the module, default is 'recipient'
---
 weboob/capabilities/bank.py | 34 ++++++++++++++++++++++++++--------
 weboob/exceptions.py        |  5 ++++-
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/weboob/capabilities/bank.py b/weboob/capabilities/bank.py
index b27460211b..b795adc43b 100644
--- a/weboob/capabilities/bank.py
+++ b/weboob/capabilities/bank.py
@@ -46,7 +46,7 @@
     'CapBankTransferAddRecipient',
     'RecipientNotFound', 'AddRecipientError', 'AddRecipientBankError', 'AddRecipientTimeout',
     'AddRecipientStep', 'RecipientInvalidIban', 'RecipientInvalidLabel', 'RecipientInvalidOTP',
-    'Rate', 'CapCurrencyRate',
+    'Rate', 'CapCurrencyRate', 'BeneficiaryType',
 ]
 
 
@@ -566,28 +566,38 @@ def __init__(self, recipient, *values):
         self.recipient = recipient
 
 
+class BeneficiaryType(object):
+    RECIPIENT =          'recipient'
+    IBAN =               'iban'
+    PHONE_NUMBER =       'phone_number'
+
+
 class Transfer(BaseObject, Currency):
     """
     Transfer from an account to a recipient.
     """
-
     amount =          DecimalField('Amount to transfer')
     currency =        StringField('Currency', default=None)
     fees =            DecimalField('Fees', default=None)
 
     exec_date =       Field('Date of transfer', date, datetime)
+    label =           StringField('Reason')
 
     account_id =      StringField('ID of origin account')
     account_iban =    StringField('International Bank Account Number')
     account_label =   StringField('Label of origin account')
     account_balance = DecimalField('Balance of origin account before transfer')
 
-    recipient_id =    StringField('ID of recipient account')
-    recipient_iban =  StringField('International Bank Account Number')
-    recipient_label = StringField('Label of recipient account')
-
-    label =           StringField('Reason')
+    # Information for beneficiary in recipient list
+    recipient_id =      StringField('ID of recipient account')
+    recipient_iban =    StringField('International Bank Account Number')
+    recipient_label =   StringField('Label of recipient account')
 
+    # Information for beneficiary not only in recipient list
+    # Like transfer to iban beneficiary
+    beneficiary_type =    StringField('Transfer creditor number type', default=BeneficiaryType.RECIPIENT)
+    beneficiary_number =  StringField('Transfer creditor number', default=None)
+    beneficiary_label =  StringField('Transfer creditor number', default='Unknown')
 
 class CapBank(CapCollection):
     """
@@ -695,6 +705,8 @@ def iter_pocket(self, account):
 
 
 class CapBankTransfer(CapBank):
+    accepted_beneficiary_types = (BeneficiaryType.RECIPIENT, )
+
     def iter_transfer_recipients(self, account):
         """
         Iter recipients availables for a transfer from a specific account.
@@ -735,12 +747,18 @@ def transfer(self, transfer, **params):
         :raises: :class:`TransferError`
         """
 
+        transfer_not_check_fields = {
+            BeneficiaryType.RECIPIENT: ('id', 'beneficiary_number', 'beneficiary_label',),
+            BeneficiaryType.IBAN: ('id', 'recipient_id', 'recipient_iban', 'recipient_label',),
+            BeneficiaryType.PHONE_NUMBER: ('id', 'recipient_id', 'recipient_iban', 'recipient_label',),
+        }
+
         if not transfer.amount or transfer.amount <= 0:
             raise TransferInvalidAmount('amount must be strictly positive')
 
         t = self.init_transfer(transfer, **params)
         for key, value in t.iter_fields():
-            if hasattr(transfer, key) and key != 'id':
+            if hasattr(transfer, key) and (key not in transfer_not_check_fields[transfer.beneficiary_type]):
                 transfer_val = getattr(transfer, key)
                 try:
                     if hasattr(self, 'transfer_check_%s' % key):
diff --git a/weboob/exceptions.py b/weboob/exceptions.py
index 02f5e0c03e..01ff949cf1 100644
--- a/weboob/exceptions.py
+++ b/weboob/exceptions.py
@@ -60,9 +60,12 @@ class AppValidation(DecoupledValidation):
 
 
 class BrowserRedirect(BrowserInteraction):
-    def __init__(self, url):
+    def __init__(self, url, resource=None):
         self.url = url
 
+        # Needed for transfer redirection
+        self.resource = resource
+
     def __str__(self):
         return 'Redirecting to %s' % self.url
 
-- 
GitLab