Merge branch '2.x' into laravel-7-support

assets/config.php

@@ -16,7 +16,7 @@ return [
                 'tenants' => 'tenants',
                 'domains' => 'domains',
             ],
-            'cache_store' => false, // What store should be used to cache tenant resolution. Set to false to disable cache, null to use default store, or a string with a specific cache store name.
+            'cache_store' => null, // What store should be used to cache tenant resolution. Set to null to disable cache or a string with a specific cache store name.
             'cache_ttl' => 3600, // seconds
         ],
         'redis' => [

src/Middleware/InitializeTenancyByRequestData.php

@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedException;
+
+class InitializeTenancyByRequestData
+{
+    /** @var string|null */
+    protected $header;
+
+    /** @var string|null */
+    protected $queryParameter;
+
+    /** @var callable */
+    protected $onFail;
+
+    public function __construct(?string $header = 'X-Tenant', ?string $queryParameter = 'tenant', callable $onFail = null)
+    {
+        $this->header = $header;
+        $this->queryParameter = $queryParameter;
+        $this->onFail = $onFail ?? function ($e) {
+            throw $e;
+        };
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if ($request->method() !== 'OPTIONS') {
+            try {
+                $this->initializeTenancy($request);
+            } catch (TenantCouldNotBeIdentifiedException $e) {
+                ($this->onFail)($e);
+            }
+        }
+
+        return $next($request);
+    }
+
+    protected function initializeTenancy(Request $request)
+    {
+        if (tenancy()->initialized) {
+            return;
+        }
+
+        $tenant = null;
+        if ($this->header && $request->hasHeader($this->header)) {
+            $tenant = $request->header($this->header);
+        } elseif ($this->queryParameter && $request->has($this->queryParameter)) {
+            $tenant = $request->get($this->queryParameter);
+        }
+
+        if (! $tenant) {
+            throw new TenantCouldNotBeIdentifiedException($request->getHost());
+        }
+
+        tenancy()->initialize(tenancy()->find($tenant));
+    }
+}

src/StorageDrivers/Database/DatabaseStorageDriver.php

@@ -251,7 +251,6 @@ class DatabaseStorageDriver implements StorageDriver, CanDeleteKeys, CanFindByAn
 
     public function usesCache(): bool
     {
-        // null is also truthy here
+        return $this->app['config']['tenancy.storage_drivers.db.cache_store'] !== null;
-        return $this->app['config']['tenancy.storage_drivers.db.cache_store'] !== false;
     }
 }

tests/CachedResolverTest.php

@@ -21,7 +21,7 @@ class CachedResolverTest extends TestCase
             $this->markTestSkipped('This test is only relevant for the DB storage driver.');
         }
 
-        config(['tenancy.storage_drivers.db.cache_store' => null]); // default driver
+        config(['tenancy.storage_drivers.db.cache_store' => config('cache.default')]);
     }
 
     /** @test */

tests/RequestDataIdentificationTest.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Tests;
+
+use Illuminate\Support\Facades\Route;
+use Stancl\Tenancy\Middleware\InitializeTenancyByRequestData;
+use Stancl\Tenancy\Tenant;
+
+class RequestDataIdentificationTest extends TestCase
+{
+    public $autoCreateTenant = false;
+    public $autoInitTenancy = false;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        config([
+            'tenancy.exempt_domains' => [
+                'localhost',
+            ],
+        ]);
+
+        Route::middleware(InitializeTenancyByRequestData::class)->get('/test', function () {
+            return 'Tenant id: ' . tenant('id');
+        });
+    }
+
+    /** @test */
+    public function header_identification_works()
+    {
+        $this->app->bind(InitializeTenancyByRequestData::class, function () {
+            return new InitializeTenancyByRequestData('X-Tenant');
+        });
+        $tenant = Tenant::new()->save();
+        $tenant2 = Tenant::new()->save();
+
+        $this
+            ->withoutExceptionHandling()
+            ->get('test', [
+                'X-Tenant' => $tenant->id,
+            ])
+            ->assertSee($tenant->id);
+    }
+
+    /** @test */
+    public function query_parameter_identification_works()
+    {
+        $this->app->bind(InitializeTenancyByRequestData::class, function () {
+            return new InitializeTenancyByRequestData(null, 'tenant');
+        });
+        $tenant = Tenant::new()->save();
+        $tenant2 = Tenant::new()->save();
+
+        $this
+            ->withoutExceptionHandling()
+            ->get('test?tenant=' . $tenant->id)
+            ->assertSee($tenant->id);
+    }
+}