Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 46 additions & 0 deletions src/Emails/Canonicals/Providers/Walla.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?php

namespace Utopia\Emails\Canonicals\Providers;

use Utopia\Emails\Canonicals\Provider;

/**
* Walla
*
* Handles Walla email normalization
* - Supports both walla.co.il and walla.com domains
* - Normalizes to walla.co.il domain
* - Preserves all characters in local part (no plus addressing or dot removal)
*/
class Walla extends Provider
{
private const SUPPORTED_DOMAINS = ['walla.co.il', 'walla.com'];

private const CANONICAL_DOMAIN = 'walla.co.il';

public function supports(string $domain): bool
{
return in_array($domain, self::SUPPORTED_DOMAINS, true);
}

public function getCanonical(string $local, string $domain): array
{
// Convert to lowercase
$normalizedLocal = $this->toLowerCase($local);

return [
'local' => $normalizedLocal,
'domain' => self::CANONICAL_DOMAIN,
];
}

public function getCanonicalDomain(): string
{
return self::CANONICAL_DOMAIN;
}

public function getSupportedDomains(): array
{
return self::SUPPORTED_DOMAINS;
}
}
10 changes: 2 additions & 8 deletions src/Emails/Email.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Utopia\Emails\Canonicals\Providers\Icloud;
use Utopia\Emails\Canonicals\Providers\Outlook;
use Utopia\Emails\Canonicals\Providers\Protonmail;
use Utopia\Emails\Canonicals\Providers\Walla;
use Utopia\Emails\Canonicals\Providers\Yahoo;

class Email
Expand Down Expand Up @@ -288,14 +289,6 @@ public function hasSubdomain(): bool
return ! empty($this->domainInstance->getSub());
}

/**
* Get the email address (as provided, just lowercased and trimmed)
*/
public function getAddress(): string
{
return $this->email;
}

/**
* Get the canonical email address by removing aliases and provider-specific variations
* This method removes plus addressing, dot notation (for Gmail), and other aliasing techniques
Expand Down Expand Up @@ -345,6 +338,7 @@ protected static function initializeProviders(): void
new Icloud,
new Protonmail,
new Fastmail,
new Walla,
];
}
}
Expand Down
75 changes: 75 additions & 0 deletions tests/Canonicals/Providers/WallaTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?php

namespace Utopia\Tests\Canonicals\Providers;

use PHPUnit\Framework\TestCase;
use Utopia\Emails\Canonicals\Providers\Walla;

class WallaTest extends TestCase
{
private Walla $provider;

protected function setUp(): void
{
$this->provider = new Walla;
}

public function test_supports(): void
{
$this->assertTrue($this->provider->supports('walla.co.il'));
$this->assertTrue($this->provider->supports('walla.com'));
$this->assertFalse($this->provider->supports('gmail.com'));
$this->assertFalse($this->provider->supports('outlook.com'));
$this->assertFalse($this->provider->supports('yahoo.com'));
$this->assertFalse($this->provider->supports('example.com'));
}

public function test_get_canonical(): void
{
$testCases = [
// walla.co.il domain
['user.name', 'walla.co.il', 'user.name', 'walla.co.il'],
['user.name+tag', 'walla.co.il', 'user.name+tag', 'walla.co.il'],
['user.name+spam', 'walla.co.il', 'user.name+spam', 'walla.co.il'],
['user.name+newsletter', 'walla.co.il', 'user.name+newsletter', 'walla.co.il'],
['user.name+work', 'walla.co.il', 'user.name+work', 'walla.co.il'],
['user.name+personal', 'walla.co.il', 'user.name+personal', 'walla.co.il'],
['user.name+test123', 'walla.co.il', 'user.name+test123', 'walla.co.il'],
['user.name+anything', 'walla.co.il', 'user.name+anything', 'walla.co.il'],
['user.name+verylongtag', 'walla.co.il', 'user.name+verylongtag', 'walla.co.il'],
['user.name+tag.with.dots', 'walla.co.il', 'user.name+tag.with.dots', 'walla.co.il'],
['user.name+tag-with-hyphens', 'walla.co.il', 'user.name+tag-with-hyphens', 'walla.co.il'],
['user.name+tag_with_underscores', 'walla.co.il', 'user.name+tag_with_underscores', 'walla.co.il'],
['user.name+tag123', 'walla.co.il', 'user.name+tag123', 'walla.co.il'],
['u.s.e.r.n.a.m.e', 'walla.co.il', 'u.s.e.r.n.a.m.e', 'walla.co.il'],
['u.s.e.r.n.a.m.e+tag', 'walla.co.il', 'u.s.e.r.n.a.m.e+tag', 'walla.co.il'],
['user+', 'walla.co.il', 'user+', 'walla.co.il'],
['user.', 'walla.co.il', 'user.', 'walla.co.il'],
['.user', 'walla.co.il', '.user', 'walla.co.il'],
['user..name', 'walla.co.il', 'user..name', 'walla.co.il'],
// walla.com domain (should normalize to walla.co.il)
['user.name+tag', 'walla.com', 'user.name+tag', 'walla.co.il'],
['user.name+spam', 'walla.com', 'user.name+spam', 'walla.co.il'],
['user.name', 'walla.com', 'user.name', 'walla.co.il'],
['u.s.e.r.n.a.m.e', 'walla.com', 'u.s.e.r.n.a.m.e', 'walla.co.il'],
['u.s.e.r.n.a.m.e+tag', 'walla.com', 'u.s.e.r.n.a.m.e+tag', 'walla.co.il'],
];

foreach ($testCases as [$inputLocal, $inputDomain, $expectedLocal, $expectedDomain]) {
$result = $this->provider->getCanonical($inputLocal, $inputDomain);
$this->assertEquals($expectedLocal, $result['local'], "Failed for local: {$inputLocal}@{$inputDomain}");
$this->assertEquals($expectedDomain, $result['domain'], "Failed for domain: {$inputLocal}@{$inputDomain}");
}
}

public function test_get_canonical_domain(): void
{
$this->assertEquals('walla.co.il', $this->provider->getCanonicalDomain());
}

public function test_get_supported_domains(): void
{
$domains = $this->provider->getSupportedDomains();
$this->assertEquals(['walla.co.il', 'walla.com'], $domains);
}
}
3 changes: 1 addition & 2 deletions tests/EmailTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function test_valid_email(): void
$this->assertEquals('company.org', $email->getProvider());
$this->assertEquals('', $email->getSubdomain());
$this->assertEquals(false, $email->hasSubdomain());
$this->assertEquals('test@company.org', $email->getAddress());
$this->assertEquals('test@company.org', $email->get());
}

public function test_email_with_subdomain(): void
Expand Down Expand Up @@ -154,7 +154,6 @@ public function test_email_normalization(): void
$email = new Email(' USER@COMPANY.ORG ');

$this->assertEquals('user@company.org', $email->get());
$this->assertEquals('user@company.org', $email->getAddress());
}

public function test_invalid_email_empty(): void
Expand Down