diff --git a/.env b/.env index 1e1649d..1e5042a 100644 --- a/.env +++ b/.env @@ -12,7 +12,7 @@ LOG_LEVEL=debug DB_CONNECTION=mysql DB_HOST=control-acceso.mysql.database.azure.com DB_PORT=3306 -DB_DATABASE=control-acceso +DB_DATABASE=uaqroo_ctrl DB_USERNAME=adminprime DB_PASSWORD=Orionpax9 DB_SSLCA=DigiCertGlobalRootCA.crt.pem diff --git a/app/Http/Controllers/ApiUaqrooController.php b/app/Http/Controllers/ApiUaqrooController.php index 1fc6b14..062de55 100644 --- a/app/Http/Controllers/ApiUaqrooController.php +++ b/app/Http/Controllers/ApiUaqrooController.php @@ -56,12 +56,12 @@ public function buscarUsuario($email, $areaId) //desencriptar el email $user_email = openssl_decrypt($emailDecoded2, 'aes-256-cbc', $key, 0, $iv); Log::info('Email desencriptado: ' . $user_email); - + // dd($user_email); $user = User::where('email', $user_email)->firstOrFail(); Log::info('Usuario encontrado: ' . $user->usuario_id); $user_id = $user->usuario_id; - + $e = new EventosAcceso; $e->area_id = $areaId; $e->usuario_id = $user_id; @@ -74,14 +74,15 @@ public function buscarUsuario($email, $areaId) $validacion = Autorizaciones::where('usuario_id', $user_id) ->where('area_id', $areaId) + ->orderBy('created_at', 'desc') ->first(); - // usaremos una variable para almacnear el resultado de una funcion // Validar si la autorozación sigue vigente usando if, y la función // isFuture(), que es una función proporcionada por la biblioteca // carbon de PHP dateTime utilzada por Laravel, para el manejo // de fechas y tiempos más sencilla y fluida, en este caso - // verifica si espires_at esta en futuro. + // verifica si espires_at esta en futuro. + $expiresAt = Carbon::parse($validacion->expires_at); if($validacion && (!$validacion->expires_at || Carbon::parse($validacion->expires_at)->isFuture())) { $e->permiso = 'PERMITIDO'; $e->save(); diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php index 553b513..4c76b99 100644 --- a/app/Http/Controllers/Auth/RegisteredUserController.php +++ b/app/Http/Controllers/Auth/RegisteredUserController.php @@ -4,6 +4,7 @@ use App\Http\Controllers\Controller; use App\Models\User; +use App\Models\Persona; use App\Providers\RouteServiceProvider; use Illuminate\Auth\Events\Registered; use Illuminate\Http\RedirectResponse; @@ -12,6 +13,7 @@ use Illuminate\Support\Facades\Hash; use Illuminate\Validation\Rules; use Illuminate\View\View; +use Faker\Factory as Faker; class RegisteredUserController extends Controller { @@ -30,18 +32,41 @@ public function create(): View */ public function store(Request $request): RedirectResponse { + $faker = Faker::create(); + $request->validate([ 'name' => ['required', 'string', 'max:255'], - 'email' => ['required', 'string', 'email', 'max:255', 'unique:'.User::class], + 'ape_materno' => ['required', 'string', 'max:255'], + 'ape_paterno' => ['required', 'string', 'max:255'], + 'genero' => ['required', 'string', 'max:8'], + 'email' => ['required', 'email', 'max:255'], 'password' => ['required', 'confirmed', Rules\Password::defaults()], ]); + + + $username = $faker->unique()->userName; + $rol_id = 1; $user = User::create([ - 'nombre_usuario' => $request->name, + 'nombre_usuario' => $username, 'email' => $request->email, + 'rol_id' => $rol_id, 'password' => Hash::make($request->password), ]); + $userId = $user->usuario_id; + + $persona = new Persona; + $persona->usuario_id = $userId; + $persona->nombre = $request->name; + $persona->ape_materno = $request->ape_materno; + $persona->ape_paterno = $request->ape_paterno; + $persona->sexo = $request->genero; + $persona->save(); + + $personaId = $persona->persona_id; + $user->persona_id = $personaId; + event(new Registered($user)); Auth::login($user); diff --git a/app/Models/User.php b/app/Models/User.php index 21a33d1..033aa98 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -27,7 +27,8 @@ class User extends Authenticatable 'nombre_usuario', 'email', 'password', - 'persona_id' + 'persona_id', + 'rol_id' ]; public function persona() diff --git a/database/migrations/2024_06_09_071840_ejemplo_table.php b/database/migrations/2024_06_09_071840_ejemplo_table.php new file mode 100644 index 0000000..11c1b5f --- /dev/null +++ b/database/migrations/2024_06_09_071840_ejemplo_table.php @@ -0,0 +1,29 @@ +id(); + $table->string('name'); + $table->string('ejemplo'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + // + } +}; diff --git a/database/migrations/2024_06_13_162851_add_foreign_key_to_persona_table.php b/database/migrations/2024_06_13_162851_add_foreign_key_to_persona_table.php new file mode 100644 index 0000000..8f55429 --- /dev/null +++ b/database/migrations/2024_06_13_162851_add_foreign_key_to_persona_table.php @@ -0,0 +1,26 @@ +foreign('usuario_id') + ->references('usuario_id') + ->on('usuarios') + ->onDelete('cascade'); // Opcional: especifica el comportamiento ON DELETE + }); + } + + public function down() + { + Schema::table('persona', function (Blueprint $table) { + $table->dropForeign(['usuario_id']); + }); + } + +}; diff --git a/database/migrations/2024_06_19_000820_crear_indice_aut.php b/database/migrations/2024_06_19_000820_crear_indice_aut.php new file mode 100644 index 0000000..9479bcc --- /dev/null +++ b/database/migrations/2024_06_19_000820_crear_indice_aut.php @@ -0,0 +1,26 @@ +index(['usuario_id', 'area_id']); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + // + } +}; diff --git a/resources/images/favicon.ico b/resources/images/favicon.ico index b5d8c12..7abef30 100644 Binary files a/resources/images/favicon.ico and b/resources/images/favicon.ico differ diff --git a/resources/views/auth/signin.blade.php b/resources/views/auth/signin.blade.php index 350c3fe..5590ec3 100644 --- a/resources/views/auth/signin.blade.php +++ b/resources/views/auth/signin.blade.php @@ -5,95 +5,98 @@ Login - + @vite(['resources/css/login.css'])
- - -
+ + +
+
+ + + +
- - + + +
- - + + +
- +
-

¿Nuevo aquí?

Puedes registrarte aquí

- +
- - log + log
-

¿Ya tienes cuenta?

Inicia sesión aquí

- +
- - log + register
- @vite(['resources/js/login.js']) - - \ No newline at end of file +