This commit is contained in:
David Arranz 2026-07-04 13:28:28 +02:00
parent 6310944a85
commit 55b8bb8473
27 changed files with 130 additions and 96 deletions

View File

@ -33,8 +33,8 @@
"typescript": "^6.0.2" "typescript": "^6.0.2"
}, },
"dependencies": { "dependencies": {
"@erp/auth": "workspace:*",
"@erp/core": "workspace:*", "@erp/core": "workspace:*",
"@erp/identity": "workspace:*",
"@repo/i18next": "workspace:*", "@repo/i18next": "workspace:*",
"@repo/rdx-criteria": "workspace:*", "@repo/rdx-criteria": "workspace:*",
"@repo/rdx-ddd": "workspace:*", "@repo/rdx-ddd": "workspace:*",
@ -52,4 +52,4 @@
"use-debounce": "^10.1.1", "use-debounce": "^10.1.1",
"zod": "^4.3.6" "zod": "^4.3.6"
} }
} }

View File

@ -27,7 +27,7 @@ export type CatalogsPublicServicesType = ReturnType<typeof buildCatalogsPublicSe
export const catalogsAPIModule: IModuleServer = { export const catalogsAPIModule: IModuleServer = {
name: "catalogs", name: "catalogs",
version: "1.0.0", version: "1.0.0",
dependencies: [], dependencies: ["identity"],
/** /**
* Fase de SETUP * Fase de SETUP

View File

@ -1,3 +1,4 @@
export * from "./express";
export * from "./payment-methods"; export * from "./payment-methods";
export * from "./payment-terms"; export * from "./payment-terms";
export * from "./tax-definitions"; export * from "./tax-definitions";

View File

@ -1,5 +1,5 @@
import { mockUser, requireAuthenticated, requireCompanyContext } from "@erp/auth/api"; import { type StartParams, validateRequest } from "@erp/core/api";
import { type RequestWithAuth, type StartParams, validateRequest } from "@erp/core/api"; import { requireIdentityTenant } from "@erp/identity/api";
import { type NextFunction, type Request, type Response, Router } from "express"; import { type NextFunction, type Request, type Response, Router } from "express";
import { import {
@ -30,21 +30,7 @@ export const paymentMethodsRouter = (params: StartParams) => {
// ---------------------------------------------- // ----------------------------------------------
if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "production") { router.use(...requireIdentityTenant(params));
// 🔐 Autenticación + Tenancy para TODO el router
router.use(
(req: Request, res: Response, next: NextFunction) =>
mockUser(req as RequestWithAuth, res, next) // Debe ir antes de las rutas protegidas
);
}
router.use([
(req: Request, res: Response, next: NextFunction) =>
requireAuthenticated()(req as RequestWithAuth, res, next), // Debe ir antes de las rutas protegidas
(req: Request, res: Response, next: NextFunction) =>
requireCompanyContext()(req as RequestWithAuth, res, next), // Debe ir antes de las rutas protegidas
]);
// ---------------------------------------------- // ----------------------------------------------

View File

@ -1,5 +1,5 @@
import { mockUser, requireAuthenticated, requireCompanyContext } from "@erp/auth/api"; import { type StartParams, validateRequest } from "@erp/core/api";
import { type RequestWithAuth, type StartParams, validateRequest } from "@erp/core/api"; import { requireIdentityTenant } from "@erp/identity/api";
import type { NextFunction, Request, Response } from "express"; import type { NextFunction, Request, Response } from "express";
import { Router } from "express"; import { Router } from "express";
@ -29,18 +29,7 @@ export const paymentTermsRouter = (params: StartParams) => {
const router = Router({ mergeParams: true }); const router = Router({ mergeParams: true });
if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "production") { router.use(...requireIdentityTenant(params));
router.use((req: Request, res: Response, next: NextFunction) =>
mockUser(req as RequestWithAuth, res, next)
);
}
router.use([
(req: Request, res: Response, next: NextFunction) =>
requireAuthenticated()(req as RequestWithAuth, res, next),
(req: Request, res: Response, next: NextFunction) =>
requireCompanyContext()(req as RequestWithAuth, res, next),
]);
router.get( router.get(
"/", "/",

View File

@ -1,5 +1,5 @@
import { mockUser, requireAuthenticated, requireCompanyContext } from "@erp/auth/api"; import { type StartParams, validateRequest } from "@erp/core/api";
import { type RequestWithAuth, type StartParams, validateRequest } from "@erp/core/api"; import { requireIdentityTenant } from "@erp/identity/api";
import type { NextFunction, Request, Response } from "express"; import type { NextFunction, Request, Response } from "express";
import { Router } from "express"; import { Router } from "express";
@ -29,18 +29,7 @@ export const taxDefinitionsRouter = (params: StartParams) => {
const router = Router({ mergeParams: true }); const router = Router({ mergeParams: true });
if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "production") { router.use(...requireIdentityTenant(params));
router.use((req: Request, res: Response, next: NextFunction) =>
mockUser(req as RequestWithAuth, res, next)
);
}
router.use([
(req: Request, res: Response, next: NextFunction) =>
requireAuthenticated()(req as RequestWithAuth, res, next),
(req: Request, res: Response, next: NextFunction) =>
requireCompanyContext()(req as RequestWithAuth, res, next),
]);
router.get( router.get(
"/", "/",

View File

@ -1,5 +1,5 @@
import { mockUser, requireAuthenticated, requireCompanyContext } from "@erp/auth/api"; import { type StartParams, validateRequest } from "@erp/core/api";
import { type RequestWithAuth, type StartParams, validateRequest } from "@erp/core/api"; import { requireIdentityTenant } from "@erp/identity/api";
import type { NextFunction, Request, Response } from "express"; import type { NextFunction, Request, Response } from "express";
import { Router } from "express"; import { Router } from "express";
@ -29,18 +29,7 @@ export const taxRegimesRouter = (params: StartParams) => {
const router = Router({ mergeParams: true }); const router = Router({ mergeParams: true });
if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "production") { router.use(...requireIdentityTenant(params));
router.use((req: Request, res: Response, next: NextFunction) =>
mockUser(req as RequestWithAuth, res, next)
);
}
router.use([
(req: Request, res: Response, next: NextFunction) =>
requireAuthenticated()(req as RequestWithAuth, res, next),
(req: Request, res: Response, next: NextFunction) =>
requireCompanyContext()(req as RequestWithAuth, res, next),
]);
router.get( router.get(
"/", "/",

View File

@ -81,11 +81,23 @@ export const useCreateProformaController = (options?: UseCreateProformaControlle
const setCustomer = (customer: CustomerSelectionOption) => { const setCustomer = (customer: CustomerSelectionOption) => {
setSelectedCustomer(customer); setSelectedCustomer(customer);
// Necesitamos consultar todos los datos del cliente para
// poder rellenar los campos de la proforma
form.setValue("customerId", customer.id, { form.setValue("customerId", customer.id, {
shouldDirty: true, shouldDirty: true,
shouldTouch: true, shouldTouch: true,
shouldValidate: true, shouldValidate: true,
}); });
/*form.setValue("")
form.setValue("taxRegimeCode", customer.taxRegimeCode ?? "", {
shouldDirty: true,
shouldTouch: true,
shouldValidate: true,
});*/
}; };
const clearCustomer = () => { const clearCustomer = () => {

View File

@ -34,9 +34,9 @@
"typescript": "^6.0.2" "typescript": "^6.0.2"
}, },
"dependencies": { "dependencies": {
"@erp/auth": "workspace:*",
"@erp/core": "workspace:*",
"@erp/catalogs": "workspace:*", "@erp/catalogs": "workspace:*",
"@erp/core": "workspace:*",
"@erp/identity": "workspace:*",
"@hookform/resolvers": "^5.2.2", "@hookform/resolvers": "^5.2.2",
"@repo/i18next": "workspace:*", "@repo/i18next": "workspace:*",
"@repo/rdx-criteria": "workspace:*", "@repo/rdx-criteria": "workspace:*",
@ -56,4 +56,4 @@
"use-debounce": "^10.1.1", "use-debounce": "^10.1.1",
"zod": "^4.3.6" "zod": "^4.3.6"
} }
} }

