Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: remove own app from domain checks

Browse Source
This commit is contained in:
Andras Bacsai 2024-07-10 10:29:19 +02:00
parent d05e23264b
commit c2b2d06e47
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap/helpers/shared.php
View File

@ -2168,7 +2168,7 @@ function ip_match($ip, $cidrs, &$match = null)
return false; return false;
} }
function checkIfDomainIsAlreadyUsed(Collection|array $domains, ?string $teamId = null) function checkIfDomainIsAlreadyUsed(Collection|array $domains, ?string $teamId, string $uuid)
{ {
if (is_null($teamId)) { if (is_null($teamId)) {
return response()->json(['error' => 'Team ID is required.'], 400); return response()->json(['error' => 'Team ID is required.'], 400);
@ -2184,8 +2184,8 @@ function checkIfDomainIsAlreadyUsed(Collection|array $domains, ?string $teamId =
return str($domain); return str($domain);
}); });
$applications = Application::ownedByCurrentTeamAPI($teamId)->get('fqdn'); $applications = Application::ownedByCurrentTeamAPI($teamId)->get(['fqdn', 'uuid'])->filter(fn ($app) => $app->uuid !== $uuid);
$serviceApplications = ServiceApplication::ownedByCurrentTeamAPI($teamId)->get('fqdn'); $serviceApplications = ServiceApplication::ownedByCurrentTeamAPI($teamId)->get(['fqdn', 'uuid'])->filter(fn ($app) => $app->uuid !== $uuid);
$domainFound = false; $domainFound = false;
foreach ($applications as $app) { foreach ($applications as $app) {
if (is_null($app->fqdn)) { if (is_null($app->fqdn)) {