Combined subdomain/domain identification

src/Middleware/InitializeTenancyByDomainOrSubdomain.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Middleware;
+
+use Closure;
+use Illuminate\Support\Str;
+
+class InitializeTenancyByDomainOrSubdomain
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if ($this->isSubdomain($request->getHost())) {
+            return app(InitializeTenancyBySubdomain::class)->handle($request, $next);
+        } else {
+            return app(InitializeTenancyByDomain::class)->handle($request, $next);
+        }
+    }
+
+    protected function isSubdomain(string $hostname): bool
+    {
+        return Str::endsWith($hostname, config('tenancy.central_domains'));
+    }
+}

src/Middleware/InitializeTenancyBySubdomain.php

@@ -7,6 +7,7 @@ namespace Stancl\Tenancy\Middleware;
 use Closure;
 use Illuminate\Http\Response;
 use Stancl\Tenancy\Exceptions\NotASubdomainException;
+use Illuminate\Support\Str;
 
 class InitializeTenancyBySubdomain extends InitializeTenancyByDomain
 {
@@ -51,7 +52,10 @@ class InitializeTenancyBySubdomain extends InitializeTenancyByDomain
         $parts = explode('.', $hostname);
 
         // If we're on localhost or an IP address, then we're not visiting a subdomain.
-        if (in_array(count($parts), [1, 4])) {
+        $notADomain = in_array(count($parts), [1, 4]);
+        $thirdPartyDomain = ! Str::endsWith($hostname, config('tenancy.central_domains'));;
+
+        if ($notADomain || $thirdPartyDomain) {
             $handle = static::$onInvalidSubdomain ?? function ($e) {
                 throw $e;
             };
@@ -59,9 +63,6 @@ class InitializeTenancyBySubdomain extends InitializeTenancyByDomain
             return $handle(new NotASubdomainException($hostname));
         }
 
-        // todo should we verify that the subdomain belongs to one of our central domains?
-        // if yes, then write a test for it.
-
         return $parts[static::$subdomainIndex];
     }
 }