umpordez 1.5.1 → 1.6.2

package/template/server/apps/shared/middlewares/request-logger.ts

@@ -25,7 +25,9 @@ export default function requestLogger(
             idsMsg = ` u=${usr}`;
         }
 
-        const msg = `{req} [${ip}] ${method} ${url}${idsMsg} : http=${res.statusCode} ${Date.now() - started}ms`;
+        const msg = `{req} [${ip}] ${method} ${url}${idsMsg}`
+            + ` : http=${res.statusCode}`
+            + ` ${Date.now() - started}ms`;
 
         if (res.statusCode >= 500) {
             logger.error(msg);

package/template/server/apps/shared/utils.ts

@@ -11,7 +11,7 @@ export function buildHandler(handler: AsyncHandler) {
             await handler(req, res);
         } catch (error) {
             if (error instanceof ZodError) {
-                const messages = error.errors.map((e) => e.message).join(', ');
+                const messages = error.issues.map((e) => e.message).join(', ');
                 logger.warn(`{route} ValidationError: ${messages}`, {
                     path: req.originalUrl,
                     method: req.method,
@@ -20,7 +20,7 @@ export function buildHandler(handler: AsyncHandler) {
                 res.status(400).json({
                     ok: false,
                     message: messages,
-                    errors: error.errors.map((e) => ({
+                    errors: error.issues.map((e) => ({
                         field: e.path.join('.'),
                         message: e.message
                     }))

package/template/server/apps/site-api/app.ts

@@ -1,5 +1,5 @@
 import dotenv from 'dotenv';
-dotenv.config();
+dotenv.config({ quiet: true });
 
 import express from 'express';
 import cors from 'cors';

package/template/server/console/index.ts

@@ -1,5 +1,5 @@
 import dotenv from 'dotenv';
-dotenv.config();
+dotenv.config({ quiet: true });
 
 import { parseArgs, runTask, listTasks, type ConsoleTask } from './runner.js';
 

package/template/server/console/tasks/seed-admin.ts

@@ -8,7 +8,11 @@ const task: ConsoleTask = {
 
     async run(context, args) {
         if (!args.email || !args.password) {
-            logger.error('Usage: npm run console -- --task=seed-admin --email=admin@example.com --password=yourpassword [--name=Admin]');
+            logger.error(
+                'Usage: npm run console -- --task=seed-admin '
+                + '--email=admin@example.com '
+                + '--password=yourpassword [--name=Admin]'
+            );
             process.exit(1);
         }
 
@@ -59,7 +63,9 @@ const task: ConsoleTask = {
                 logger.info('Welcome email sent', { email });
             } catch (error) {
                 logger.error('Failed to send welcome email', {
-                    error: error instanceof Error ? error.message : String(error)
+                    error: error instanceof Error
+                        ? error.message
+                        : String(error)
                 });
             }
         } else {

package/template/server/core/context.ts

@@ -27,7 +27,7 @@ class Context {
         try {
             await knex.transaction(async (trx) => {
                 for (const key in this) {
-                    const model = (this as any)[key];
+                    const model: unknown = this[key];
                     if (model instanceof BaseModel) {
                         model.knex = trx;
                     }
@@ -37,7 +37,7 @@ class Context {
             });
         } finally {
             for (const key in this) {
-                const model = (this as any)[key];
+                const model: unknown = this[key];
                 if (model instanceof BaseModel) {
                     model.knex = knex;
                 }

package/template/server/core/email.ts

@@ -23,7 +23,10 @@ function getTransporter(): nodemailer.Transporter {
     return _transporter;
 }
 
-function loadTemplate(templateName: string, variables: Record<string, unknown>): string {
+function loadTemplate(
+    templateName: string,
+    variables: Record<string, unknown>
+): string {
     const emailsDir = path.resolve(dirname, 'emails');
 
     const stylesPath = path.join(emailsDir, '_styles.css');
@@ -52,7 +55,11 @@ function loadTemplate(templateName: string, variables: Record<string, unknown>):
 }
 
 export function isEmailConfigured(): boolean {
-    return !!(process.env.EMAIL_HOST && process.env.EMAIL_USER && process.env.EMAIL_PASSWORD);
+    return !!(
+        process.env.EMAIL_HOST
+        && process.env.EMAIL_USER
+        && process.env.EMAIL_PASSWORD
+    );
 }
 
 export async function sendEmail(

package/template/server/core/knexfile.ts

@@ -4,7 +4,7 @@ import dirname from '#root/dirname.js';
 
 // dirname.ts resolves to server/ root regardless of where node was
 // invoked from — see its file header for the why.
-dotenv.config({ path: path.resolve(dirname, '.env') });
+dotenv.config({ path: path.resolve(dirname, '.env'), quiet: true });
 
 const config = {
     client: 'pg',

package/template/server/core/models/account.ts

@@ -1,6 +1,11 @@
 import BaseModel from './base.js';
 import logger from '#core/logger.js';
-import { NotFoundError, ForbiddenError, ConflictError, ValidationError } from '#core/errors.js';
+import {
+    NotFoundError,
+    ForbiddenError,
+    ConflictError,
+    ValidationError
+} from '#core/errors.js';
 
 interface PaginatedResult<T> {
     rows: T[];
@@ -75,12 +80,19 @@ class AccountModel extends BaseModel {
         };
     }
 
-    async update(id: string, data: { name?: string; settings?: Record<string, unknown> }) {
+    async update(
+        id: string,
+        data: { name?: string; settings?: Record<string, unknown> }
+    ) {
         await this.findById(id);
 
         const updateData: Record<string, unknown> = {};
-        if (data.name) updateData.name = data.name;
-        if (data.settings) updateData.settings = JSON.stringify(data.settings);
+        if (data.name) {
+            updateData.name = data.name;
+        }
+        if (data.settings) {
+            updateData.settings = JSON.stringify(data.settings);
+        }
 
         if (Object.keys(updateData).length > 0) {
             await this.knex('accounts').where({ id }).update(updateData);
@@ -93,7 +105,9 @@ class AccountModel extends BaseModel {
 
     async delete(id: string, userId: string, userRole: string) {
         if (userRole !== 'owner' && userRole !== 'admin') {
-            throw new ForbiddenError('Apenas proprietários podem excluir contas');
+            throw new ForbiddenError(
+                'Apenas proprietários podem excluir contas'
+            );
         }
 
         await this.findById(id);
@@ -134,7 +148,8 @@ class AccountModel extends BaseModel {
             });
         }
 
-        const [{ count }] = await baseQuery.clone().count('ua.user_id as count');
+        const [{ count }] = await baseQuery.clone()
+            .count('ua.user_id as count');
         const total = parseInt(String(count), 10);
 
         const rows = await baseQuery.clone()
@@ -170,11 +185,14 @@ class AccountModel extends BaseModel {
         if (!user) {
             if (!data.password || data.password.length < 6) {
                 throw new ValidationError(
-                    'Senha é obrigatória (mínimo 6 caracteres) para novos usuários'
+                    'Senha é obrigatória (mínimo 6 caracteres) '
+                    + 'para novos usuários'
                 );
             }
             if (!data.name) {
-                throw new ValidationError('Nome é obrigatório para novos usuários');
+                throw new ValidationError(
+                    'Nome é obrigatório para novos usuários'
+                );
             }
 
             user = await this.context.user.create({
@@ -200,7 +218,10 @@ class AccountModel extends BaseModel {
             role: data.role || 'user'
         });
 
-        logger.info(`{account} added member user_id=${user.id} to account_id=${accountId} role=${data.role}`);
+        logger.info(
+            `{account} added member user_id=${user.id}`
+            + ` to account_id=${accountId} role=${data.role}`
+        );
 
         return {
             id: user.id,
@@ -223,7 +244,10 @@ class AccountModel extends BaseModel {
             .where({ user_id: userId, account_id: accountId })
             .update({ role });
 
-        logger.info(`{account} updated member role user_id=${userId} account_id=${accountId} role=${role}`);
+        logger.info(
+            `{account} updated member role user_id=${userId}`
+            + ` account_id=${accountId} role=${role}`
+        );
     }
 
     async removeMember(accountId: string, userId: string) {
@@ -236,14 +260,19 @@ class AccountModel extends BaseModel {
         }
 
         if (member.role === 'owner') {
-            throw new ForbiddenError('Não é possível remover o proprietário da conta');
+            throw new ForbiddenError(
+                'Não é possível remover o proprietário da conta'
+            );
         }
 
         await this.knex('user_in_accounts')
             .where({ user_id: userId, account_id: accountId })
             .delete();
 
-        logger.info(`{account} removed member user_id=${userId} from account_id=${accountId}`);
+        logger.info(
+            `{account} removed member user_id=${userId}`
+            + ` from account_id=${accountId}`
+        );
     }
 
     async getAccountDashboard(accountId: string) {
@@ -277,7 +306,8 @@ class AccountModel extends BaseModel {
 
     async getDashboardStats() {
         const [usersCount] = await this.knex('users').count('id as count');
-        const [accountsCount] = await this.knex('accounts').count('id as count');
+        const [accountsCount] = await this.knex('accounts')
+            .count('id as count');
 
         const recentUsers = await this.knex('users')
             .select('id', 'name', 'email', 'role', 'utc_created_on')

package/template/server/core/models/auth.ts

@@ -271,7 +271,10 @@ class AuthModel extends BaseModel {
                 role: 'owner'
             });
 
-            logger.info(`{auth} signup existing user=${email}, new account=${account.name}`);
+            logger.info(
+                `{auth} signup existing user=${email},`
+                + ` new account=${account.name}`
+            );
 
             return {
                 existingUser: true,
@@ -354,7 +357,8 @@ class AuthModel extends BaseModel {
             expires_at: expiresAt
         });
 
-        const baseUiUrl = process.env.BASE_UI_URL || 'http://localhost:{{ADMIN_UI_PORT}}';
+        const baseUiUrl = process.env.BASE_UI_URL
+            || 'http://localhost:{{ADMIN_UI_PORT}}';
         const recoverPasswordUrl = `${baseUiUrl}/recover/${token}`;
 
         if (!isEmailConfigured()) {
@@ -436,7 +440,10 @@ class AuthModel extends BaseModel {
             throw new NotFoundError('Usuário não encontrado');
         }
 
-        const isValid = await bcrypt.compare(currentPassword, user.password_hash);
+        const isValid = await bcrypt.compare(
+            currentPassword,
+            user.password_hash
+        );
         if (!isValid) {
             throw new ValidationError('Senha atual incorreta');
         }

package/template/server/core/models/user.ts

@@ -90,7 +90,10 @@ class UserModel extends BaseModel {
                 role: 'owner'
             });
 
-            logger.info(`{user} created user=${user.email} role=${user.role} account_id=${account.id}`);
+            logger.info(
+                `{user} created user=${user.email}`
+                + ` role=${user.role} account_id=${account.id}`
+            );
         } else {
             logger.info(`{user} created user=${user.email} role=${user.role}`);
         }
@@ -171,7 +174,9 @@ class UserModel extends BaseModel {
 
     async updateAvatar(userId: string, avatarKey: string | null) {
         await this.findById(userId);
-        await this.knex('users').where({ id: userId }).update({ avatar_key: avatarKey });
+        await this.knex('users')
+            .where({ id: userId })
+            .update({ avatar_key: avatarKey });
         logger.info(`{user} avatar-updated user_id=${userId}`);
         return this.findById(userId);
     }
@@ -203,7 +208,7 @@ class UserModel extends BaseModel {
             .limit(limit)
             .offset(offset);
 
-        const userIds = users.map((u: any) => u.id);
+        const userIds = users.map((u: { id: string }) => u.id);
 
         const accountLinks = userIds.length > 0
             ? await this.knex('user_in_accounts as ua')
@@ -217,7 +222,8 @@ class UserModel extends BaseModel {
                 )
             : [];
 
-        const accountsByUser: Record<string, any[]> = {};
+        const accountsByUser:
+        Record<string, UserWithAccounts['accounts']> = {};
         for (const link of accountLinks) {
             if (!accountsByUser[link.user_id]) {
                 accountsByUser[link.user_id] = [];
@@ -229,10 +235,12 @@ class UserModel extends BaseModel {
             });
         }
 
-        const rows = users.map((u: any) => ({
-            ...u,
-            accounts: accountsByUser[u.id] || []
-        }));
+        const rows = users.map(
+            (u: Omit<UserWithAccounts, 'accounts'>) => ({
+                ...u,
+                accounts: accountsByUser[u.id] || []
+            })
+        );
 
         return {
             rows,
@@ -245,13 +253,22 @@ class UserModel extends BaseModel {
 
     async adminUpdate(
         id: string,
-        data: { name?: string; email?: string; role?: string; password?: string }
+        data: {
+            name?: string;
+            email?: string;
+            role?: string;
+            password?: string;
+        }
     ) {
         await this.findById(id);
 
         const updateData: Record<string, string> = {};
-        if (data.name) updateData.name = data.name;
-        if (data.role) updateData.role = data.role;
+        if (data.name) {
+            updateData.name = data.name;
+        }
+        if (data.role) {
+            updateData.role = data.role;
+        }
 
         if (data.email) {
             const email = data.email.toLowerCase().trim();
@@ -311,7 +328,9 @@ class UserModel extends BaseModel {
         }
 
         const updateData: Record<string, string> = {};
-        if (data.name) updateData.name = data.name;
+        if (data.name) {
+            updateData.name = data.name;
+        }
 
         if (data.email) {
             const email = data.email.toLowerCase().trim();
@@ -326,7 +345,9 @@ class UserModel extends BaseModel {
             updateData.email = email;
         }
 
-        if (Object.keys(updateData).length === 0) return this.findById(userId);
+        if (Object.keys(updateData).length === 0) {
+            return this.findById(userId);
+        }
 
         await this.knex('users').where({ id: userId }).update(updateData);
 
@@ -346,10 +367,12 @@ class UserModel extends BaseModel {
                 .select('id', 'name', 'status')
                 .orderBy('name');
 
-            return accounts.map((account: any) => ({
-                account,
-                role: 'admin'
-            }));
+            return accounts.map(
+                (account: UserAccount['account']) => ({
+                    account,
+                    role: 'admin'
+                })
+            );
         }
 
         const rows = await this.knex('user_in_accounts as ua')
@@ -357,14 +380,21 @@ class UserModel extends BaseModel {
             .where('ua.user_id', userId)
             .select('a.id', 'a.name', 'a.status', 'ua.role');
 
-        return rows.map((row: any) => ({
-            account: {
-                id: row.id,
-                name: row.name,
-                status: row.status
-            },
-            role: row.role
-        }));
+        return rows.map(
+            (row: {
+                id: string;
+                name: string;
+                status: string;
+                role: string;
+            }) => ({
+                account: {
+                    id: row.id,
+                    name: row.name,
+                    status: row.status
+                },
+                role: row.role
+            })
+        );
     }
 
     async getAccount(
@@ -377,7 +407,9 @@ class UserModel extends BaseModel {
                 .where({ id: accountId })
                 .first();
 
-            if (!account) return null;
+            if (!account) {
+                return null;
+            }
 
             return {
                 account: {
@@ -395,7 +427,9 @@ class UserModel extends BaseModel {
             .select('a.id', 'a.name', 'a.status', 'ua.role')
             .first();
 
-        if (!row) return null;
+        if (!row) {
+            return null;
+        }
 
         return {
             account: {

package/template/server/core/s3.ts

@@ -4,7 +4,8 @@ import {
     PutObjectCommand,
     DeleteObjectCommand,
     CopyObjectCommand,
-    HeadObjectCommand
+    HeadObjectCommand,
+    type GetObjectCommandInput
 } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import multer from 'multer';
@@ -22,7 +23,9 @@ export function getS3Client(): S3Client {
 
         if (!accessKeyId || !secretAccessKey) {
             throw new Error(
-                'AWS credentials not configured. Set AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables.'
+                'AWS credentials not configured. Set '
+                + 'AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY '
+                + 'environment variables.'
             );
         }
 
@@ -70,15 +73,15 @@ export function createS3Upload(options: CreateS3UploadOptions = {}) {
         s3: getS3Client(),
         bucket: getBucketName(),
         contentType: multerS3.AUTO_CONTENT_TYPE,
-        metadata: (_req: any, file: any, cb: any) => {
+        metadata: (req, file, cb) => {
             cb(null, {
                 fieldName: file.fieldname,
                 originalName: file.originalname,
-                uploadedBy: (_req as any).user?.id || 'unknown',
+                uploadedBy: req.user?.id || 'unknown',
                 uploadedAt: new Date().toISOString()
             });
         },
-        key: (_req: any, file: any, cb: any) => {
+        key: (_req, file, cb) => {
             const timestamp = Date.now();
             const randomString = crypto.randomBytes(8).toString('hex');
             const ext = path.extname(file.originalname);
@@ -88,7 +91,7 @@ export function createS3Upload(options: CreateS3UploadOptions = {}) {
     };
 
     if (acl === 'public-read') {
-        (storageOptions as any).acl = 'public-read';
+        storageOptions.acl = 'public-read';
     }
 
     return multer({
@@ -98,14 +101,18 @@ export function createS3Upload(options: CreateS3UploadOptions = {}) {
             if (allowedMimeTypes.includes(file.mimetype)) {
                 cb(null, true);
             } else {
-                cb(new Error(`Tipo de arquivo não permitido: ${file.mimetype}`));
+                cb(new Error(
+                    `Tipo de arquivo não permitido: ${file.mimetype}`
+                ));
             }
         }
     });
 }
 
 export function normalizeS3Url(url: string): string {
-    if (!url) return url;
+    if (!url) {
+        return url;
+    }
 
     const virtualHostedMatch = url.match(
         /https?:\/\/([^.]+)\.s3\.([^.]+)\.amazonaws\.com\/(.+)/
@@ -120,19 +127,27 @@ export function normalizeS3Url(url: string): string {
 }
 
 export function extractS3Key(url: string): string | null {
-    if (!url) return null;
+    if (!url) {
+        return null;
+    }
 
     const virtualHostedMatch = url.match(
         /https?:\/\/[^.]+\.s3\.[^.]+\.amazonaws\.com\/(.+)/
     );
-    if (virtualHostedMatch) return virtualHostedMatch[1];
+    if (virtualHostedMatch) {
+        return virtualHostedMatch[1];
+    }
 
     const pathStyleMatch = url.match(
         /https?:\/\/s3\.[^.]+\.amazonaws\.com\/[^/]+\/(.+)/
     );
-    if (pathStyleMatch) return pathStyleMatch[1];
+    if (pathStyleMatch) {
+        return pathStyleMatch[1];
+    }
 
-    if (!url.startsWith('http')) return url;
+    if (!url.startsWith('http')) {
+        return url;
+    }
 
     return null;
 }
@@ -142,7 +157,7 @@ export async function generateSignedUrl(
     expiresIn: number = 3600,
     options?: { filename?: string; contentType?: string }
 ): Promise<string> {
-    const commandParams: Record<string, unknown> = {
+    const commandParams: GetObjectCommandInput = {
         Bucket: getBucketName(),
         Key: key
     };
@@ -156,7 +171,7 @@ export async function generateSignedUrl(
         commandParams.ResponseContentType = options.contentType;
     }
 
-    const command = new GetObjectCommand(commandParams as any);
+    const command = new GetObjectCommand(commandParams);
     return getSignedUrl(getS3Client(), command, { expiresIn });
 }
 

package/template/server/eslint.config.js

@@ -10,7 +10,15 @@ export default [
         },
         rules: {
             "@stylistic/indent": ["error", 4],
-            "@stylistic/semi": ["error", "always"]
+            "@stylistic/semi": ["error", "always"],
+            "@stylistic/max-len": ["error", { "code": 80 }],
+            // Underscore prefix = intentionally unused (e.g. the
+            // mandatory 4th arg of an Express error handler).
+            "@typescript-eslint/no-unused-vars": ["error", {
+                "argsIgnorePattern": "^_",
+                "varsIgnorePattern": "^_"
+            }],
+            "curly": ["error", "all"]
         }
     }
 ];

package/template/server/migrations/20260208000000_initial-schema.ts

@@ -41,8 +41,10 @@ export async function up(knex: Knex): Promise<void> {
 
         CREATE INDEX idx_users_email ON users(email);
         CREATE INDEX idx_user_in_accounts_user ON user_in_accounts(user_id);
-        CREATE INDEX idx_user_in_accounts_account ON user_in_accounts(account_id);
-        CREATE INDEX idx_password_reset_tokens_token ON password_reset_tokens(token);
+        CREATE INDEX idx_user_in_accounts_account
+            ON user_in_accounts(account_id);
+        CREATE INDEX idx_password_reset_tokens_token
+            ON password_reset_tokens(token);
     `);
 }