formulario de capacitacion

apps/api/src/features/auth/auth.service.ts

@@ -40,7 +40,7 @@ export class AuthService {
     private readonly config: ConfigService<Env>,
     @Inject(DRIZZLE_PROVIDER) private drizzle: NodePgDatabase<typeof schema>,
     private readonly mailService: MailService,
-  ) {}
+  ) { }
 
   //Decode Tokens
   // Método para decodificar el token y obtener los datos completos
@@ -89,7 +89,7 @@ export class AuthService {
         },
         {
           secret: envs.access_token_secret,
-          expiresIn: envs.access_token_expiration,
+          expiresIn: envs.access_token_expiration as any,
         },
       ),
       this.jwtService.signAsync(
@@ -99,7 +99,7 @@ export class AuthService {
         },
         {
           secret: envs.refresh_token_secret,
-          expiresIn: envs.refresh_token_expiration,
+          expiresIn: envs.refresh_token_expiration as any,
         },
       ),
     ]);
@@ -197,7 +197,7 @@ export class AuthService {
 
   //Sign In User Account
   async signIn(dto: SignInUserDto): Promise<LoginUserInterface> {
-    
+
     const user = await this.validateUser(dto);
     const tokens = await this.generateTokens(user);
     const decodeAccess = this.decodeToken(tokens.access_token);
@@ -267,7 +267,7 @@ export class AuthService {
     // const user_id = 1;
 
     const validation = await this.jwtService.verifyAsync(refresh_token, {
-        secret: envs.refresh_token_secret,
+      secret: envs.refresh_token_secret,
     });
 
     if (!validation) throw new UnauthorizedException('Invalid refresh token');
@@ -278,21 +278,21 @@ export class AuthService {
       .where(
         and(
           eq(sessions.userId, user_id) &&
-            eq(sessions.sessionToken, dto.refresh_token),
+          eq(sessions.sessionToken, dto.refresh_token),
         ),
       );
 
     // console.log(session.length);
-    
+
     if (session.length === 0) throw new NotFoundException('session not found');
     const user = await this.findUserById(user_id);
     if (!user) throw new NotFoundException('User not found');
-    
+
     // Genera token
     const tokens = await this.generateTokens(user);
     const decodeAccess = this.decodeToken(tokens.access_token);
     const decodeRefresh = this.decodeToken(tokens.refresh_token);
-    
+
     // Actualiza session
     await this.drizzle
       .update(sessions)
@@ -308,75 +308,75 @@ export class AuthService {
   }
 
   async singUp(createUserDto: SingUpUserDto): Promise<User> {
-        // Check if username or email exists
-        const data = await this.drizzle
+    // Check if username or email exists
+    const data = await this.drizzle
+      .select({
+        id: users.id,
+        username: users.username,
+        email: users.email
+      })
+      .from(users)
+      .where(or(eq(users.username, createUserDto.username), eq(users.email, createUserDto.email)));
+
+    if (data.length > 0) {
+      if (data[0].username === createUserDto.username) {
+        throw new HttpException('Username already exists', HttpStatus.BAD_REQUEST);
+      }
+      if (data[0].email === createUserDto.email) {
+        throw new HttpException('Email already exists', HttpStatus.BAD_REQUEST);
+      }
+    }
+
+    // Hash the password
+    const hashedPassword = await bcrypt.hash(createUserDto.password, 10);
+
+    // Start a transaction
+    return await this.drizzle.transaction(async (tx) => {
+      // Create the user
+      const [newUser] = await tx
+        .insert(users)
+        .values({
+          username: createUserDto.username,
+          email: createUserDto.email,
+          password: hashedPassword,
+          fullname: createUserDto.fullname,
+          isActive: true,
+          state: createUserDto.state,
+          municipality: createUserDto.municipality,
+          parish: createUserDto.parish,
+          phone: createUserDto.phone,
+          isEmailVerified: false,
+          isTwoFactorEnabled: false,
+        })
+        .returning();
+
+      // check if user role is admin
+      const role = createUserDto.role <= 2 ? 5 : createUserDto.role;
+
+      // Assign role to user
+      await tx.insert(usersRole).values({
+        userId: newUser.id,
+        roleId: role,
+      });
+
+      // Return the created user with role
+      const [userWithRole] = await tx
         .select({
           id: users.id,
           username: users.username,
-          email: users.email
+          email: users.email,
+          fullname: users.fullname,
+          phone: users.phone,
+          isActive: users.isActive,
+          role: roles.name,
         })
         .from(users)
-        .where(or(eq(users.username, createUserDto.username), eq(users.email, createUserDto.email)));
-        
-        if (data.length > 0) {
-          if (data[0].username === createUserDto.username) {
-            throw new HttpException('Username already exists', HttpStatus.BAD_REQUEST);
-          }
-          if (data[0].email === createUserDto.email) {
-            throw new HttpException('Email already exists', HttpStatus.BAD_REQUEST);
-          }
-        }
+        .leftJoin(usersRole, eq(usersRole.userId, users.id))
+        .leftJoin(roles, eq(roles.id, usersRole.roleId))
+        .where(eq(users.id, newUser.id));
 
-        // Hash the password
-        const hashedPassword = await bcrypt.hash(createUserDto.password, 10);
-    
-        // Start a transaction
-        return await this.drizzle.transaction(async (tx) => {
-          // Create the user
-          const [newUser] = await tx
-            .insert(users)
-            .values({
-              username: createUserDto.username,
-              email: createUserDto.email,
-              password: hashedPassword,
-              fullname: createUserDto.fullname,
-              isActive: true,
-              state: createUserDto.state,
-              municipality: createUserDto.municipality,
-              parish: createUserDto.parish,
-              phone: createUserDto.phone,
-              isEmailVerified: false,
-              isTwoFactorEnabled: false,
-            })
-            .returning();
+      return userWithRole;
+    })
 
-          // check if user role is admin
-          const role = createUserDto.role <= 2 ? 5 : createUserDto.role;
-
-          // Assign role to user
-          await tx.insert(usersRole).values({
-            userId: newUser.id,
-            roleId: role,
-          });
-    
-          // Return the created user with role
-          const [userWithRole] = await tx
-            .select({
-              id: users.id,
-              username: users.username,
-              email: users.email,
-              fullname: users.fullname,
-              phone: users.phone,
-              isActive: users.isActive,
-              role: roles.name,
-            })
-            .from(users)
-            .leftJoin(usersRole, eq(usersRole.userId, users.id))
-            .leftJoin(roles, eq(roles.id, usersRole.roleId))
-            .where(eq(users.id, newUser.id));
-    
-          return userWithRole;
-        })
-      
   }
 }