Page MenuHomePhorge
Files F117739161

D3656.1775157600.diff
No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

D3656.1775157600.diff
View Options

diff --git a/src/app/Http/Controllers/API/SignupController.php b/src/app/Http/Controllers/API/SignupController.php
--- a/src/app/Http/Controllers/API/SignupController.php
+++ b/src/app/Http/Controllers/API/SignupController.php
@@ -428,7 +428,7 @@
// Check if domain is already registered with us
if ($external) {
- if (Domain::where('namespace', $domain)->first()) {
+ if (Domain::withTrashed()->where('namespace', $domain)->exists()) {
return ['domain' => \trans('validation.domainexists')];
}
}
diff --git a/src/tests/Feature/Controller/SignupTest.php b/src/tests/Feature/Controller/SignupTest.php
--- a/src/tests/Feature/Controller/SignupTest.php
+++ b/src/tests/Feature/Controller/SignupTest.php
@@ -806,16 +806,10 @@
['sales', $domain, false, ['login' => 'The specified login is not available.']],
['root', $domain, false, ['login' => 'The specified login is not available.']],
- // TODO existing (public domain) user
- // ['signuplogin', $domain, false, ['login' => 'The specified login is not available.']],
-
// Domain account
['admin', 'kolabsys.com', true, null],
['testnonsystemdomain', 'invalid', true, ['domain' => 'The specified domain is invalid.']],
['testnonsystemdomain', '.com', true, ['domain' => 'The specified domain is invalid.']],
-
- // existing custom domain
- ['jack', 'kolab.org', true, ['domain' => 'The specified domain is not available.']],
];
}
@@ -836,18 +830,61 @@
/**
* Signup login/domain validation, more cases
- *
- * Note: Technically these include unit tests, but let's keep it here for now.
*/
public function testValidateLoginMore(): void
{
- $group = $this->getTestGroup('group-test@kolabnow.com');
+ Queue::fake();
+
+ // Test registering for an email of an existing group
$login = 'group-test';
$domain = 'kolabnow.com';
+ $group = $this->getTestGroup("{$login}@{$domain}");
+ $external = false;
+
+ $result = $this->invokeMethod(new SignupController(), 'validateLogin', [$login, $domain, $external]);
+
+ $this->assertSame(['login' => 'The specified login is not available.'], $result);
+
+ // Test registering for an email of an existing, but soft-deleted group
+ $group->delete();
+
+ $result = $this->invokeMethod(new SignupController(), 'validateLogin', [$login, $domain, $external]);
+
+ $this->assertSame(['login' => 'The specified login is not available.'], $result);
+
+ // Test registering for an email of an existing user
+ $domain = $this->getPublicDomain();
+ $login = 'signuplogin';
+ $user = $this->getTestUser("{$login}@{$domain}");
$external = false;
$result = $this->invokeMethod(new SignupController(), 'validateLogin', [$login, $domain, $external]);
$this->assertSame(['login' => 'The specified login is not available.'], $result);
+
+ // Test registering for an email of an existing, but soft-deleted user
+ $user->delete();
+
+ $result = $this->invokeMethod(new SignupController(), 'validateLogin', [$login, $domain, $external]);
+
+ $this->assertSame(['login' => 'The specified login is not available.'], $result);
+
+ // Test registering for a domain that exists
+ $external = true;
+ $domain = $this->getTestDomain(
+ 'external.com',
+ ['status' => Domain::STATUS_NEW, 'type' => Domain::TYPE_EXTERNAL]
+ );
+
+ $result = $this->invokeMethod(new SignupController(), 'validateLogin', [$login, $domain->namespace, $external]);
+
+ $this->assertSame(['domain' => 'The specified domain is not available.'], $result);
+
+ // Test registering for a domain that exists but is soft-deleted
+ $domain->delete();
+
+ $result = $this->invokeMethod(new SignupController(), 'validateLogin', [$login, $domain->namespace, $external]);
+
+ $this->assertSame(['domain' => 'The specified domain is not available.'], $result);
}
}

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 2, 7:20 PM (2 d, 23 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18820465
Default Alt Text
D3656.1775157600.diff (4 KB)

Event Timeline