Renamed the CheckAuthorizationMiddleware to AuthorizationMiddleware.

irealworlds · irealworlds · commit a1e42a572807 · 2022-09-16T16:43:21.000+03:00
diff --git a/src/Console/Commands/InstallCommand.php b/src/Console/Commands/InstallCommand.php
@@ -2,7 +2,7 @@
 
 namespace Codestage\Authorization\Console\Commands;
 
-use Codestage\Authorization\Middleware\CheckAuthorizationMiddleware;
+use Codestage\Authorization\Middleware\AuthorizationMiddleware;
 use Codestage\Authorization\Providers\AuthorizationServiceProvider;
 use Error;
 use Illuminate\Console\Command;
@@ -203,14 +203,14 @@ public function addMiddlewareToKernel(): bool
         }
 
         // Build the middleware class' FQN
-        $middlewareQualifiedName = CheckAuthorizationMiddleware::class;
+        $middlewareQualifiedName = AuthorizationMiddleware::class;
         if (!str_starts_with($middlewareQualifiedName, '\\')) {
             $middlewareQualifiedName = '\\' . $middlewareQualifiedName;
         }
 
         // Add the middleware to each group
         foreach ($groups as $group => $groupMiddleware) {
-            if (!in_array(CheckAuthorizationMiddleware::class, $groupMiddleware)) {
+            if (!in_array(AuthorizationMiddleware::class, $groupMiddleware)) {
                 $newFileContents = preg_replace(
                     '/([\'"]' . $group . '[\'"] => \\[[a-zA-Z\\s:,\\/\\\\\'\"]+?)([ \\t]+)((?:(?:\\w|\\\\)+)?SubstituteBindings::class)/m',
                     '$1$2' . $middlewareQualifiedName . "::class,\n$2$3",
diff --git a/src/Middleware/AuthorizationMiddleware.php b/src/Middleware/AuthorizationMiddleware.php
@@ -8,7 +8,7 @@
 use ReflectionException;
 use Throwable;
 
-class CheckAuthorizationMiddleware
+class AuthorizationMiddleware
 {
     /**
      * AuthorizeMiddleware constructor method.
diff --git a/tests/Feature/PermissionsAuthorizationTest.php b/tests/Feature/PermissionsAuthorizationTest.php
@@ -2,7 +2,7 @@
 
 namespace Codestage\Authorization\Tests\Feature;
 
-use Codestage\Authorization\Middleware\CheckAuthorizationMiddleware;
+use Codestage\Authorization\Middleware\AuthorizationMiddleware;
 use Codestage\Authorization\Tests\Fakes\Enums\FakePermission;
 use Codestage\Authorization\Tests\Fakes\Http\Controllers\PermissionsAuthorizationTest\{
     PermissionAuthorizationController1,
@@ -25,7 +25,7 @@ class PermissionsAuthorizationTest extends TestCase
     public function OnlyClassGuard_WhenClassRequiresAuthorizationAndNotAuthenticated_Unauthorized(): void
     {
         // Arrange
-        Route::get('test1', PermissionAuthorizationController1::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PermissionAuthorizationController1::class)->middleware([AuthorizationMiddleware::class])->name('test1');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -45,7 +45,7 @@ public function OnlyClassGuard_WhenClassRequiresAuthorizationAndDoesNotHavePermi
     {
         // Arrange
         $this->authenticateUser();
-        Route::get('test1', PermissionAuthorizationController1::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PermissionAuthorizationController1::class)->middleware([AuthorizationMiddleware::class])->name('test1');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -65,7 +65,7 @@ public function OnlyClassGuard_WhenClassRequiresAuthorizationValid_Success(): vo
     {
         // Arrange
         $this->authenticateUser([FakePermission::ExamplePermission1]);
-        Route::get('test1', PermissionAuthorizationController1::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PermissionAuthorizationController1::class)->middleware([AuthorizationMiddleware::class])->name('test1');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -84,7 +84,7 @@ public function OnlyClassGuard_WhenClassRequiresAuthorizationValid_Success(): vo
     public function MultipleOptional_WhenClassRequiresAuthorizationAndNotAuthenticated_Unauthorized(): void
     {
         // Arrange
-        Route::get('test1', PermissionAuthorizationController2::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PermissionAuthorizationController2::class)->middleware([AuthorizationMiddleware::class])->name('test1');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -104,7 +104,7 @@ public function MultipleOptional_WhenClassRequiresAuthorizationAndDoesNotHavePer
     {
         // Arrange
         $this->authenticateUser();
-        Route::get('test1', PermissionAuthorizationController2::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PermissionAuthorizationController2::class)->middleware([AuthorizationMiddleware::class])->name('test1');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -124,7 +124,7 @@ public function MultipleOptional_WhenClassRequiresAuthorizationAndHasNoValidPerm
     {
         // Arrange
         $this->authenticateUser([FakePermission::ExamplePermission2]);
-        Route::get('test1', PermissionAuthorizationController2::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PermissionAuthorizationController2::class)->middleware([AuthorizationMiddleware::class])->name('test1');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -144,7 +144,7 @@ public function MultipleOptional_WhenClassRequiresAuthorizationAndHasOnePermissi
     {
         // Arrange
         $this->authenticateUser([FakePermission::ExamplePermission1]);
-        Route::get('test1', PermissionAuthorizationController2::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PermissionAuthorizationController2::class)->middleware([AuthorizationMiddleware::class])->name('test1');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -164,7 +164,7 @@ public function MultipleOptional_WhenClassRequiresAuthorizationAndHasOtherPermis
     {
         // Arrange
         $this->authenticateUser([FakePermission::ExamplePermission3]);
-        Route::get('test1', PermissionAuthorizationController2::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PermissionAuthorizationController2::class)->middleware([AuthorizationMiddleware::class])->name('test1');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -184,7 +184,7 @@ public function MultipleOptional_WhenClassRequiresAuthorizationAndHasBothPermiss
     {
         // Arrange
         $this->authenticateUser([FakePermission::ExamplePermission1, FakePermission::ExamplePermission3]);
-        Route::get('test1', PermissionAuthorizationController2::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PermissionAuthorizationController2::class)->middleware([AuthorizationMiddleware::class])->name('test1');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -203,7 +203,7 @@ public function MultipleOptional_WhenClassRequiresAuthorizationAndHasBothPermiss
     public function MultipleRequired_WhenNotAuthenticated_Unauthorized(): void
     {
         // Arrange
-        Route::get('test1', PermissionAuthorizationController3::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PermissionAuthorizationController3::class)->middleware([AuthorizationMiddleware::class])->name('test1');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -223,7 +223,7 @@ public function MultipleRequired_WithoutPermissions_Forbidden(): void
     {
         // Arrange
         $this->authenticateUser();
-        Route::get('test1', PermissionAuthorizationController3::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PermissionAuthorizationController3::class)->middleware([AuthorizationMiddleware::class])->name('test1');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -243,7 +243,7 @@ public function MultipleRequired_WhenHasOnlyFirstPermission_Forbidden(): void
     {
         // Arrange
         $this->authenticateUser([FakePermission::ExamplePermission1]);
-        Route::get('test1', PermissionAuthorizationController3::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PermissionAuthorizationController3::class)->middleware([AuthorizationMiddleware::class])->name('test1');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -263,7 +263,7 @@ public function MultipleRequired_WhenHasOnlySecondPermission_Forbidden(): void
     {
         // Arrange
         $this->authenticateUser([FakePermission::ExamplePermission3]);
-        Route::get('test1', PermissionAuthorizationController3::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PermissionAuthorizationController3::class)->middleware([AuthorizationMiddleware::class])->name('test1');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -283,7 +283,7 @@ public function MultipleRequired_WhenValid_Success(): void
     {
         // Arrange
         $this->authenticateUser([FakePermission::ExamplePermission1, FakePermission::ExamplePermission3]);
-        Route::get('test1', PermissionAuthorizationController3::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PermissionAuthorizationController3::class)->middleware([AuthorizationMiddleware::class])->name('test1');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -302,8 +302,8 @@ public function MultipleRequired_WhenValid_Success(): void
     public function MultipleRequiredOnClassAndMethod_WhenNotAuthenticated_Unauthorized(): void
     {
         // Arrange
-        Route::get('test1', [PermissionAuthorizationController4::class, 'onlyRequiresClassPermissions'])->middleware([CheckAuthorizationMiddleware::class])->name('test1');
-        Route::get('test2', [PermissionAuthorizationController4::class, 'requiresClassAndMethodPermissions'])->middleware([CheckAuthorizationMiddleware::class])->name('test2');
+        Route::get('test1', [PermissionAuthorizationController4::class, 'onlyRequiresClassPermissions'])->middleware([AuthorizationMiddleware::class])->name('test1');
+        Route::get('test2', [PermissionAuthorizationController4::class, 'requiresClassAndMethodPermissions'])->middleware([AuthorizationMiddleware::class])->name('test2');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -325,8 +325,8 @@ public function MultipleRequiredOnClassAndMethod_WithoutPermissions_Forbidden():
     {
         // Arrange
         $this->authenticateUser();
-        Route::get('test1', [PermissionAuthorizationController4::class, 'onlyRequiresClassPermissions'])->middleware([CheckAuthorizationMiddleware::class])->name('test1');
-        Route::get('test2', [PermissionAuthorizationController4::class, 'requiresClassAndMethodPermissions'])->middleware([CheckAuthorizationMiddleware::class])->name('test2');
+        Route::get('test1', [PermissionAuthorizationController4::class, 'onlyRequiresClassPermissions'])->middleware([AuthorizationMiddleware::class])->name('test1');
+        Route::get('test2', [PermissionAuthorizationController4::class, 'requiresClassAndMethodPermissions'])->middleware([AuthorizationMiddleware::class])->name('test2');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -351,8 +351,8 @@ public function MultipleRequiredOnClassAndMethod_WhenOnlyHasOneClassPermission_F
             FakePermission::ExamplePermission1,
             FakePermission::ExamplePermission2
         ]);
-        Route::get('test1', [PermissionAuthorizationController4::class, 'onlyRequiresClassPermissions'])->middleware([CheckAuthorizationMiddleware::class])->name('test1');
-        Route::get('test2', [PermissionAuthorizationController4::class, 'requiresClassAndMethodPermissions'])->middleware([CheckAuthorizationMiddleware::class])->name('test2');
+        Route::get('test1', [PermissionAuthorizationController4::class, 'onlyRequiresClassPermissions'])->middleware([AuthorizationMiddleware::class])->name('test1');
+        Route::get('test2', [PermissionAuthorizationController4::class, 'requiresClassAndMethodPermissions'])->middleware([AuthorizationMiddleware::class])->name('test2');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -377,8 +377,8 @@ public function MultipleRequiredOnClassAndMethod_WhenHasClassPermissions_Forbidd
             FakePermission::ExamplePermission1,
             FakePermission::ExamplePermission3
         ]);
-        Route::get('test1', [PermissionAuthorizationController4::class, 'onlyRequiresClassPermissions'])->middleware([CheckAuthorizationMiddleware::class])->name('test1');
-        Route::get('test2', [PermissionAuthorizationController4::class, 'requiresClassAndMethodPermissions'])->middleware([CheckAuthorizationMiddleware::class])->name('test2');
+        Route::get('test1', [PermissionAuthorizationController4::class, 'onlyRequiresClassPermissions'])->middleware([AuthorizationMiddleware::class])->name('test1');
+        Route::get('test2', [PermissionAuthorizationController4::class, 'requiresClassAndMethodPermissions'])->middleware([AuthorizationMiddleware::class])->name('test2');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -404,8 +404,8 @@ public function MultipleRequiredOnClassAndMethod_WhenHasClassAndMethodPermission
             FakePermission::ExamplePermission2,
             FakePermission::ExamplePermission3
         ]);
-        Route::get('test1', [PermissionAuthorizationController4::class, 'onlyRequiresClassPermissions'])->middleware([CheckAuthorizationMiddleware::class])->name('test1');
-        Route::get('test2', [PermissionAuthorizationController4::class, 'requiresClassAndMethodPermissions'])->middleware([CheckAuthorizationMiddleware::class])->name('test2');
+        Route::get('test1', [PermissionAuthorizationController4::class, 'onlyRequiresClassPermissions'])->middleware([AuthorizationMiddleware::class])->name('test1');
+        Route::get('test2', [PermissionAuthorizationController4::class, 'requiresClassAndMethodPermissions'])->middleware([AuthorizationMiddleware::class])->name('test2');
 
         // Act
         /** @var TestResponse[] $responses */
diff --git a/tests/Feature/PolicyAuthorizationTest.php b/tests/Feature/PolicyAuthorizationTest.php
@@ -3,7 +3,7 @@
 namespace Codestage\Authorization\Tests\Feature;
 
 use Carbon\Carbon;
-use Codestage\Authorization\Middleware\CheckAuthorizationMiddleware;
+use Codestage\Authorization\Middleware\AuthorizationMiddleware;
 use Codestage\Authorization\Tests\Fakes\Http\Controllers\PolicyAuthorizationTest\PolicyAuthorizationTestController1;
 use Codestage\Authorization\Tests\TestCase;
 use Illuminate\Support\Facades\Route;
@@ -19,7 +19,7 @@ class PolicyAuthorizationTest extends TestCase
     public function Authorize_WhenClassRequiresPolicyAndNotAuthenticated_Unauthorized(): void
     {
         // Arrange
-        Route::get('test1', PolicyAuthorizationTestController1::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PolicyAuthorizationTestController1::class)->middleware([AuthorizationMiddleware::class])->name('test1');
 
         // Act
         /** @var TestResponse[] $responses */
@@ -39,7 +39,7 @@ public function Authorize_WhenClassRequiresPolicyWhichFails_Forbidden(): void
     {
         // Arrange
         $this->authenticateUser();
-        Route::get('test1', PolicyAuthorizationTestController1::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PolicyAuthorizationTestController1::class)->middleware([AuthorizationMiddleware::class])->name('test1');
         Carbon::setTestNow(Carbon::parse('2001-07-26T00:00:00Z'));
 
         // Act
@@ -60,7 +60,7 @@ public function Authorize_WhenClassRequiresPolicyWhichPasses_Success(): void
     {
         // Arrange
         $this->authenticateUser();
-        Route::get('test1', PolicyAuthorizationTestController1::class)->middleware([CheckAuthorizationMiddleware::class])->name('test1');
+        Route::get('test1', PolicyAuthorizationTestController1::class)->middleware([AuthorizationMiddleware::class])->name('test1');
         Carbon::setTestNow(Carbon::parse('2001-12-25T00:00:00Z'));
 
         // Act
diff --git a/tests/Feature/RoleAuthorizationTest.php b/tests/Feature/RoleAuthorizationTest.php
diff --git a/tests/Feature/SimpleAuthorizationTest.php b/tests/Feature/SimpleAuthorizationTest.php

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use ReflectionException;`
`9`	`9`	`use Throwable;`
`10`	`10`
`11`		`-class CheckAuthorizationMiddleware`
	`11`	`+class AuthorizationMiddleware`
`12`	`12`	`{`
`13`	`13`	`/**`
`14`	`14`	`* AuthorizeMiddleware constructor method.`