@drax/identity-back 0.8.11 → 0.10.0

package/src/repository/sqlite/UserSqliteRepository.ts

@@ -29,7 +29,11 @@ const tableFields: SqliteTableField[] = [
     {name: "avatar", type: "TEXT", unique: false, primary: false},
     {name: "origin", type: "TEXT", unique: false, primary: false},
     {name: "createdAt", type: "TEXT", unique: false, primary: false},
-    {name: "updatedAt", type: "TEXT", unique: false, primary: false}
+    {name: "updatedAt", type: "TEXT", unique: false, primary: false},
+    {name: "emailVerified", type: "INTEGER", unique: false, primary: false},
+    {name: "phoneVerified", type: "INTEGER", unique: false, primary: false},
+    {name: "emailCode", type: "TEXT", unique: false, primary: false},
+    {name: "phoneCode", type: "TEXT", unique: false, primary: false},
 ]
 
 class UserSqliteRepository implements IUserRepository {
@@ -95,6 +99,10 @@ class UserSqliteRepository implements IUserRepository {
 
     }
 
+    async updatePartial(id: string, userData: IUserUpdate): Promise<IUser> {
+        return this.update(id, userData)
+    }
+
     async update(id: string, userData: IUserUpdate): Promise<IUser> {
         try {
             if (!await this.findRoleById(userData.role)) {
@@ -108,7 +116,9 @@ class UserSqliteRepository implements IUserRepository {
             const setClauses = Object.keys(userData)
                 .map(field => `${field} = @${field}`)
                 .join(', ');
+
             userData.id = id
+
             const stmt = this.db.prepare(`UPDATE users
                                           SET ${setClauses}
                                           WHERE id = @id `);
@@ -151,6 +161,16 @@ class UserSqliteRepository implements IUserRepository {
         return user
     }
 
+    async findByUsernameWithPassword(username: string): Promise<IUser> {
+        const user = this.db.prepare('SELECT * FROM users WHERE username = ?').get(username);
+        if (!user) {
+            return null
+        }
+        user.role = await this.findRoleById(user.role)
+        user.tenant = await this.findTenantById(user.tenant)
+        return user
+    }
+
     async findByEmail(email: string): Promise<IUser> {
         const user = this.db.prepare('SELECT * FROM users WHERE email = ?').get(email);
         if (!user) {
@@ -161,6 +181,36 @@ class UserSqliteRepository implements IUserRepository {
         return user
     }
 
+    async findByEmailCode(code: string): Promise<IUser> {
+        const user = this.db.prepare('SELECT * FROM users WHERE emailVerifyCode = ? AND emailVerified = 0').get(code);
+        if (!user) {
+            return null
+        }
+        user.role = await this.findRoleById(user.role)
+        user.tenant = await this.findTenantById(user.tenant)
+        return user
+    }
+
+    async findByRecoveryCode(code: string): Promise<IUser> {
+        const user = this.db.prepare('SELECT * FROM users WHERE recoveryCode = ? AND active = 1').get(code);
+        if (!user) {
+            return null
+        }
+        user.role = await this.findRoleById(user.role)
+        user.tenant = await this.findTenantById(user.tenant)
+        return user
+    }
+
+    async findByPhoneCode(code: string): Promise<IUser> {
+        const user = this.db.prepare('SELECT * FROM users WHERE phoneCode = ? AND phoneVerified = 0').get(code);
+        if (!user) {
+            return null
+        }
+        user.role = await this.findRoleById(user.role)
+        user.tenant = await this.findTenantById(user.tenant)
+        return user
+    }
+
     async paginate({
                        page= 1,
                        limit= 5,

package/src/routes/UserRoutes.ts

@@ -4,9 +4,9 @@ async function UserRoutes(fastify, options) {
 
     const controller: UserController = new UserController()
 
-    fastify.post('/api/auth', (req,rep) => controller.auth(req,rep))
+    fastify.post('/api/auth/login', (req,rep) => controller.auth(req,rep))
 
-    fastify.get('/api/me', (req,rep) => controller.me(req,rep))
+    fastify.get('/api/auth/me', (req,rep) => controller.me(req,rep))
 
     fastify.get('/api/users/search', (req,rep) => controller.search(req,rep) )
 
@@ -20,13 +20,23 @@ async function UserRoutes(fastify, options) {
 
     fastify.delete('/api/users/:id', (req,rep) => controller.delete(req,rep))
 
-    fastify.post('/api/password', (req,rep) => controller.myPassword(req,rep))
+    fastify.post('/api/users/register', (req,rep) => controller.register(req,rep))
 
-    fastify.post('/api/password/:id', (req,rep) => controller.password(req,rep))
+    fastify.get('/api/users/verify-email/:code', (req,rep) => controller.verifyEmail(req,rep))
 
-    fastify.post('/api/user/avatar', (req,rep) => controller.updateAvatar(req,rep))
+    fastify.get('/api/users/verify-phone/:code', (req,rep) => controller.verifyPhone(req,rep))
 
-    fastify.get('/api/user/avatar/:filename', (req,rep) => controller.getAvatar(req,rep))
+    fastify.post('/api/users/password/change', (req,rep) => controller.changeMyPassword(req,rep))
+
+    fastify.post('/api/users/password/change/:id', (req,rep) => controller.changePassword(req,rep))
+
+    fastify.post('/api/users/password/recovery/request', (req,rep) => controller.passwordRecoveryRequest(req,rep))
+
+    fastify.post('/api/users/password/recovery/complete', (req,rep) => controller.recoveryPasswordComplete(req,rep))
+
+    fastify.post('/api/users/avatar', (req,rep) => controller.updateAvatar(req,rep))
+
+    fastify.get('/api/users/avatar/:filename', (req,rep) => controller.getAvatar(req,rep))
 
 }
 

package/src/services/UserEmailService.ts

@@ -0,0 +1,78 @@
+import {EmailTransportConfig, EmailLayoutServiceFactory, EmailTransportServiceFactory} from "@drax/email-back"
+import {CommonConfig, DraxConfig} from "@drax/common-back";
+import type {SendMailOptions} from "nodemailer";
+
+class UserEmailService {
+
+    static async emailVerifyCode(emailCode: string, emailTo:string){
+
+
+        let emailLayout = EmailLayoutServiceFactory.instance
+
+        let baseurl = DraxConfig.getOrLoad(CommonConfig.BaseUrl)
+
+        let body = `
+        <h2 style="font-size: 22px; color: #333333; font-weight: 600; margin: 0 0 10px 0;">
+            Verificación de Email
+        </h2>
+        <p style="font-size: 16px; line-height: 1.6; color: #555555; margin: 0 0 15px 0;">
+        Para confirmar tu email, haz clic en el siguiente enlace:
+        </p>
+        <a href="${baseurl}/api/users/verify-email/${emailCode}" style="color: #333333; text-decoration: none; border: 1px solid #333333; padding: 10px 20px; text-align: center; text-decoration: none; display: inline-block;">Verificar Email</a>
+        `
+
+        const emailFrom = DraxConfig.getOrLoad(EmailTransportConfig.authUsername)
+
+        const emailOptions : SendMailOptions = {
+            subject: "Verificación de Email",
+            from: emailFrom,
+            to: emailTo,
+            html: emailLayout.html(body)
+        }
+
+        await EmailTransportServiceFactory.instance.sendEmail(emailOptions)
+
+    }
+
+
+    static async recoveryCode(recoveryCode: string, emailTo:string){
+
+
+        let emailLayout = EmailLayoutServiceFactory.instance
+
+        let baseurl = DraxConfig.getOrLoad(CommonConfig.BaseUrl)
+
+        let body = `
+        <h2 style="font-size: 22px; color: #333333; font-weight: 600; margin: 0 0 10px 0;">
+            Recuperación de Contraseña
+        </h2>
+        <p style="font-size: 16px; line-height: 1.6; color: #555555; margin: 0 0 15px 0;">
+        Accede al siguiente link para recuperar tu contraseña:
+        </p>
+        <p style="text-align: center; width: 100%;">
+           <a href="${baseurl}/password/recovery/complete/${recoveryCode}" 
+           style="color: #333333; text-decoration: none; border: 1px solid #333333; padding: 10px 20px; text-align: center; text-decoration: none; display: inline-block;">
+           Recuperar Contraseña
+            </a>
+        </p>
+     
+        `
+
+        const emailFrom = DraxConfig.getOrLoad(EmailTransportConfig.authUsername)
+
+        const emailOptions : SendMailOptions = {
+            subject: "Recuperación de Contraseña",
+            from: emailFrom,
+            to: emailTo,
+            html: emailLayout.html(body)
+        }
+
+        await EmailTransportServiceFactory.instance.sendEmail(emailOptions)
+
+    }
+
+}
+
+export default UserEmailService
+
+export {UserEmailService}

package/src/services/UserService.ts

@@ -1,7 +1,8 @@
 import type {IUser, IUserCreate, IUserUpdate} from "@drax/identity-share";
 import type {IUserRepository} from "../interfaces/IUserRepository";
+
 import {ZodError} from "zod";
-import {ValidationError, ZodErrorToValidationError} from "@drax/common-back";
+import {SecuritySensitiveError, ValidationError, ZodErrorToValidationError} from "@drax/common-back";
 import AuthUtils from "../utils/AuthUtils.js";
 import {createUserSchema, editUserSchema, userBaseSchema} from "../zod/UserZod.js";
 import BadCredentialsError from "../errors/BadCredentialsError.js";
@@ -9,12 +10,12 @@ import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/crud-share";
 import {AbstractService} from "@drax/crud-back";
 import {randomUUID} from "crypto"
 
-class UserService extends AbstractService<IUser, IUserCreate, IUserUpdate>{
+class UserService extends AbstractService<IUser, IUserCreate, IUserUpdate> {
 
     _repository: IUserRepository
 
     constructor(userRepository: IUserRepository) {
-        super(userRepository,userBaseSchema);
+        super(userRepository, userBaseSchema);
         this._repository = userRepository;
         console.log("UserService constructor")
     }
@@ -22,7 +23,7 @@ class UserService extends AbstractService<IUser, IUserCreate, IUserUpdate>{
     async auth(username: string, password: string) {
         let user = null
         console.log("auth username", username)
-        user = await this.findByUsername(username)
+        user = await this.findByUsernameWithPassword(username)
         if (user && user.active && AuthUtils.checkPassword(password, user.password)) {
             //TODO: Generar session
             const session = randomUUID()
@@ -38,7 +39,7 @@ class UserService extends AbstractService<IUser, IUserCreate, IUserUpdate>{
         console.log("auth email", email)
         user = await this.findByEmail(email)
 
-        if(!user && createIfNotFound){
+        if (!user && createIfNotFound) {
             userData.password = userData.password ? userData.password : randomUUID()
             userData.active = userData.active === undefined ? true : userData.active
             user = await this.create(userData)
@@ -49,10 +50,11 @@ class UserService extends AbstractService<IUser, IUserCreate, IUserUpdate>{
             const accessToken = AuthUtils.generateToken(user.id.toString(), user.username, user.role.id, user.tenant?.id, session)
             return {accessToken: accessToken}
         } else {
-                throw new BadCredentialsError()
+            throw new BadCredentialsError()
         }
     }
 
+
     async changeUserPassword(userId: string, newPassword: string) {
         const user = await this.findById(userId)
         if (user) {
@@ -68,7 +70,6 @@ class UserService extends AbstractService<IUser, IUserCreate, IUserUpdate>{
     async changeOwnPassword(userId: string, currentPassword: string, newPassword: string) {
         const user = await this.findById(userId)
 
-
         if (user && user.active) {
 
             if (currentPassword === newPassword) {
@@ -98,12 +99,95 @@ class UserService extends AbstractService<IUser, IUserCreate, IUserUpdate>{
         }
     }
 
+    async recoveryCode(email: string): Promise<string> {
+        try{
+            const recoveryCode = randomUUID()
+            const user = await this._repository.findByEmail(email)
+            if(user && user.active){
+                await this._repository.updatePartial(user.id, {recoveryCode: recoveryCode})
+                return recoveryCode
+            }else{
+                throw new SecuritySensitiveError()
+            }
+        }catch (e) {
+            console.error("recoveryCode:", e)
+            throw e
+        }
+    }
+
+    async changeUserPasswordByCode(recoveryCode: string, newPassword: string): Promise<boolean> {
+        try {
+            console.log("changeUserPasswordByCode recoveryCode", recoveryCode)
+            const user = await this._repository.findByRecoveryCode(recoveryCode)
+            console.log("changeUserPasswordByCode user", user)
+            if (user && user.active) {
+                newPassword = AuthUtils.hashPassword(newPassword)
+                await this._repository.changePassword(user.id, newPassword)
+                await this._repository.updatePartial(user.id, {recoveryCode: null})
+                return true
+            } else {
+                throw new ValidationError([{field:'recoveryCode', reason: 'validation.notFound'}])
+            }
+        } catch (e) {
+            console.error("changeUserPasswordByCode", e)
+            throw e
+        }
+    }
+
+    async register(userData: IUserCreate): Promise<IUser> {
+        try {
+
+            userData.emailVerified = false
+            userData.phoneVerified = false
+            userData.active = false
+
+            userData.emailCode = randomUUID()
+            userData.phoneCode = randomUUID()
+
+
+            let user = await this.create(userData)
+
+            return user
+        } catch (e) {
+            console.error("Error registry user", e)
+            if (e instanceof ZodError) {
+                throw ZodErrorToValidationError(e, userData)
+            }
+            throw e
+        }
+    }
+
+    async verifyEmail(emailCode: string): Promise<boolean> {
+        const user = await this._repository.findByEmailCode(emailCode)
+        if (user && user.emailVerified === false) {
+            await this._repository.updatePartial(user.id, {
+                emailVerified: true,
+                active: true
+            })
+            return true
+        } else {
+            throw new ValidationError([{field: 'emailCode', reason: 'validation.notFound'}])
+        }
+    }
+
+    async verifyPhone(phoneCode: string): Promise<boolean> {
+        const user = await this._repository.findByPhoneCode(phoneCode)
+        if (user && user.phoneVerified === false) {
+            await this._repository.updatePartial(user.id, {
+                phoneVerified: true,
+                active: true
+            })
+            return true
+        } else {
+            throw new ValidationError([{field: 'phoneCode', reason: 'validation.notFound'}])
+        }
+    }
 
     async create(userData: IUserCreate): Promise<IUser> {
         try {
             userData.name = userData?.name?.trim()
-            userData.username = userData.username.trim()
-            userData.password = userData.password.trim()
+            userData.username = userData?.username.trim()
+            userData.password = userData?.password.trim()
             userData.tenant = userData.tenant === "" ? null : userData.tenant
 
             await createUserSchema.parseAsync(userData)
@@ -123,8 +207,8 @@ class UserService extends AbstractService<IUser, IUserCreate, IUserUpdate>{
 
     async update(id: string, userData: IUserUpdate) {
         try {
-            userData.name = userData.name.trim()
-            userData.username = userData.username.trim()
+            userData.name = userData?.name.trim()
+            userData.username = userData?.username.trim()
             delete userData.password
             userData.tenant = userData.tenant === "" ? null : userData.tenant
 
@@ -145,7 +229,7 @@ class UserService extends AbstractService<IUser, IUserCreate, IUserUpdate>{
     async delete(id: string): Promise<boolean> {
         try {
             const result: boolean = await this._repository.delete(id);
-            if(!result){
+            if (!result) {
                 throw new Error("error.deletionFailed")
             }
             return result;
@@ -178,6 +262,17 @@ class UserService extends AbstractService<IUser, IUserCreate, IUserUpdate>{
 
     }
 
+    async findByUsernameWithPassword(username: string): Promise<IUser | null> {
+        try {
+            const user: IUser = await this._repository.findByUsernameWithPassword(username);
+            return user
+        } catch (e) {
+            console.error("Error finding user by username", e)
+            throw e
+        }
+
+    }
+
     async findByEmail(email: string): Promise<IUser | null> {
         try {
             const user: IUser = await this._repository.findByEmail(email);