From 43d75cdd3811374c28a98447d6b988639bf00767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Fri, 29 May 2020 09:33:49 +0200
Subject: [PATCH] Fix tenants:list

---
 assets/TenancyServiceProvider.stub.php | 3 +++
 assets/tenant_routes.stub.php          | 9 +++++----
 src/Commands/TenantList.php            | 5 +----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/assets/TenancyServiceProvider.stub.php b/assets/TenancyServiceProvider.stub.php
index 93de0346..cc3f72e6 100644
--- a/assets/TenancyServiceProvider.stub.php
+++ b/assets/TenancyServiceProvider.stub.php
@@ -118,6 +118,9 @@ class TenancyServiceProvider extends ServiceProvider
     protected function makeTenancyMiddlewareHighestPriority()
     {
         $tenancyMiddleware = [
+            // Even higher priority than the initialization middleware
+            Middleware\PreventAccessFromCentralDomains::class,
+
             Middleware\InitializeTenancyByDomain::class,
             Middleware\InitializeTenancyBySubdomain::class,
             Middleware\InitializeTenancyByDomainOrSubdomain::class,
diff --git a/assets/tenant_routes.stub.php b/assets/tenant_routes.stub.php
index 3ba3ef72..59d61ac8 100644
--- a/assets/tenant_routes.stub.php
+++ b/assets/tenant_routes.stub.php
@@ -18,10 +18,11 @@ use Stancl\Tenancy\Middleware\PreventAccessFromCentralDomains;
 |
 */
 
-Route::group([
-    'middleware' => ['web', PreventAccessFromCentralDomains::class, InitializeTenancyByDomain::class],
-    'prefix' => '/app',
-], function () {
+Route::middleware([
+    'web',
+    InitializeTenancyByDomain::class,
+    PreventAccessFromCentralDomains::class,
+])->group(function () {
     Route::get('/', function () {
         return 'This is your multi-tenant application. The id of the current tenant is ' . tenant('id');
     });
diff --git a/src/Commands/TenantList.php b/src/Commands/TenantList.php
index 0f3211ab..f470124e 100644
--- a/src/Commands/TenantList.php
+++ b/src/Commands/TenantList.php
@@ -33,12 +33,9 @@ class TenantList extends Command
         $this->info('Listing all tenants.');
         tenancy()
             ->query()
-            ->when($this->option('tenants'), function ($query) {
-                $query->whereIn(tenancy()->model()->getTenantKeyName(), $this->option('tenants'));
-            })
             ->cursor()
             ->each(function (Tenant $tenant) {
-                $this->line("[Tenant] id: {$tenant['id']} @ " . implode('; ', $tenant->domains ?? []));
+                $this->line("[Tenant] id: {$tenant['id']} @ " . implode('; ', $tenant->domains->pluck('domain')->toArray() ?? []));
             });
     }
 }