From 37003eb1df0dfe272d1cefa62e90681cceee45f0 Mon Sep 17 00:00:00 2001 From: sergiomarquez778 Date: Tue, 27 May 2025 23:22:29 -0600 Subject: [PATCH 1/3] nkdkd --- app/Http/Controllers/UserDashboardController.php | 4 ++-- app/Http/Middleware/AdminMiddleware.php | 11 ++++++++++- app/Providers/AuthServiceProvider.php | 3 ++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/UserDashboardController.php b/app/Http/Controllers/UserDashboardController.php index 6420b58..746df29 100644 --- a/app/Http/Controllers/UserDashboardController.php +++ b/app/Http/Controllers/UserDashboardController.php @@ -13,8 +13,8 @@ class UserDashboardController extends Controller public function index() { - // Permitir acceso solo a usuarios con tipos_id == 2 (Servicios Generales) - if (auth()->user()->tipos_id != 2) { + // Permitir acceso solo a tipo 1 (Administrador) + if (auth()->user()->tipos_id != 1) { return redirect('/')->with('error', 'No tienes permiso para acceder a esta sección'); } diff --git a/app/Http/Middleware/AdminMiddleware.php b/app/Http/Middleware/AdminMiddleware.php index 40072de..42bbdff 100644 --- a/app/Http/Middleware/AdminMiddleware.php +++ b/app/Http/Middleware/AdminMiddleware.php @@ -15,7 +15,16 @@ class AdminMiddleware */ public function handle(Request $request, Closure $next): Response { - if (!auth()->check() || auth()->user()->tipo->nombre !== 'Administrador') { + if (auth()->check()) { + \Log::info('AdminMiddleware', [ + 'user_id' => auth()->user()->id, + 'email' => auth()->user()->email, + 'tipos_id' => auth()->user()->tipos_id + ]); + } else { + \Log::info('AdminMiddleware', ['user' => null]); + } + if (!auth()->check() || auth()->user()->tipos_id != 1) { return redirect('/')->with('error', 'No tienes permisos para acceder a esta página.'); } diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index eaca45b..de362f3 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -25,7 +25,8 @@ class AuthServiceProvider extends ServiceProvider $this->registerPolicies(); Gate::define('gestionar-prestamos', function ($user) { - return in_array($user->rol, ['admin', 'servicios']); + // Permitir solo a tipos_id 1 (Administrador) y 4 (Servicios Generales), agrega más si lo deseas + return in_array($user->tipos_id, [1, 4]); }); } } From ec3e0190e76ed06fb612a895b9183b78d2a15a91 Mon Sep 17 00:00:00 2001 From: sergiomarquez778 Date: Tue, 27 May 2025 23:23:55 -0600 Subject: [PATCH 2/3] arreglos --- app/Http/Controllers/Auth/LoginController.php | 6 +++--- app/Http/Middleware/AdminMiddleware.php | 9 --------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index ca22f7d..bf2a9c6 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -40,10 +40,10 @@ class LoginController extends Controller protected function authenticated($request, $user) { - if ($user->tipos_id == 1) { // Administrador - return redirect('/dashboard'); - } elseif ($user->tipos_id == 4) { // Servicios Generales + if ($user->tipos_id == 1) { return redirect('/dashboard'); + } elseif ($user->tipos_id == 2) { + return redirect('/user-dashboard'); } else { return redirect('/home'); } diff --git a/app/Http/Middleware/AdminMiddleware.php b/app/Http/Middleware/AdminMiddleware.php index 42bbdff..909c8ae 100644 --- a/app/Http/Middleware/AdminMiddleware.php +++ b/app/Http/Middleware/AdminMiddleware.php @@ -15,15 +15,6 @@ class AdminMiddleware */ public function handle(Request $request, Closure $next): Response { - if (auth()->check()) { - \Log::info('AdminMiddleware', [ - 'user_id' => auth()->user()->id, - 'email' => auth()->user()->email, - 'tipos_id' => auth()->user()->tipos_id - ]); - } else { - \Log::info('AdminMiddleware', ['user' => null]); - } if (!auth()->check() || auth()->user()->tipos_id != 1) { return redirect('/')->with('error', 'No tienes permisos para acceder a esta página.'); } From f42423264bd330aec671801efbc07c836d86fd35 Mon Sep 17 00:00:00 2001 From: sergiomarquez778 Date: Tue, 27 May 2025 23:29:26 -0600 Subject: [PATCH 3/3] jj --- app/Models/User.php | 1 - routes/web.php | 7 ------- 2 files changed, 8 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index b5525f7..eafb383 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -28,7 +28,6 @@ class User extends Authenticatable 'departamento_id', 'telefono', 'password', - 'rol', ]; diff --git a/routes/web.php b/routes/web.php index 77a5d65..b674f00 100644 --- a/routes/web.php +++ b/routes/web.php @@ -97,13 +97,6 @@ use App\Http\Controllers\PuestoController; Route::get('/home', [HomeController::class, 'index'])->name('home'); }); - // Rutas para profesores - Route::middleware(['auth', 'profesor'])->prefix('profesor')->name('profesor.')->group(function () { - Route::get('/solicitudes', [SolicitudVehiculoController::class, 'index'])->name('solicitudes.index'); - Route::get('/solicitudes/create', [SolicitudVehiculoController::class, 'create'])->name('solicitudes.create'); - Route::post('/solicitudes', [SolicitudVehiculoController::class, 'store'])->name('solicitudes.store'); - }); - // Ruta para el dashboard de usuarios Route::get('/user-dashboard', [App\Http\Controllers\UserDashboardController::class, 'index'])->name('user.dashboard');