From b92d1d3ec717f2bd99c62d960c6a64b44167efef Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 24 Jan 2023 11:54:56 -0800 Subject: [PATCH 01/16] Logically group query when searching users to scope to company --- app/Http/Controllers/Api/UsersController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index cca829c23..e0c8d409b 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -286,9 +286,11 @@ class UsersController extends Controller $users = Company::scopeCompanyables($users); if ($request->filled('search')) { - $users = $users->SimpleNameSearch($request->get('search')) - ->orWhere('username', 'LIKE', '%'.$request->get('search').'%') - ->orWhere('employee_num', 'LIKE', '%'.$request->get('search').'%'); + $users = $users->where(function ($query) use ($request) { + $query->SimpleNameSearch($request->get('search')) + ->orWhere('username', 'LIKE', '%'.$request->get('search').'%') + ->orWhere('employee_num', 'LIKE', '%'.$request->get('search').'%'); + }); } $users = $users->orderBy('last_name', 'asc')->orderBy('first_name', 'asc'); From a2e47d19fcd12d6759559811e52323d07b504547 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 2 Feb 2023 13:47:00 -0800 Subject: [PATCH 02/16] Scaffold tests for user select list api and begin to implemenet --- .../Api/Users/UsersForSelectListTest.php | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 tests/Feature/Api/Users/UsersForSelectListTest.php diff --git a/tests/Feature/Api/Users/UsersForSelectListTest.php b/tests/Feature/Api/Users/UsersForSelectListTest.php new file mode 100644 index 000000000..fb1dde290 --- /dev/null +++ b/tests/Feature/Api/Users/UsersForSelectListTest.php @@ -0,0 +1,50 @@ +create(); + + $actor = User::factory()->firstAdmin()->create(); + User::factory()->count(3)->create(); + + Passport::actingAs($actor); + $response = $this->getJson(route('api.users.selectlist')); + $response->assertOk(); + + $response->assertJsonStructure([ + 'results', + 'pagination', + 'total_count', + 'page', + 'page_count', + ]); + + $response->assertJson(fn(AssertableJson $json) => $json->has('results', 4)->etc()); + } + + public function testUsersScopedToCompanyWhenMultipleFullCompanySupportEnabled() + { + $this->markTestIncomplete(); + + } + + public function testUsersScopedToCompanyDuringSearchWhenMultipleFullCompanySupportEnabled() + { + $this->markTestIncomplete(); + + + } +} From 89eff23e44ebe454916e4b87e7c7b16bca982f3d Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 2 Feb 2023 17:41:32 -0800 Subject: [PATCH 03/16] Continue implementing tests --- database/factories/SettingFactory.php | 9 +++++ .../Api/Users/UsersForSelectListTest.php | 38 +++++++++++++++++-- tests/TestCase.php | 8 ++++ 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/database/factories/SettingFactory.php b/database/factories/SettingFactory.php index 73a9e049d..cd88cdaf2 100644 --- a/database/factories/SettingFactory.php +++ b/database/factories/SettingFactory.php @@ -52,4 +52,13 @@ class SettingFactory extends Factory 'email_domain' => 'test.com', ]; } + + public function withMultipleFullCompanySupport() + { + return $this->state(function () { + return [ + 'full_multiple_companies_support' => 1, + ]; + }); + } } diff --git a/tests/Feature/Api/Users/UsersForSelectListTest.php b/tests/Feature/Api/Users/UsersForSelectListTest.php index fb1dde290..4769831fd 100644 --- a/tests/Feature/Api/Users/UsersForSelectListTest.php +++ b/tests/Feature/Api/Users/UsersForSelectListTest.php @@ -2,6 +2,7 @@ namespace Tests\Feature\Api\Users; +use App\Models\Company; use App\Models\Setting; use App\Models\User; use Illuminate\Foundation\Testing\RefreshDatabase; @@ -37,14 +38,43 @@ class UsersForSelectListTest extends TestCase public function testUsersScopedToCompanyWhenMultipleFullCompanySupportEnabled() { - $this->markTestIncomplete(); + Setting::factory()->withMultipleFullCompanySupport()->create(); + [$jedi, $sith] = Company::factory()->count(2)->create(); + + User::factory() + ->for($sith) + ->create(['first_name' => 'Darth', 'last_name' => 'Vader']); + + User::factory() + ->for($jedi) + ->count(3) + ->sequence( + ['first_name' => 'Luke', 'last_name' => 'Skywalker'], + ['first_name' => 'Obi-Wan', 'last_name' => 'Kenobi'], + ['first_name' => 'Anakin', 'last_name' => 'Skywalker'], + ) + ->create(); + + Passport::actingAs($jedi->users->first()); + $response = $this->getJson(route('api.users.selectlist')); + $response->assertOk(); + + $results = collect($response->json('results')); + + $this->assertEquals($jedi->users->count(), $results->count()); + + $this->assertTrue( + $results->pluck('text')->contains(fn($text) => str_contains($text, $jedi->users->first()->first_name)) + ); + + $this->assertFalse( + $results->pluck('text')->contains(fn($text) => str_contains($text, $sith->users->first()->first_name)) + ); } public function testUsersScopedToCompanyDuringSearchWhenMultipleFullCompanySupportEnabled() { - $this->markTestIncomplete(); - - + } } diff --git a/tests/TestCase.php b/tests/TestCase.php index 2932d4a69..508234130 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -2,9 +2,17 @@ namespace Tests; +use App\Models\Setting; use Illuminate\Foundation\Testing\TestCase as BaseTestCase; abstract class TestCase extends BaseTestCase { use CreatesApplication; + + protected function setUp(): void + { + parent::setUp(); + + $this->beforeApplicationDestroyed(fn() => Setting::$_cache = null); + } } From 93a62c87c2ec4a194a3a0798f1c2dee98ae2fe19 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 2 Feb 2023 17:57:24 -0800 Subject: [PATCH 04/16] Implement test for searching users --- .../Api/Users/UsersForSelectListTest.php | 38 ++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/tests/Feature/Api/Users/UsersForSelectListTest.php b/tests/Feature/Api/Users/UsersForSelectListTest.php index 4769831fd..73db56047 100644 --- a/tests/Feature/Api/Users/UsersForSelectListTest.php +++ b/tests/Feature/Api/Users/UsersForSelectListTest.php @@ -22,8 +22,7 @@ class UsersForSelectListTest extends TestCase User::factory()->count(3)->create(); Passport::actingAs($actor); - $response = $this->getJson(route('api.users.selectlist')); - $response->assertOk(); + $response = $this->getJson(route('api.users.selectlist'))->assertOk(); $response->assertJsonStructure([ 'results', @@ -57,8 +56,7 @@ class UsersForSelectListTest extends TestCase ->create(); Passport::actingAs($jedi->users->first()); - $response = $this->getJson(route('api.users.selectlist')); - $response->assertOk(); + $response = $this->getJson(route('api.users.selectlist'))->assertOk(); $results = collect($response->json('results')); @@ -75,6 +73,36 @@ class UsersForSelectListTest extends TestCase public function testUsersScopedToCompanyDuringSearchWhenMultipleFullCompanySupportEnabled() { - + Setting::factory()->withMultipleFullCompanySupport()->create(); + + [$jedi, $sith] = Company::factory()->count(2)->create(); + + User::factory() + ->for($sith) + ->create(['first_name' => 'Darth', 'last_name' => 'Vader', 'username' => 'dvader']); + + User::factory() + ->for($jedi) + ->count(3) + ->sequence( + ['first_name' => 'Luke', 'last_name' => 'Skywalker', 'username' => 'lskywalker'], + ['first_name' => 'Obi-Wan', 'last_name' => 'Kenobi', 'username' => 'okenobi'], + ['first_name' => 'Anakin', 'last_name' => 'Skywalker', 'username' => 'askywalker'], + ) + ->create(); + + Passport::actingAs($jedi->users->first()); + + $response = $this->getJson(route('api.users.selectlist', ['search' => 'a']))->assertOk(); + + $results = collect($response->json('results')); + + $this->assertEquals(3, $results->count()); + $this->assertTrue($results->pluck('text')->contains(fn($text) => str_contains($text, 'Luke'))); + $this->assertTrue($results->pluck('text')->contains(fn($text) => str_contains($text, 'Anakin'))); + + $response = $this->getJson(route('api.users.selectlist', ['search' => 'v']))->assertOk(); + $results = collect($response->json('results')); + $this->assertEquals(0, $results->count()); } } From d8e92d29c048e0014d80fecfe7319be318ba902a Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 2 Feb 2023 18:25:54 -0800 Subject: [PATCH 05/16] Improve readability --- .../Api/Users/UsersForSelectListTest.php | 67 +++++++------------ 1 file changed, 26 insertions(+), 41 deletions(-) diff --git a/tests/Feature/Api/Users/UsersForSelectListTest.php b/tests/Feature/Api/Users/UsersForSelectListTest.php index 73db56047..666961fa9 100644 --- a/tests/Feature/Api/Users/UsersForSelectListTest.php +++ b/tests/Feature/Api/Users/UsersForSelectListTest.php @@ -18,41 +18,33 @@ class UsersForSelectListTest extends TestCase { Setting::factory()->create(); - $actor = User::factory()->firstAdmin()->create(); User::factory()->count(3)->create(); - Passport::actingAs($actor); - $response = $this->getJson(route('api.users.selectlist'))->assertOk(); - - $response->assertJsonStructure([ - 'results', - 'pagination', - 'total_count', - 'page', - 'page_count', - ]); - - $response->assertJson(fn(AssertableJson $json) => $json->has('results', 4)->etc()); + Passport::actingAs(User::factory()->firstAdmin()->create()); + $this->getJson(route('api.users.selectlist')) + ->assertOk() + ->assertJsonStructure([ + 'results', + 'pagination', + 'total_count', + 'page', + 'page_count', + ]) + ->assertJson(fn(AssertableJson $json) => $json->has('results', 4)->etc()); } public function testUsersScopedToCompanyWhenMultipleFullCompanySupportEnabled() { Setting::factory()->withMultipleFullCompanySupport()->create(); - [$jedi, $sith] = Company::factory()->count(2)->create(); + $jedi = Company::factory()->has(User::factory()->count(3)->sequence( + ['first_name' => 'Luke', 'last_name' => 'Skywalker', 'username' => 'lskywalker'], + ['first_name' => 'Obi-Wan', 'last_name' => 'Kenobi', 'username' => 'okenobi'], + ['first_name' => 'Anakin', 'last_name' => 'Skywalker', 'username' => 'askywalker'], + ))->create(); - User::factory() - ->for($sith) - ->create(['first_name' => 'Darth', 'last_name' => 'Vader']); - - User::factory() - ->for($jedi) - ->count(3) - ->sequence( - ['first_name' => 'Luke', 'last_name' => 'Skywalker'], - ['first_name' => 'Obi-Wan', 'last_name' => 'Kenobi'], - ['first_name' => 'Anakin', 'last_name' => 'Skywalker'], - ) + $sith = Company::factory() + ->has(User::factory()->state(['first_name' => 'Darth', 'last_name' => 'Vader', 'username' => 'dvader'])) ->create(); Passport::actingAs($jedi->users->first()); @@ -75,20 +67,14 @@ class UsersForSelectListTest extends TestCase { Setting::factory()->withMultipleFullCompanySupport()->create(); - [$jedi, $sith] = Company::factory()->count(2)->create(); + $jedi = Company::factory()->has(User::factory()->count(3)->sequence( + ['first_name' => 'Luke', 'last_name' => 'Skywalker', 'username' => 'lskywalker'], + ['first_name' => 'Obi-Wan', 'last_name' => 'Kenobi', 'username' => 'okenobi'], + ['first_name' => 'Anakin', 'last_name' => 'Skywalker', 'username' => 'askywalker'], + ))->create(); - User::factory() - ->for($sith) - ->create(['first_name' => 'Darth', 'last_name' => 'Vader', 'username' => 'dvader']); - - User::factory() - ->for($jedi) - ->count(3) - ->sequence( - ['first_name' => 'Luke', 'last_name' => 'Skywalker', 'username' => 'lskywalker'], - ['first_name' => 'Obi-Wan', 'last_name' => 'Kenobi', 'username' => 'okenobi'], - ['first_name' => 'Anakin', 'last_name' => 'Skywalker', 'username' => 'askywalker'], - ) + Company::factory() + ->has(User::factory()->state(['first_name' => 'Darth', 'last_name' => 'Vader', 'username' => 'dvader'])) ->create(); Passport::actingAs($jedi->users->first()); @@ -102,7 +88,6 @@ class UsersForSelectListTest extends TestCase $this->assertTrue($results->pluck('text')->contains(fn($text) => str_contains($text, 'Anakin'))); $response = $this->getJson(route('api.users.selectlist', ['search' => 'v']))->assertOk(); - $results = collect($response->json('results')); - $this->assertEquals(0, $results->count()); + $this->assertEquals(0, collect($response->json('results'))->count()); } } From 9a0c66bd305ec2a43cd9f5bb7399af462177f91a Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 2 Feb 2023 18:30:18 -0800 Subject: [PATCH 06/16] Clear some extra lines --- tests/Feature/Api/Users/UsersForSelectListTest.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/Feature/Api/Users/UsersForSelectListTest.php b/tests/Feature/Api/Users/UsersForSelectListTest.php index 666961fa9..960cf4e09 100644 --- a/tests/Feature/Api/Users/UsersForSelectListTest.php +++ b/tests/Feature/Api/Users/UsersForSelectListTest.php @@ -53,11 +53,9 @@ class UsersForSelectListTest extends TestCase $results = collect($response->json('results')); $this->assertEquals($jedi->users->count(), $results->count()); - $this->assertTrue( $results->pluck('text')->contains(fn($text) => str_contains($text, $jedi->users->first()->first_name)) ); - $this->assertFalse( $results->pluck('text')->contains(fn($text) => str_contains($text, $sith->users->first()->first_name)) ); @@ -78,7 +76,6 @@ class UsersForSelectListTest extends TestCase ->create(); Passport::actingAs($jedi->users->first()); - $response = $this->getJson(route('api.users.selectlist', ['search' => 'a']))->assertOk(); $results = collect($response->json('results')); From 0cefc7de1506b0ce8c468f48fa9572361d77d2ca Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 2 Feb 2023 18:37:35 -0800 Subject: [PATCH 07/16] Skip security headers middleware when testing --- app/Http/Middleware/SecurityHeaders.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Http/Middleware/SecurityHeaders.php b/app/Http/Middleware/SecurityHeaders.php index 25f0461fc..f3e7ea7cf 100644 --- a/app/Http/Middleware/SecurityHeaders.php +++ b/app/Http/Middleware/SecurityHeaders.php @@ -3,6 +3,7 @@ namespace App\Http\Middleware; use Closure; +use Illuminate\Support\Facades\App; class SecurityHeaders { @@ -22,6 +23,10 @@ class SecurityHeaders public function handle($request, Closure $next) { + if (App::environment(['testing', 'testing-ci'])) { + return $next($request); + } + $this->removeUnwantedHeaders($this->unwantedHeaderList); $response = $next($request); From 78343ddb7c1269c5f7d59a3e7861ddcd930104e8 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 6 Feb 2023 10:58:10 -0800 Subject: [PATCH 08/16] Add asset's company name to checkout page --- resources/views/hardware/checkout.blade.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index 2b3cdbc19..13c451405 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -32,8 +32,7 @@

@if (($asset->model) && ($asset->model->name)) - {{ $asset->model->name }} - + {{ $asset->model->name }}@if ($asset->company && $asset->company->name) ({{ $asset->company->name }}) @endif @else This asset's model is invalid! From 38cdcdf064a039c7e8a051f0e02fc1f18429e818 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 6 Feb 2023 10:59:51 -0800 Subject: [PATCH 09/16] Eager load company --- app/Http/Controllers/Assets/AssetCheckoutController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Assets/AssetCheckoutController.php b/app/Http/Controllers/Assets/AssetCheckoutController.php index 38f746098..e6326da6b 100644 --- a/app/Http/Controllers/Assets/AssetCheckoutController.php +++ b/app/Http/Controllers/Assets/AssetCheckoutController.php @@ -27,7 +27,7 @@ class AssetCheckoutController extends Controller public function create($assetId) { // Check if the asset exists - if (is_null($asset = Asset::find(e($assetId)))) { + if (is_null($asset = Asset::with('company')->find(e($assetId)))) { return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist')); } From 45e8e9bbed0c33d49f1fe1c9484d278b1c15fd69 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 6 Feb 2023 12:21:09 -0800 Subject: [PATCH 10/16] Move company name to better location --- resources/views/hardware/checkout.blade.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index 13c451405..6b5d337b7 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -26,13 +26,23 @@