View File

@ -10,7 +10,7 @@ export * from "./infrastructure/persistence/sequelize";
export const customersAPIModule: IModuleServer = { export const customersAPIModule: IModuleServer = {
name: "customers", name: "customers",
version: "1.0.0", version: "1.0.0",
dependencies: ["catalogs"], dependencies: ["catalogs", "identity"],
/** /**
* Fase de SETUP * Fase de SETUP

View File

@ -1,5 +1,5 @@
import { mockUser, requireAuthenticated, requireCompanyContext } from "@erp/auth/api"; import { type StartParams, validateRequest } from "@erp/core/api";
import { type RequestWithAuth, type StartParams, validateRequest } from "@erp/core/api"; import { requireIdentityTenant } from "@erp/identity/api";
import { type NextFunction, type Request, type Response, Router } from "express"; import { type NextFunction, type Request, type Response, Router } from "express";
import { import {
@ -29,21 +29,7 @@ export const customersRouter = (params: StartParams) => {
// ---------------------------------------------- // ----------------------------------------------
// 🔐 Autenticación + Tenancy para TODO el router // 🔐 Autenticación + Tenancy para TODO el router
if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "production") { router.use(...requireIdentityTenant(params));
router.use(
(req: Request, res: Response, next: NextFunction) =>
mockUser(req as RequestWithAuth, res, next) // Debe ir antes de las rutas protegidas
);
}
//router.use(/*authenticateJWT(),*/ enforceTenant() /*checkTabContext*/);
router.use([
(req: Request, res: Response, next: NextFunction) =>
requireAuthenticated()(req as RequestWithAuth, res, next), // Debe ir antes de las rutas protegidas
(req: Request, res: Response, next: NextFunction) =>
requireCompanyContext()(req as RequestWithAuth, res, next), // Debe ir antes de las rutas protegidas
]);
// ---------------------------------------------- // ----------------------------------------------

View File

@ -1 +1 @@
export * from './build-customer-selection-option'; export * from "./build-customer-data";

View File

@ -2,7 +2,8 @@
"extends": "../../tsconfig.json", "extends": "../../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"paths": { "paths": {
"@erp/customers/*": ["./src/*"] "@erp/customers/*": ["./src/*"],
"@erp/identity/*": ["../identity/src/*"]
}, },
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo", "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",

