From 0d7c52634ad43a24750d98f263eed708d2f7a134 Mon Sep 17 00:00:00 2001 From: Abrar Ahmad Date: Tue, 18 Oct 2022 16:42:15 +0500 Subject: [PATCH] add cookie property --- src/Middleware/InitializeTenancyByRequestData.php | 5 +++-- tests/RequestDataIdentificationTest.php | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Middleware/InitializeTenancyByRequestData.php b/src/Middleware/InitializeTenancyByRequestData.php index 645b145b..ca29f3d7 100644 --- a/src/Middleware/InitializeTenancyByRequestData.php +++ b/src/Middleware/InitializeTenancyByRequestData.php @@ -12,6 +12,7 @@ use Stancl\Tenancy\Tenancy; class InitializeTenancyByRequestData extends IdentificationMiddleware { public static string $header = 'X-Tenant'; + public static string $cookie = 'X-Tenant'; public static string $queryParameter = 'tenant'; public static ?Closure $onFail = null; @@ -41,8 +42,8 @@ class InitializeTenancyByRequestData extends IdentificationMiddleware return $request->get(static::$queryParameter); } - if (static::$header && $request->hasCookie(static::$header)) { - return $request->cookie(static::$header); + if (static::$cookie && $request->hasCookie(static::$cookie)) { + return $request->cookie(static::$cookie); } return null; diff --git a/tests/RequestDataIdentificationTest.php b/tests/RequestDataIdentificationTest.php index 75ba46cb..e10c00e1 100644 --- a/tests/RequestDataIdentificationTest.php +++ b/tests/RequestDataIdentificationTest.php @@ -20,6 +20,7 @@ beforeEach(function () { afterEach(function () { InitializeTenancyByRequestData::$header = 'X-Tenant'; + InitializeTenancyByRequestData::$cookie = 'X-Tenant'; InitializeTenancyByRequestData::$queryParameter = 'tenant'; }); @@ -46,7 +47,7 @@ test('query parameter identification works', function () { }); test('cookie identification works', function () { - InitializeTenancyByRequestData::$header = 'X-Tenant'; + InitializeTenancyByRequestData::$cookie = 'X-Tenant'; $tenant = Tenant::create(); $this