{{csrf_field()}} + @if ($asset->company && $asset->company->name) +
+ {{ Form::label('model', trans('admin/companies/general.company'), array('class' => 'col-md-3 control-label')) }} +
+

+ {{ $asset->company->name }} +

+
+
+ @endif
{{ Form::label('model', trans('admin/hardware/form.model'), array('class' => 'col-md-3 control-label')) }}

@if (($asset->model) && ($asset->model->name)) - {{ $asset->model->name }}@if ($asset->company && $asset->company->name) ({{ $asset->company->name }}) @endif + {{ $asset->model->name }} @else This asset's model is invalid! @@ -167,4 +177,4 @@ -@stop \ No newline at end of file +@stop From 0e57e4836eba840698232cd4387df4d1ad5688d5 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 6 Feb 2023 12:21:23 -0800 Subject: [PATCH 11/16] Add translation for Company --- resources/lang/en/admin/companies/general.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/en/admin/companies/general.php b/resources/lang/en/admin/companies/general.php index 37781012b..6ad64db57 100644 --- a/resources/lang/en/admin/companies/general.php +++ b/resources/lang/en/admin/companies/general.php @@ -1,6 +1,7 @@ 'Company', 'select_company' => 'Select Company', 'about_companies' => 'About Companies', 'about_companies_description' => ' You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.', From c03079944a9bc997ca19e83eb4f991624c5ea9b0 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 6 Feb 2023 16:06:13 -0800 Subject: [PATCH 12/16] Be more explicit in test case --- tests/Feature/Api/Users/UsersForSelectListTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Feature/Api/Users/UsersForSelectListTest.php b/tests/Feature/Api/Users/UsersForSelectListTest.php index 960cf4e09..558f36264 100644 --- a/tests/Feature/Api/Users/UsersForSelectListTest.php +++ b/tests/Feature/Api/Users/UsersForSelectListTest.php @@ -52,12 +52,12 @@ class UsersForSelectListTest extends TestCase $results = collect($response->json('results')); - $this->assertEquals($jedi->users->count(), $results->count()); + $this->assertEquals(3, $results->count()); $this->assertTrue( - $results->pluck('text')->contains(fn($text) => str_contains($text, $jedi->users->first()->first_name)) + $results->pluck('text')->contains(fn($text) => str_contains($text, 'Luke')) ); $this->assertFalse( - $results->pluck('text')->contains(fn($text) => str_contains($text, $sith->users->first()->first_name)) + $results->pluck('text')->contains(fn($text) => str_contains($text, 'Darth')) ); } From aae21066585ac11fdfca9b7b8a98a7357f29a310 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 22 Feb 2023 12:02:14 -0800 Subject: [PATCH 13/16] Use existing language translation string --- resources/lang/en/admin/companies/general.php | 1 - resources/views/hardware/checkout.blade.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/lang/en/admin/companies/general.php b/resources/lang/en/admin/companies/general.php index 6ad64db57..37781012b 100644 --- a/resources/lang/en/admin/companies/general.php +++ b/resources/lang/en/admin/companies/general.php @@ -1,7 +1,6 @@ 'Company', 'select_company' => 'Select Company', 'about_companies' => 'About Companies', 'about_companies_description' => ' You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.', diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index 6b5d337b7..3bfecaa1d 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -28,7 +28,7 @@ {{csrf_field()}} @if ($asset->company && $asset->company->name)

