Add more IBAN filters

app/Api/V1/Requests/Models/Account/StoreRequest.php

@@ -63,7 +63,7 @@ public function getAllAccountData(): array
  'order' => $this->convertInteger('order'),
  'currency_code' => $this->convertString('currency_code'),
  'virtual_balance' => $this->convertString('virtual_balance'),
- 'iban' => $this->convertString('iban'),
+ 'iban' => $this->convertIban('iban'),
  'BIC' => $this->convertString('bic'),
  'account_number' => $this->convertString('account_number'),
  'account_role' => $this->convertString('account_role'),

app/Api/V1/Requests/Models/Account/UpdateRequest.php

@@ -51,7 +51,7 @@ public function getUpdateData(): array
  'include_net_worth' => ['include_net_worth', 'boolean'],
  'account_type_name' => ['type', 'convertString'],
  'virtual_balance' => ['virtual_balance', 'convertString'],
- 'iban' => ['iban', 'convertString'],
+ 'iban' => ['iban', 'convertIban'],
  'BIC' => ['bic', 'convertString'],
  'account_number' => ['account_number', 'convertString'],
  'account_role' => ['account_role', 'convertString'],

app/Api/V1/Requests/Models/Transaction/StoreRequest.php

@@ -103,14 +103,14 @@ private function getTransactionData(): array
  // source of transaction. If everything is null, assume cash account.
  'source_id' => $this->integerFromValue((string)$object['source_id']),
  'source_name' => $this->clearString((string)$object['source_name']),
- 'source_iban' => $this->clearString((string)$object['source_iban']),
+ 'source_iban' => $this->clearIban((string)$object['source_iban']),
  'source_number' => $this->clearString((string)$object['source_number']),
  'source_bic' => $this->clearString((string)$object['source_bic']),
 
  // destination of transaction. If everything is null, assume cash account.
  'destination_id' => $this->integerFromValue((string)$object['destination_id']),
  'destination_name' => $this->clearString((string)$object['destination_name']),
- 'destination_iban' => $this->clearString((string)$object['destination_iban']),
+ 'destination_iban' => $this->clearIban((string)$object['destination_iban']),
  'destination_number' => $this->clearString((string)$object['destination_number']),
  'destination_bic' => $this->clearString((string)$object['destination_bic']),
 

app/Http/Requests/AccountFormRequest.php

@@ -57,7 +57,7 @@ public function getAccountData(): array
  'account_type_name' => $this->convertString('objectType'),
  'currency_id' => $this->convertInteger('currency_id'),
  'virtual_balance' => $this->convertString('virtual_balance'),
- 'iban' => $this->convertString('iban'),
+ 'iban' => $this->convertIban('iban'),
  'BIC' => $this->convertString('BIC'),
  'account_number' => $this->convertString('account_number'),
  'account_role' => $this->convertString('account_role'),

app/Repositories/Account/AccountRepository.php

@@ -37,6 +37,7 @@
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
 use FireflyIII\Services\Internal\Update\AccountUpdateService;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
@@ -123,6 +124,7 @@ static function (EloquentBuilder $q1) use ($number): void { // @phpstan-ignore-l
 
  public function findByIbanNull(string $iban, array $types): ?Account
  {
+ $iban = Steam::filterSpaces($iban);
  $query = $this->user->accounts()->where('iban', '!=', '')->whereNotNull('iban');
 
  if (0 !== count($types)) {

app/Repositories/UserGroups/Account/AccountRepository.php

@@ -31,6 +31,7 @@
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Services\Internal\Update\AccountUpdateService;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Support\Collection;
@@ -80,6 +81,7 @@ static function (EloquentBuilder $q1) use ($number): void { // @phpstan-ignore-l
 
  public function findByIbanNull(string $iban, array $types): ?Account
  {
+ $iban = Steam::filterSpaces($iban);
  $query = $this->userGroup->accounts()->where('iban', '!=', '')->whereNotNull('iban');
 
  if (0 !== count($types)) {

app/Rules/UniqueIban.php

@@ -25,6 +25,7 @@
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
+use FireflyIII\Support\Facades\Steam;
 use Illuminate\Contracts\Validation\ValidationRule;
 
 /**
@@ -95,6 +96,10 @@ public function passes($attribute, $value): bool
  $maxCounts = $this->getMaxOccurrences();
 
  foreach ($maxCounts as $type => $max) {
+
+ // make sure to trim the value of $value so all spaces are removed.
+ $value = Steam::filterSpaces($value);
+
  $count = $this->countHits($type, $value);
  app('log')->debug(sprintf('Count for "%s" and IBAN "%s" is %d', $type, $value, $count));
  if ($count > $max) {

app/Support/Request/ConvertsDataTypes.php

@@ -27,6 +27,7 @@
 use Carbon\Exceptions\InvalidDateException;
 use Carbon\Exceptions\InvalidFormatException;
 use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Steam;
 use Illuminate\Support\Collection;
 
 /**
@@ -114,6 +115,11 @@ public function convertString(string $field): string
  return (string)$this->clearString((string)$entry);
  }
 
+ public function convertIban(string $field): string
+ {
+ return Steam::filterSpaces($this->convertString($field));
+ }
+
  public function clearString(?string $string): ?string
  {
  $string = $this->clearStringKeepNewlines($string);
@@ -131,6 +137,12 @@ public function clearString(?string $string): ?string
  return trim($string);
  }
 
+ public function clearIban(?string $string): ?string
+ {
+ $string = $this->clearString($string);
+ return Steam::filterSpaces($string);
+ }
+
  public function clearStringKeepNewlines(?string $string): ?string
  {
  if (null === $string) {

app/Support/Steam.php

@@ -681,11 +681,13 @@ public function filterSpaces(string $string): string
  "\u{202F}", // narrow no-break space
  "\u{3000}", // ideographic space
  "\u{FEFF}", // zero width no -break space
- "\x20", // plain old normal space
+ "\x20", // plain old normal space,
+ ' '
  ];
 
  // clear zalgo text
  $string = preg_replace('/(\pM{2})\pM+/u', '\1', $string);
+ $string = preg_replace('/\s+/', '', $string);
 
  return str_replace($search, '', $string);
  }

app/Validation/FireflyValidator.php

@@ -170,6 +170,7 @@ public function validateIban(mixed $attribute, mixed $value): bool
  "\u{202F}", // narrow no-break space
  "\u{3000}", // ideographic space
  "\u{FEFF}", // zero width no -break space
+ ' ',
  '-',
  '?',
  ];