From 56903d20bfd1bd8b380868de83b15bbb71100733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Thu, 23 Apr 2020 19:08:54 +0200
Subject: [PATCH] Use Telescope tags on universal routes too - fix #346

---
 src/Features/TelescopeTags.php                    | 6 +++++-
 src/Middleware/PreventAccessFromTenantDomains.php | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Features/TelescopeTags.php b/src/Features/TelescopeTags.php
index c1d4450f..e8d1ea55 100644
--- a/src/Features/TelescopeTags.php
+++ b/src/Features/TelescopeTags.php
@@ -7,6 +7,7 @@ namespace Stancl\Tenancy\Features;
 use Laravel\Telescope\IncomingEntry;
 use Laravel\Telescope\Telescope;
 use Stancl\Tenancy\Contracts\Feature;
+use Stancl\Tenancy\Middleware\PreventAccessFromTenantDomains;
 use Stancl\Tenancy\TenantManager;
 
 class TelescopeTags implements Feature
@@ -30,7 +31,10 @@ class TelescopeTags implements Feature
         Telescope::tag(function (IncomingEntry $entry) {
             $tags = $this->getTags($entry);
 
-            if (in_array('tenancy', optional(request()->route())->middleware() ?? [])) {
+            $tenantRoute = PreventAccessFromTenantDomains::routeHasMiddleware(request()->route(), 'tenancy')
+                || PreventAccessFromTenantDomains::routeHasMiddleware(request()->route(), 'universal');
+
+            if ($tenantRoute) {
                 $tags = array_merge($tags, [
                     'tenant:' . tenant('id'),
                 ]);
diff --git a/src/Middleware/PreventAccessFromTenantDomains.php b/src/Middleware/PreventAccessFromTenantDomains.php
index 654babd5..ff7b7f63 100644
--- a/src/Middleware/PreventAccessFromTenantDomains.php
+++ b/src/Middleware/PreventAccessFromTenantDomains.php
@@ -45,7 +45,7 @@ class PreventAccessFromTenantDomains
         return $next($request);
     }
 
-    public function routeHasMiddleware(Route $route, $middleware): bool
+    public static function routeHasMiddleware(Route $route, $middleware): bool
     {
         if (in_array($middleware, $route->middleware(), true)) {
             return true;