- {{ Form::label('model', trans('admin/companies/general.company'), array('class' => 'col-md-3 control-label')) }} + {{ Form::label('model', trans('general.company'), array('class' => 'col-md-3 control-label')) }}

{{ $asset->company->name }} From 931ca98c02e22fe98c0a15e56383dffcc2d7fd95 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 22 Feb 2023 12:33:55 -0800 Subject: [PATCH 14/16] Remove middleware bypass --- app/Http/Middleware/SecurityHeaders.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/Http/Middleware/SecurityHeaders.php b/app/Http/Middleware/SecurityHeaders.php index f3e7ea7cf..c9c5fd287 100644 --- a/app/Http/Middleware/SecurityHeaders.php +++ b/app/Http/Middleware/SecurityHeaders.php @@ -23,9 +23,6 @@ class SecurityHeaders public function handle($request, Closure $next) { - if (App::environment(['testing', 'testing-ci'])) { - return $next($request); - } $this->removeUnwantedHeaders($this->unwantedHeaderList); $response = $next($request); From 7667b0a2167fb8a590da532c1301f0881d1bfd75 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 22 Feb 2023 12:34:35 -0800 Subject: [PATCH 15/16] Remove extra line --- app/Http/Middleware/SecurityHeaders.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Middleware/SecurityHeaders.php b/app/Http/Middleware/SecurityHeaders.php index c9c5fd287..cc1b5fe01 100644 --- a/app/Http/Middleware/SecurityHeaders.php +++ b/app/Http/Middleware/SecurityHeaders.php @@ -23,7 +23,6 @@ class SecurityHeaders public function handle($request, Closure $next) { - $this->removeUnwantedHeaders($this->unwantedHeaderList); $response = $next($request); From f63710fb5c49eb42ce1830bd8e8679d1b5415f57 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 22 Feb 2023 12:34:56 -0800 Subject: [PATCH 16/16] Remove unused import --- app/Http/Middleware/SecurityHeaders.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Middleware/SecurityHeaders.php b/app/Http/Middleware/SecurityHeaders.php index cc1b5fe01..25f0461fc 100644 --- a/app/Http/Middleware/SecurityHeaders.php +++ b/app/Http/Middleware/SecurityHeaders.php @@ -3,7 +3,6 @@ namespace App\Http\Middleware; use Closure; -use Illuminate\Support\Facades\App; class SecurityHeaders {