diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index ad0c0dd..a72c893 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -6,6 +6,7 @@ use App\Http\Controllers\Controller; use Illuminate\Http\Request; use App\Http\Requests\Auth\LoginRequest; use App\Repositories\Auth\AuthRepository; +use App\Http\Resources\Auth\CurrentResource; class LoginController extends Controller { @@ -18,7 +19,8 @@ class LoginController extends Controller $data = $authRepository->login($params); return [ "success" => true, - "data" => $data + "user" => CurrentResource::make($data[0]), + "token" => $data[1] ]; } } diff --git a/app/Http/Resources/Auth/CurrentResource.php b/app/Http/Resources/Auth/CurrentResource.php index 5104650..105bdf8 100644 --- a/app/Http/Resources/Auth/CurrentResource.php +++ b/app/Http/Resources/Auth/CurrentResource.php @@ -4,6 +4,7 @@ namespace App\Http\Resources\Auth; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\JsonResource; +use App\Http\Resources\Auth\Role\ListResource as RoleResource; class CurrentResource extends JsonResource { @@ -17,7 +18,13 @@ class CurrentResource extends JsonResource return [ "id" => $this->id, "name" => $this->name, - "email" => $this->email + "email" => $this->email, + "roles" => RoleResource::collection($this->roles), + "permissions" => $this->roles->flatMap(function($role){ + return $role->permissions->map(function($permision){ + return $permision->code; + }); + }) ]; } }