调整权限返回
parent
5fd786e6a6
commit
a557c1c1ab
|
|
@ -27,6 +27,7 @@ class AdminPermissionController extends Controller
|
|||
$res[] = [
|
||||
'id' => $permission->id,
|
||||
'label' => $permission->name,
|
||||
'slug' => $permission->slug,
|
||||
'children' => $this->formatPermissionsTreeToArray($permission->children ?? []),
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ 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
|
||||
{
|
||||
|
|
@ -12,7 +13,13 @@ class UserController extends Controller
|
|||
{
|
||||
$user = auth('api')->user();
|
||||
|
||||
return $this->json(['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(['info' => $user, 'permissions' => $user->permissionIds(), 'permissions_slug'=>$permissions]);
|
||||
}
|
||||
|
||||
public function resetPwd(RestPasswordRequest $request)
|
||||
|
|
|
|||
Loading…
Reference in New Issue