View File

@ -34,7 +34,9 @@
"zod": "^4.3.6" "zod": "^4.3.6"
}, },
"devDependencies": { "devDependencies": {
"@types/bcrypt": "^6.0.0",
"@types/express": "^4.17.21", "@types/express": "^4.17.21",
"@types/jsonwebtoken": "^9.0.10",
"@types/react": "^19.2.14", "@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3", "@types/react-dom": "^19.2.3",
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",

View File

@ -4,3 +4,4 @@ export * from "./companies";
export * from "./company-memberships"; export * from "./company-memberships";
export * from "./permissions"; export * from "./permissions";
export * from "./roles"; export * from "./roles";
export * from "./services";

View File

@ -0,0 +1,10 @@
import type { RequestHandler } from "express";
export type AuthenticatedOnlyMiddlewares = readonly [RequestHandler, RequestHandler];
export type TenantRequiredMiddlewares = readonly [RequestHandler, RequestHandler, RequestHandler];
export interface IIdentityAuthPublicServices {
authenticatedOnly(): AuthenticatedOnlyMiddlewares;
tenantRequired(): TenantRequiredMiddlewares;
}

View File

@ -0,0 +1,5 @@
import type { IIdentityAuthPublicServices } from "./identity-auth-public-services.interface";
export interface IIdentityPublicServices {
auth: IIdentityAuthPublicServices;
}

View File

@ -0,0 +1,2 @@
export * from "./identity-auth-public-services.interface";
export * from "./identity-public-services.interface";

View File

@ -1,13 +1,16 @@
import type { IModuleServer } from "@erp/core/api"; import type { IModuleServer } from "@erp/core/api";
import type { IIdentityPublicServices } from "./application";
export * from "./application"; export * from "./application";
export * from "./domain"; export * from "./domain";
export * from "./infrastructure"; export * from "./infrastructure";
import { identityAuthRouter, models } from "./infrastructure"; import { identityAuthRouter, models } from "./infrastructure";
import { buildIdentityDependencies } from "./infrastructure/di"; import { buildIdentityDependencies, buildIdentityPublicServices } from "./infrastructure/di";
export * from "./infrastructure/persistence/sequelize"; export * from "./infrastructure/persistence/sequelize";
export type { IIdentityAuthPublicServices, IIdentityPublicServices } from "./application";
export type IdentityPublicServicesType = IIdentityPublicServices;
export const identityAPIModule: IModuleServer = { export const identityAPIModule: IModuleServer = {
name: "identity", name: "identity",
@ -28,8 +31,7 @@ export const identityAPIModule: IModuleServer = {
const internal = buildIdentityDependencies(params); const internal = buildIdentityDependencies(params);
// 2) Servicios públicos (Application Services) // 2) Servicios públicos (Application Services)
const identityServices = {}; const identityServices: IIdentityPublicServices = buildIdentityPublicServices(internal);
//const identityServices: IIdentityPublicServices = {}; //buildIdentityPublicServices(params, internal);
logger.info("🚀 Identity module dependencies registered", { logger.info("🚀 Identity module dependencies registered", {
label: this.name, label: this.name,

View File

@ -0,0 +1,35 @@
import type {
IIdentityAuthPublicServices,
IIdentityPublicServices,
} from "../../application";
import {
authenticateUser,
requireAuthenticated,
requireCompanyContext,
} from "../express/middlewares";
import type { IdentityInternalDeps } from "./identity.di";
class IdentityAuthPublicServices implements IIdentityAuthPublicServices {
public constructor(
private readonly deps: IdentityInternalDeps["auth"]["authenticateUserDependencies"]
) {}
public authenticatedOnly() {
return [authenticateUser(this.deps), requireAuthenticated()] as const;
}
public tenantRequired() {
return [
authenticateUser(this.deps),
requireAuthenticated(),
requireCompanyContext(),
] as const;
}
}
export function buildIdentityPublicServices(deps: IdentityInternalDeps): IIdentityPublicServices {
return {
auth: new IdentityAuthPublicServices(deps.auth.authenticateUserDependencies),
};
}

View File

@ -2,6 +2,7 @@ import { type ModuleParams, buildTransactionManager } from "@erp/core/api";
import { import {
AccountAuthenticator, AccountAuthenticator,
type IAccessTokenVerifier,
type GetCurrentSessionUseCase, type GetCurrentSessionUseCase,
GetCurrentSessionUseCase as GetCurrentSessionUseCaseImpl, GetCurrentSessionUseCase as GetCurrentSessionUseCaseImpl,
type LoginWithPasswordUseCase, type LoginWithPasswordUseCase,
@ -12,6 +13,7 @@ import {
RefreshSessionUseCase as RefreshSessionUseCaseImpl, RefreshSessionUseCase as RefreshSessionUseCaseImpl,
SessionIssuer, SessionIssuer,
} from "../../application/authentication"; } from "../../application/authentication";
import type { IAccountRepository } from "../../application/accounts";
import { identityAuthenticateRequest } from "../express/middlewares"; import { identityAuthenticateRequest } from "../express/middlewares";
import { import {
SequelizeAccountDomainMapper, SequelizeAccountDomainMapper,
@ -30,6 +32,10 @@ import {
export type IdentityInternalDeps = { export type IdentityInternalDeps = {
auth: { auth: {
refreshTokenExpiration: string; refreshTokenExpiration: string;
authenticateUserDependencies: {
accessTokenVerifier: IAccessTokenVerifier;
accountRepository: IAccountRepository;
};
authenticateRequest: ReturnType<typeof identityAuthenticateRequest>; authenticateRequest: ReturnType<typeof identityAuthenticateRequest>;
useCases: { useCases: {
loginWithPassword: () => LoginWithPasswordUseCase; loginWithPassword: () => LoginWithPasswordUseCase;
@ -79,6 +85,10 @@ export const buildIdentityDependencies = (params: ModuleParams): IdentityInterna
return { return {
auth: { auth: {
refreshTokenExpiration: config.auth.jwt.refreshExpiration, refreshTokenExpiration: config.auth.jwt.refreshExpiration,
authenticateUserDependencies: {
accessTokenVerifier,
accountRepository,
},
authenticateRequest: identityAuthenticateRequest({ authenticateRequest: identityAuthenticateRequest({
accessTokenVerifier, accessTokenVerifier,
accountRepository, accountRepository,

View File

@ -1 +1,2 @@
export * from "./identity.di"; export * from "./identity.di";
export * from "./identity-public-services";

View File

@ -1,4 +1,5 @@
export * from "./authenticate-user.middleware"; export * from "./authenticate-user.middleware";
export * from "./require-authenticated.middleware"; export * from "./require-authenticated.middleware";
export * from "./require-company-context.middleware"; export * from "./require-company-context.middleware";
export * from "./require-identity-middlewares";
export * from "./identity-authenticate-request"; export * from "./identity-authenticate-request";

View File

@ -1,13 +1,12 @@
import { ExpressController, UnauthorizedApiError, type RequestWithAuth } from "@erp/core/api"; import { ExpressController, UnauthorizedApiError, type RequestWithAuth } from "@erp/core/api";
import type { NextFunction, Response } from "express"; import type { NextFunction, Request, Response } from "express";
export function requireAuthenticated() { export function requireAuthenticated() {
return (req: RequestWithAuth, res: Response, next: NextFunction) => { return (req: Request, res: Response, next: NextFunction) => {
if (!req.user) { if (!(req as RequestWithAuth).user) {
return ExpressController.errorResponse(new UnauthorizedApiError("Unauthorized"), req, res); return ExpressController.errorResponse(new UnauthorizedApiError("Unauthorized"), req, res);
} }
next(); next();
}; };
} }

View File

@ -1,12 +1,12 @@
import { ExpressController, ForbiddenApiError, type RequestWithAuth } from "@erp/core/api"; import { ExpressController, ForbiddenApiError, type RequestWithAuth } from "@erp/core/api";
import type { NextFunction, Response } from "express"; import type { NextFunction, Request, Response } from "express";
export function requireCompanyContext() { export function requireCompanyContext() {
return (req: RequestWithAuth, res: Response, next: NextFunction) => { return (req: Request, res: Response, next: NextFunction) => {
/** /**
* TODO: validar membership real cuando exista persistencia de CompanyMembership. * TODO: validar membership real cuando exista persistencia de CompanyMembership.
*/ */
if (!req.user?.companyId) { if (!(req as RequestWithAuth).user?.companyId) {
return ExpressController.errorResponse( return ExpressController.errorResponse(
new ForbiddenApiError("Company context required"), new ForbiddenApiError("Company context required"),
req, req,
@ -17,4 +17,3 @@ export function requireCompanyContext() {
next(); next();
}; };
} }

View File

@ -0,0 +1,14 @@
import type { StartParams } from "@erp/core/api";
import type { RequestHandler } from "express";
import type { IIdentityPublicServices } from "../../../application";
export function requireIdentityAuthenticated(params: StartParams): RequestHandler[] {
const identityServices = params.getService<IIdentityPublicServices>("identity:general");
return [...identityServices.auth.authenticatedOnly()];
}
export function requireIdentityTenant(params: StartParams): RequestHandler[] {
const identityServices = params.getService<IIdentityPublicServices>("identity:general");
return [...identityServices.auth.tenantRequired()];
}