From 41127048f1c8199833dd55cda32540653ec9f2ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Thu, 4 Jun 2020 12:21:19 +0200 Subject: [PATCH] Fix notADomain logic --- src/Middleware/InitializeTenancyBySubdomain.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Middleware/InitializeTenancyBySubdomain.php b/src/Middleware/InitializeTenancyBySubdomain.php index 71cf279a..413ae85d 100644 --- a/src/Middleware/InitializeTenancyBySubdomain.php +++ b/src/Middleware/InitializeTenancyBySubdomain.php @@ -54,8 +54,11 @@ class InitializeTenancyBySubdomain extends InitializeTenancyByDomain { $parts = explode('.', $hostname); + $isLocalhost = count($parts) === 1; + $isIpAddress = count(array_filter($parts, 'is_numeric')) === count($parts); + // If we're on localhost or an IP address, then we're not visiting a subdomain. - $notADomain = in_array(count($parts), [1, 4]); + $notADomain = $isLocalhost || $isIpAddress; $thirdPartyDomain = ! Str::endsWith($hostname, config('tenancy.central_domains')); if ($notADomain || $thirdPartyDomain) {