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

IBAN validation for SEPA account #6107

Merged
merged 5 commits into from Mar 18, 2022
Merged

IBAN validation for SEPA account #6107

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fd77695
Validate IBAN to match selected country
Mar 16, 2022
7fc4067
Validate if IBAN country code belongs to SEPA zone
Mar 16, 2022
ab1a8a8
SEPA IBAN - fix country code validation
Mar 16, 2022
6164a13
Validate IBAN - adapt Sepa Instant
Mar 17, 2022
174bf28
Validate IBAN - merge listeners
Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 35 additions & 8 deletions desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@
import bisq.desktop.util.FormBuilder;
import bisq.desktop.util.normalization.IBANNormalizer;
import bisq.desktop.util.validation.BICValidator;
import bisq.desktop.util.validation.IBANValidator;
import bisq.desktop.util.validation.SepaIBANValidator;

import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.Country;
Expand All @@ -41,6 +41,9 @@

import javafx.collections.FXCollections;

import java.util.List;
import java.util.Optional;

import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;

Expand All @@ -64,15 +67,19 @@ public static int addFormForBuyer(GridPane gridPane, int gridRow,
}

private final SepaInstantAccount sepaInstantAccount;
private final IBANValidator ibanValidator;
private final SepaIBANValidator sepaIBANValidator;
private final BICValidator bicValidator;

public SepaInstantForm(PaymentAccount paymentAccount, AccountAgeWitnessService accountAgeWitnessService, IBANValidator ibanValidator,
BICValidator bicValidator, InputValidator inputValidator,
GridPane gridPane, int gridRow, CoinFormatter formatter) {
public SepaInstantForm(PaymentAccount paymentAccount,
AccountAgeWitnessService accountAgeWitnessService,
BICValidator bicValidator,
InputValidator inputValidator,
GridPane gridPane,
int gridRow,
CoinFormatter formatter) {
super(paymentAccount, accountAgeWitnessService, inputValidator, gridPane, gridRow, formatter);
this.sepaInstantAccount = (SepaInstantAccount) paymentAccount;
this.ibanValidator = ibanValidator;
this.sepaIBANValidator = new SepaIBANValidator();
this.bicValidator = bicValidator;
}

Expand All @@ -90,7 +97,7 @@ public void addFormForAddAccount() {

InputTextField ibanInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, IBAN);
ibanInputTextField.setTextFormatter(new TextFormatter<>(new IBANNormalizer()));
ibanInputTextField.setValidator(ibanValidator);
ibanInputTextField.setValidator(sepaIBANValidator);
ibanInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
sepaInstantAccount.setIban(newValue);
updateFromInputs();
Expand Down Expand Up @@ -120,14 +127,34 @@ public void addFormForAddAccount() {
sepaInstantAccount.setCountry(country);
}

ibanInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
This conversation was marked as resolved.
Show resolved Hide resolved
if (ibanInputTextField.validate()) {
List<Country> countries = CountryUtil.getAllSepaCountries();
String ibanCountryCode = newValue.substring(0, 2).toUpperCase();
Optional<Country> ibanCountry = countries
.stream()
.filter(c -> c.code.equals(ibanCountryCode))
.findFirst();

if (ibanCountry.isPresent()) {
countryComboBox.setValue(ibanCountry.get());
}
}
});

countryComboBox.valueProperty().addListener((ov, oldValue, newValue) -> {
sepaIBANValidator.setRestrictToCountry(newValue.code);
ibanInputTextField.refreshValidation();
});

updateFromInputs();
}

@Override
public void updateAllInputsValid() {
allInputsValid.set(isAccountNameValid()
&& bicValidator.validate(sepaInstantAccount.getBic()).isValid
&& ibanValidator.validate(sepaInstantAccount.getIban()).isValid
&& sepaIBANValidator.validate(sepaInstantAccount.getIban()).isValid
&& inputValidator.validate(sepaInstantAccount.getHolderName()).isValid
&& sepaInstantAccount.getAcceptedCountryCodes().size() > 0
&& sepaInstantAccount.getSingleTradeCurrency() != null
Expand Down
6 changes: 1 addition & 5 deletions desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
View file
Open in desktop
Expand Up @@ -85,7 +85,6 @@
import bisq.desktop.util.validation.ClearXchangeValidator;
import bisq.desktop.util.validation.F2FValidator;
import bisq.desktop.util.validation.HalCashValidator;
import bisq.desktop.util.validation.SepaIBANValidator;
import bisq.desktop.util.validation.InteracETransferValidator;
import bisq.desktop.util.validation.JapanBankTransferValidator;
import bisq.desktop.util.validation.LengthValidator;
Expand Down Expand Up @@ -155,7 +154,6 @@
@FxmlView
public class FiatAccountsView extends PaymentAccountsView<GridPane, FiatAccountsViewModel> {

private final SepaIBANValidator sepaIBANValidator;
private final BICValidator bicValidator;
private final CapitualValidator capitualValidator;
private final LengthValidator inputValidator;
Expand Down Expand Up @@ -187,7 +185,6 @@ public class FiatAccountsView extends PaymentAccountsView<GridPane, FiatAccounts

@Inject
public FiatAccountsView(FiatAccountsViewModel model,
SepaIBANValidator sepaIBANValidator,
BICValidator bicValidator,
CapitualValidator capitualValidator,
LengthValidator inputValidator,
Expand All @@ -214,7 +211,6 @@ public FiatAccountsView(FiatAccountsViewModel model,
@Named(FormattingUtils.BTC_FORMATTER_KEY) CoinFormatter formatter) {
super(model, accountAgeWitnessService);

this.sepaIBANValidator = sepaIBANValidator;
this.bicValidator = bicValidator;
this.capitualValidator = capitualValidator;
this.inputValidator = inputValidator;
Expand Down Expand Up @@ -535,7 +531,7 @@ private PaymentMethodForm getPaymentMethodForm(PaymentMethod paymentMethod, Paym
case PaymentMethod.SEPA_ID:
return new SepaForm(paymentAccount, accountAgeWitnessService, bicValidator, inputValidator, root, gridRow, formatter);
case PaymentMethod.SEPA_INSTANT_ID:
return new SepaInstantForm(paymentAccount, accountAgeWitnessService, sepaIBANValidator, bicValidator, inputValidator, root, gridRow, formatter);
return new SepaInstantForm(paymentAccount, accountAgeWitnessService, bicValidator, inputValidator, root, gridRow, formatter);
case PaymentMethod.FASTER_PAYMENTS_ID:
return new FasterPaymentsForm(paymentAccount, accountAgeWitnessService, inputValidator, root, gridRow, formatter);
case PaymentMethod.NATIONAL_BANK_ID:
Expand Down