From 7c859accc0d4927a1314d0de1ad9e5dfc3b150ec Mon Sep 17 00:00:00 2001 From: cgonzalesmo Date: Sat, 22 Oct 2022 10:13:00 -0500 Subject: [PATCH 1/7] Add rol al registrar nuevo usuario. --- app/Http/Controllers/Api/UserController.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php index fbad288..9c81ac8 100644 --- a/app/Http/Controllers/Api/UserController.php +++ b/app/Http/Controllers/Api/UserController.php @@ -14,17 +14,18 @@ class UserController extends Controller public function register(Request $request) { $request->validate([ - 'email' => 'required|email|unique:users' + 'email' => 'required|email|unique:users', + 'rol'=> 'required|numeric|size:2' ]); $userAuth = auth()->user()->roles[0]->name; - if ($userAuth === "Admin") { + if ($userAuth == "Admin") { $user = new User(); $user->name = "null"; $user->lastname = "null"; $user->email = $request->email; $user->password = "null"; $user->save(); - $user->roles()->attach(2); + $user->roles()->attach($request->rol); return response()->json([ 'message' => 'Correo registrado exitosamente', 'userAuth' => $user, @@ -32,7 +33,7 @@ class UserController extends Controller } else { return response()->json([ "status" => 0, - "message" => "Correo no registrado", + "message" => "No eres administrador: Correo no registrado", ], 404); } } From 50d6108068bcff062c65d843ba21e688a8bd2da4 Mon Sep 17 00:00:00 2001 From: cgonzalesmo Date: Sat, 22 Oct 2022 10:30:42 -0500 Subject: [PATCH 2/7] Add estado->users (habilitar o deshabilitar) --- app/Http/Controllers/Api/UserController.php | 1 + .../migrations/2014_10_12_000000_create_users_table.php | 1 + database/seeders/DatabaseSeeder.php | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php index 9c81ac8..ab49a53 100644 --- a/app/Http/Controllers/Api/UserController.php +++ b/app/Http/Controllers/Api/UserController.php @@ -24,6 +24,7 @@ class UserController extends Controller $user->lastname = "null"; $user->email = $request->email; $user->password = "null"; + $user->estado = true; $user->save(); $user->roles()->attach($request->rol); return response()->json([ diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index c0b037e..cab1cee 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -19,6 +19,7 @@ return new class extends Migration $table->string('lastname'); $table->string('email')->unique(); $table->string('password'); + $table->boolean('estado'); }); } diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index d59341b..373025e 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -29,6 +29,7 @@ class DatabaseSeeder extends Seeder "lastname"=>"Apoyo", "email"=>"admin@unsa.edu.pe", "password"=>Hash::make("123456"), + "estado"=>true, ]); \App\Models\User::find(1)->roles()->attach(1); @@ -37,6 +38,7 @@ class DatabaseSeeder extends Seeder "lastname"=>"Arroyo", "email"=>"aarroyoh@unsa.edu.pe", "password"=>Hash::make("luisangel"), + "estado"=>true, ]); \App\Models\User::find(2)->roles()->attach(1); @@ -45,6 +47,7 @@ class DatabaseSeeder extends Seeder "lastname"=>"Araoz", "email"=>"faraoz@unsa.edu.pe", "password"=>Hash::make("123456"), + "estado"=>true, ]); \App\Models\User::find(3)->roles()->attach(1); @@ -53,6 +56,7 @@ class DatabaseSeeder extends Seeder "lastname"=>"Acuña", "email"=>"jacuna@unsa.edu.pe", "password"=>Hash::make("123456"), + "estado"=>true, ]); \App\Models\User::find(4)->roles()->attach(1); @@ -61,6 +65,7 @@ class DatabaseSeeder extends Seeder "lastname"=>"Gonzales", "email"=>"cgonzalesmo@unsa.edu.pe", "password"=>Hash::make("123456"), + "estado"=>true, ]); \App\Models\User::find(5)->roles()->attach(1); @@ -70,6 +75,7 @@ class DatabaseSeeder extends Seeder "lastname"=>"Sullca", "email"=>"csullcap@unsa.edu.pe", "password"=>Hash::make("123456"), + "estado"=>true, ]); \App\Models\User::find(6)->roles()->attach(1); @@ -78,6 +84,7 @@ class DatabaseSeeder extends Seeder "lastname"=>"Guillen", "email"=>"bguillenn@unsa.edu.pe", "password"=>Hash::make("123456"), + "estado"=>true, ]); \App\Models\User::find(7)->roles()->attach(1); From d8e92ce7a932382b7afb7bad9388d84db873c669 Mon Sep 17 00:00:00 2001 From: cgonzalesmo Date: Sat, 22 Oct 2022 10:55:51 -0500 Subject: [PATCH 3/7] Controller -Endpoint List Usuarios --- app/Http/Controllers/Api/UserController.php | 9 +++++++++ routes/api.php | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php index ab49a53..ab7c24f 100644 --- a/app/Http/Controllers/Api/UserController.php +++ b/app/Http/Controllers/Api/UserController.php @@ -80,6 +80,15 @@ class UserController extends Controller ]); } + public function listUser(){ + $users = User::all(); + return response([ + "status" => 1, + "msg" => "!Lista de usuarios", + "data" => $users, + ]); + } + public function logout() { auth()->user()->tokens()->delete(); diff --git a/routes/api.php b/routes/api.php index 925b18f..9fa2fcb 100644 --- a/routes/api.php +++ b/routes/api.php @@ -41,6 +41,7 @@ Route::get('estandares', [EstandarController::class, 'listEstandarValores']); Route::middleware("auth:sanctum")->group(function () { //rutas auth Route::get('user-profile', [UserController::class, 'userProfile']); + Route::get('user', [UserController::class, 'listUser']); Route::get('logout', [UserController::class, 'logout']); Route::post('register', [UserController::class, 'register']); @@ -116,6 +117,6 @@ Route::middleware("auth:sanctum")->group(function () { Route::get('narrativa', [NarrativasController::class, 'listNarrativas']); }); -Route::middleware('auth:sanctum')->get('/user', function (Request $request) { +/*Route::middleware('auth:sanctum')->get('/user', function (Request $request) { return $request->user(); -}); +});*/ From 7aae06a0dafef4d01cf361bca6d840a60259beb2 Mon Sep 17 00:00:00 2001 From: cgonzalesmo Date: Sat, 22 Oct 2022 12:25:03 -0500 Subject: [PATCH 4/7] Edit role a Role --- app/Models/User.php | 2 +- app/Models/role.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index 4e4585f..b9e4c58 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -43,7 +43,7 @@ class User extends Authenticatable public function roles() { - return $this->belongsToMany(role::class, 'role_user', 'id_user', 'id_rol'); + return $this->belongsToMany(Role::class, 'role_user', 'id_user', 'id_rol'); } public function isAdmin() diff --git a/app/Models/role.php b/app/Models/role.php index b66e059..8801076 100644 --- a/app/Models/role.php +++ b/app/Models/role.php @@ -5,7 +5,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -class role extends Model +class Role extends Model { use HasFactory; From 30dde28147a4592ce7b464bedb360515bd2b23a0 Mon Sep 17 00:00:00 2001 From: cgonzalesmo Date: Sat, 22 Oct 2022 12:34:21 -0500 Subject: [PATCH 5/7] Add Role Factory --- database/factories/RoleFactory.php | 2 +- database/seeders/DatabaseSeeder.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/database/factories/RoleFactory.php b/database/factories/RoleFactory.php index 673a47d..32098ad 100644 --- a/database/factories/RoleFactory.php +++ b/database/factories/RoleFactory.php @@ -17,7 +17,7 @@ class RoleFactory extends Factory public function definition() { return [ - 'name' => $this->faker->name(), + 'name' => $this->faker->name(), ]; } } diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 373025e..c5dff83 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -16,10 +16,10 @@ class DatabaseSeeder extends Seeder public function run() { //roles - \App\Models\role::factory()->create([ + \App\Models\Role::factory()->create([ "name"=>"Admin" ]); - \App\Models\role::factory()->create([ + \App\Models\Role::factory()->create([ "name"=>"User" ]); From 8d135b3e8ec6c87f2cd83131ff45bcc65d42654f Mon Sep 17 00:00:00 2001 From: Carlos Jesus Gonzales Molina Date: Sat, 22 Oct 2022 12:38:36 -0500 Subject: [PATCH 6/7] Rename role.php to Role.php --- app/Models/{role.php => Role.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/Models/{role.php => Role.php} (100%) diff --git a/app/Models/role.php b/app/Models/Role.php similarity index 100% rename from app/Models/role.php rename to app/Models/Role.php From 7a4c550bc5aa5253925faa426a37fa8299f9d368 Mon Sep 17 00:00:00 2001 From: cgonzalesmo Date: Sun, 23 Oct 2022 23:01:17 -0500 Subject: [PATCH 7/7] Correccion registrar usuario --- app/Http/Controllers/Api/UserController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php index ab7c24f..3a1a6ae 100644 --- a/app/Http/Controllers/Api/UserController.php +++ b/app/Http/Controllers/Api/UserController.php @@ -15,7 +15,7 @@ class UserController extends Controller { $request->validate([ 'email' => 'required|email|unique:users', - 'rol'=> 'required|numeric|size:2' + 'rol'=> 'required|numeric|min:1|max:2' ]); $userAuth = auth()->user()->roles[0]->name; if ($userAuth == "Admin") {