From d514cf871429191dfa4f807503680b92c8dba6ee Mon Sep 17 00:00:00 2001
From: Emilio <emilio.venegas@acatlan.unam.mx>
Date: Thu, 30 Oct 2025 10:14:46 -0600
Subject: [PATCH] bcryptjs

---
 mariadb/aria_log.00000001 | Bin 4931584 -> 4931584 bytes
 mariadb/aria_log_control  | Bin 52 -> 52 bytes
 src/auth/auth.service.ts  |   8 --------
 3 files changed, 8 deletions(-)

diff --git a/mariadb/aria_log.00000001 b/mariadb/aria_log.00000001
index 45060230bdacf7aaaabf1a3f2ab922eceaf5c92a..751919a870699f94bbf23837f6a0ef7568687881 100644
GIT binary patch
delta 195
zcmXBDSvEoe007V@QyG#+$W-R>p;VNi%=A{_*DBt}-NRdj4;|aE7dzlM?m0I}-ZRNx
z12P5;88%{6R?e7l6DH+NDVP?TF{^0KyagqTmMmMbs;pwox(%DQY}>JG&%OhPB1ev$
zsH!<t*U)t4Tua-9OINOSbltdh=iY-yPoBN#ea8JLO}=`$d_RhVAo%(BmcCZvV*1_5
J7CyRR_zTiRMfm^#

delta 170
zcmWl|TQWic007YG5-D^GDbG?Ux*_r?DwSuOx*ul`R^fwbVU}PzGbfI}gLqy-V8NoK
zCCgG)q-CsHvo0%?leb~hmV#|XB|CQQ*>~VjS;dj6nqwzU)is<s*A!{FaOq0hwHqC`
m?%aFO)$`~{-@wqbk+F#vuim`-@Hw0QMqht}RQNOO=l=n6-Z|R<

diff --git a/mariadb/aria_log_control b/mariadb/aria_log_control
index 6581d65e10734a4c720a07deb109b046a563c322..6cdd68f5f356a4530631a04d0ef2abe8a458358b 100644
GIT binary patch
delta 27
fcmXppnII=7$@uaWBLl-GU2g^;#gN4eBp4U~S55@8

delta 27
fcmXppnII=-cK_B~Mh1p9U2g^;#gNGiBp4U~VuS@H

diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
index 38c7a48..bac9631 100644
--- a/src/auth/auth.service.ts
+++ b/src/auth/auth.service.ts
@@ -24,12 +24,8 @@ export class AuthService {
     }
 
     try {
-<<<<<<< HEAD
       const salt = await bcrypt.genSalt(10);
       const hashedContraseña = await bcrypt.hash(contraseña, salt);
-=======
-      const hashedContraseña = await bcrypt.hash(contraseña,10);
->>>>>>> 3317b7bdbe91d04618f00c28caeca76c35803f9c
 
       await this.usuarioService.create({
         nombre,
@@ -52,10 +48,6 @@ export class AuthService {
     }
 
     const contraseñaValida = await bcrypt.compare(
-<<<<<<< HEAD
-=======
-      usuario.contraseña,
->>>>>>> 3317b7bdbe91d04618f00c28caeca76c35803f9c
       contraseña,
       usuario.contraseña,
     );