refactor(http): optimize request authorization and validation

app/Http/Admin/Request/PassportLoginRequest.php

@@ -12,6 +12,7 @@
 
 namespace App\Http\Admin\Request;
 
+use App\Http\Common\Request\Trait\NoAuthorizeTrait;
 use Hyperf\Collection\Arr;
 use Hyperf\Swagger\Annotation\Property;
 use Hyperf\Swagger\Annotation\Schema;
@@ -27,11 +28,7 @@ class PassportLoginRequest extends FormRequest
 {
     use ClientIpRequestTrait;
     use ClientOsTrait;
-
-    public function authorize(): bool
-    {
-        return true;
-    }
+    use NoAuthorizeTrait;
 
     public function rules(): array
     {

app/Http/Admin/Request/Permission/BatchGrantPermissionsForRoleRequest.php

@@ -12,6 +12,7 @@
 
 namespace App\Http\Admin\Request\Permission;
 
+use App\Http\Common\Request\Trait\NoAuthorizeTrait;
 use Hyperf\Swagger\Annotation\Property;
 use Hyperf\Swagger\Annotation\Schema;
 use Hyperf\Validation\Request\FormRequest;
@@ -24,10 +25,7 @@
 )]
 class BatchGrantPermissionsForRoleRequest extends FormRequest
 {
-    public function authorize(): bool
-    {
-        return true;
-    }
+    use NoAuthorizeTrait;
 
     public function rules(): array
     {

app/Http/Admin/Request/Permission/BatchGrantRolesForUserRequest.php

@@ -12,6 +12,7 @@
 
 namespace App\Http\Admin\Request\Permission;
 
+use App\Http\Common\Request\Trait\NoAuthorizeTrait;
 use Hyperf\Swagger\Annotation\Property;
 use Hyperf\Swagger\Annotation\Schema;
 use Hyperf\Validation\Request\FormRequest;
@@ -24,10 +25,7 @@
 )]
 class BatchGrantRolesForUserRequest extends FormRequest
 {
-    public function authorize(): bool
-    {
-        return true;
-    }
+    use NoAuthorizeTrait;
 
     public function rules(): array
     {

app/Http/Admin/Request/Permission/MenuRequest.php

@@ -12,6 +12,7 @@
 
 namespace App\Http\Admin\Request\Permission;
 
+use App\Http\Common\Request\Trait\NoAuthorizeTrait;
 use App\Schema\MenuSchema;
 use Hyperf\Validation\Request\FormRequest;
 
@@ -24,10 +25,7 @@
 )]
 class MenuRequest extends FormRequest
 {
-    public function authorize()
-    {
-        return true;
-    }
+    use NoAuthorizeTrait;
 
     public function rules(): array
     {

app/Http/Admin/Request/Permission/PermissionRequest.php

@@ -12,6 +12,7 @@
 
 namespace App\Http\Admin\Request\Permission;
 
+use App\Http\Common\Request\Trait\NoAuthorizeTrait;
 use App\Schema\UserSchema;
 use Hyperf\Validation\Request\FormRequest;
 
@@ -23,10 +24,7 @@
 )]
 class PermissionRequest extends FormRequest
 {
-    public function authorize(): bool
-    {
-        return true;
-    }
+    use NoAuthorizeTrait;
 
     public function rules(): array
     {

app/Http/Admin/Request/Permission/RoleRequest.php

@@ -12,6 +12,8 @@
 
 namespace App\Http\Admin\Request\Permission;
 
+use App\Http\Common\Request\Trait\HttpMethodTrait;
+use App\Http\Common\Request\Trait\NoAuthorizeTrait;
 use App\Schema\RoleSchema;
 use Hyperf\Validation\Request\FormRequest;
 
@@ -23,20 +25,30 @@
 )]
 class RoleRequest extends FormRequest
 {
-    public function authorize(): bool
-    {
-        return true;
-    }
+    use HttpMethodTrait;
+    use NoAuthorizeTrait;
 
     public function rules(): array
     {
-        return [
+        $rules = [
             'name' => 'required|string|max:60',
-            'code' => 'required|string|max:60',
+            'code' => [
+                'required',
+                'string',
+                'max:60',
+                'regex:/^[a-zA-Z0-9_]+$/',
+            ],
             'status' => 'sometimes|integer|in:1,2',
             'sort' => 'required|integer',
             'remark' => 'nullable|string|max:255',
         ];
+        if ($this->isCreate()) {
+            $rules['code'][] = 'unique:role,code';
+        }
+        if ($this->isUpdate()) {
+            $rules['code'][] = 'unique:role,code,' . $this->route('id');
+        }
+        return $rules;
     }
 
     public function attributes(): array

app/Http/Admin/Request/Permission/UserRequest.php

@@ -12,6 +12,7 @@
 
 namespace App\Http\Admin\Request\Permission;
 
+use App\Http\Common\Request\Trait\NoAuthorizeTrait;
 use App\Schema\UserSchema;
 use Hyperf\Validation\Request\FormRequest;
 use Mine\Swagger\Attributes\FormRequest as FormRequestAnnotation;
@@ -46,10 +47,7 @@
 )]
 class UserRequest extends FormRequest
 {
-    public function authorize(): bool
-    {
-        return true;
-    }
+    use NoAuthorizeTrait;
 
     public function rules(): array
     {

app/Http/Admin/Request/UploadRequest.php

@@ -12,6 +12,7 @@
 
 namespace App\Http\Admin\Request;
 
+use App\Http\Common\Request\Trait\NoAuthorizeTrait;
 use Hyperf\Swagger\Annotation\Property;
 use Hyperf\Swagger\Annotation\Schema;
 use Hyperf\Validation\Request\FormRequest;
@@ -24,10 +25,7 @@
 )]
 class UploadRequest extends FormRequest
 {
-    public function authorize(): bool
-    {
-        return true;
-    }
+    use NoAuthorizeTrait;
 
     public function rules(): array
     {

app/Http/Api/Request/V1/UserRequest.php

@@ -12,6 +12,7 @@
 
 namespace App\Http\Api\Request\V1;
 
+use App\Http\Common\Request\Trait\NoAuthorizeTrait;
 use App\Schema\UserSchema;
 use Hyperf\Validation\Request\FormRequest;
 
@@ -23,10 +24,7 @@
 )]
 class UserRequest extends FormRequest
 {
-    public function authorize(): bool
-    {
-        return true;
-    }
+    use NoAuthorizeTrait;
 
     public function rules(): array
     {

app/Http/Common/Request/Trait/HttpMethodTrait.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  [email protected]
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Http\Common\Request\Trait;
+
+use Hyperf\Validation\Request\FormRequest;
+
+/**
+ * @mixin FormRequest
+ */
+trait HttpMethodTrait
+{
+    public function isCreate(): bool
+    {
+        return $this->isMethod('POST');
+    }
+
+    public function isUpdate(): bool
+    {
+        return $this->isMethod('PUT') || $this->isMethod('PATCH');
+    }
+
+    public function isDelete(): bool
+    {
+        return $this->isMethod('DELETE');
+    }
+
+    public function isSearch(): bool
+    {
+        return $this->isMethod('GET');
+    }
+}

app/Http/Common/Request/Trait/NoAuthorizeTrait.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  [email protected]
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Http\Common\Request\Trait;
+
+trait NoAuthorizeTrait
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+}

app/Model/Permission/Menu.php

@@ -16,6 +16,7 @@
 use App\Model\Enums\User\Status;
 use Carbon\Carbon;
 use Hyperf\Database\Model\Collection;
+use Hyperf\Database\Model\Events\Deleting;
 use Hyperf\Database\Model\Relations\BelongsToMany;
 use Hyperf\DbConnection\Model\Model as MineModel;
 
@@ -88,4 +89,9 @@ public function children()
             ->orderBy('sort')
             ->with('children');
     }
