调整权限返回

dev
vine_liutk 2023-10-20 15:41:14 +08:00
parent 5fd786e6a6
commit a557c1c1ab
3 changed files with 17 additions and 2 deletions

View File

@ -27,6 +27,7 @@ class AdminPermissionController extends Controller
$res[] = [
'id' => $permission->id,
'label' => $permission->name,
'slug' => $permission->slug,
'children' => $this->formatPermissionsTreeToArray($permission->children ?? []),
];
}

View File

@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use App\Models\AdminUser;
use App\Models\AdminPermission;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
@ -34,6 +35,12 @@ class AuthController extends Controller
{
$token = $user->createToken($name)->plainTextToken;
return $this->json(['token' => $token, 'info' => $user, 'permissions' => $user->permissionIds()]);
$permissionsQuery = AdminPermission::query();
if($user->id != 1){
$permissions = $permissionsQuery->whereIn('id', $user->permissionIds());
}
$permissions = $permissionsQuery->pluck('slug')->toArray();
return $this->json(['token' => $token, 'info' => $user, 'permissions' => $user->permissionIds(), 'permissions_slug'=>$permissions]);
}
}

View File

@ -5,14 +5,21 @@ namespace App\Http\Controllers;
use App\Http\Requestes\RestPasswordRequest;
use App\Services\OperationLogService;
use App\Enums\OperationType;
use App\Models\AdminPermission;
class UserController extends Controller
{
public function info()
{
$user = auth('api')->user();
$permissionsQuery = AdminPermission::query();
if($user->id != 1){
$permissions = $permissionsQuery->whereIn('id', $user->permissionIds());
}
$permissions = $permissionsQuery->pluck('slug')->toArray();
return $this->json(['info' => $user, 'permissions' => $user->permissionIds()]);
return $this->json(['info' => $user, 'permissions' => $user->permissionIds(), 'permissions_slug'=>$permissions]);
}
public function resetPwd(RestPasswordRequest $request)