Added subdomain check to redirect middleware

Author: ArdaKaraderi

src/Middlewares/BlockExternalTraffic.php

@@ -14,7 +14,7 @@ public function handle(Request $request, Closure $next)
         $domain = config('strict-domain.domain');
         $subDomainCheck = config('strict-domain.include_sub_domains');
 
-        if ($request->getHttpHost() === $domain || ($subDomainCheck && Str::endsWith($request->getHttpHost(), $domain))) {
+        if ($request->getHttpHost() === $domain || ($subDomainCheck && Str::contains($request->getHttpHost(), [$domain]))) {
             return $response;
         }
 

src/Middlewares/RedirectExternalTraffic.php

@@ -4,17 +4,21 @@
 
 use Closure;
 use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 
 class RedirectExternalTraffic
 {
     public function handle(Request $request, Closure $next)
     {
         $response = $next($request);
+        $domain = config('strict-domain.domain');
+        $subDomainCheck = config('strict-domain.include_sub_domains');
 
-        if ($request->getHttpHost() !== config('strict-domain.domain')) {
-            return redirect(sprintf('%s/%s', config('app.url'), request()->path()));
+        if ($request->getHttpHost() === config('strict-domain.domain') && ($subDomainCheck && Str::contains($request->getHttpHost(), [$domain]))) {
+            return $response;
         }
 
-        return $response;
+        return redirect(sprintf('%s/%s', config('app.url'), request()->path()));
+
     }
 }