+
+    public function deleting(Deleting $event)
+    {
+        $this->roles()->detach();
+    }
 }

app/Model/Permission/Role.php

@@ -15,6 +15,7 @@
 use App\Model\Enums\User\Status;
 use Carbon\Carbon;
 use Hyperf\Database\Model\Collection;
+use Hyperf\Database\Model\Events\Deleting;
 use Hyperf\Database\Model\Relations\BelongsToMany;
 use Hyperf\DbConnection\Model\Model as MineModel;
 
@@ -83,4 +84,10 @@ public function users(): BelongsToMany
             'user_id'
         );
     }
+
+    public function deleting(Deleting $event)
+    {
+        $this->users()->detach();
+        $this->menus()->detach();
+    }
 }

app/Model/Permission/User.php

@@ -120,7 +120,6 @@ public function getRoles(array $fields): Collection
     {
         return $this->roles()
             ->where('status', Status::Normal)
-//            ->select(['id', ...$fields])
             ->select($fields)
             ->get();
     }

tests/Feature/Admin/GetTokenTrait.php

@@ -37,6 +37,9 @@ public function getToken(User $user): string
             'username' => $user->username,
             'password' => '123456',
         ]);
+        if (!is_array($result)){
+            Assert::fail('Get token failed.');
+        }
         if (! Arr::has($result, 'data.access_token')) {
             Assert::fail('Get token failed.');
         }

tests/Feature/Admin/Permission/RoleControllerTest.php

@@ -68,13 +68,18 @@ public function testCreate(): void
         self::assertSame($result['code'], ResultCode::SUCCESS->value);
         $this->deletePermissions('permission:role:save');
         $result = $this->post('/admin/role', $fill, ['Authorization' => 'Bearer ' . $token]);
+        self::assertSame($result['code'], ResultCode::UNPROCESSABLE_ENTITY->value);
+        $oldCode = $fill['code'];
+        $fill['code'] = Str::random(10);
+        $result = $this->post('/admin/role', $fill, ['Authorization' => 'Bearer ' . $token]);
         self::assertSame($result['code'], ResultCode::FORBIDDEN->value);
-        $entity = Role::query()->where('code', $fill['code'])->first();
+        $entity = Role::query()->where('code', $oldCode)->first();
         self::assertNotNull($entity);
         self::assertSame($entity->name, $fill['name']);
         self::assertSame($entity->sort, $fill['sort']);
         self::assertSame($entity->status->value, $fill['status']);
         self::assertSame($entity->remark, $fill['remark']);
+        self::assertSame($entity->code, $oldCode);
         $entity->forceDelete();
     }
 

tests/HttpTestCase.php

@@ -39,7 +39,7 @@ abstract class HttpTestCase extends TestCase
 
     public function __construct($name = null, array $data = [], $dataName = '')
     {
-        parent::__construct($name, $data, $dataName);
+        parent::__construct($name);
         $this->client = make(Client::class);
     }