Compare commits

...

2 Commits

Author SHA1 Message Date
55b8bb8473 . 2026-07-04 13:28:28 +02:00
6310944a85 . 2026-07-03 09:37:12 +02:00
36 changed files with 306 additions and 106 deletions

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
import { mockUser, requireAuthenticated, requireCompanyContext } from "@erp/auth/api";
import { type RequestWithAuth, type StartParams, validateRequest } from "@erp/core/api";
import { type StartParams, validateRequest } from "@erp/core/api";
import { requireIdentityTenant } from "@erp/identity/api";
import { type NextFunction, type Request, type Response, Router } from "express";
import {
@ -30,21 +30,7 @@ export const paymentMethodsRouter = (params: StartParams) => {
// ----------------------------------------------
if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "production") {
// 🔐 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
]);
router.use(...requireIdentityTenant(params));
// ----------------------------------------------

View File

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

View File

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

View File

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

View File

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

View File

@ -6,7 +6,7 @@ export const buildProformaCreateDefault = (): ProformaCreateForm => {
return {
customerId: "",
invoiceDate: DateHelper.buildTodayIsoDate(),
series: "",
series: "F26",
languageCode: "es",
currencyCode: "EUR",
};

View File

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

View File

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

View File

@ -1,5 +1,5 @@
import { mockUser, requireAuthenticated, requireCompanyContext } from "@erp/auth/api";
import { type RequestWithAuth, type StartParams, validateRequest } from "@erp/core/api";
import { type StartParams, validateRequest } from "@erp/core/api";
import { requireIdentityTenant } from "@erp/identity/api";
import { type NextFunction, type Request, type Response, Router } from "express";
import {
@ -29,21 +29,7 @@ export const customersRouter = (params: StartParams) => {
// ----------------------------------------------
// 🔐 Autenticación + Tenancy para TODO el router
if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "production") {
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
]);
router.use(...requireIdentityTenant(params));
// ----------------------------------------------

View File

@ -2,6 +2,9 @@
* Representa un cliente seleccionable desde cualquier módulo.
* Debe ser lo suficientemente rico para mostrar en UI,
* pero sin arrastrar todo el shape de Customer.
*
* No usar objetos de dominio, todo tipos primitivos y strings,
* para desacoplar de la capa de dominio.
*/
export interface CustomerSelectionOption {
id: string;

View File

@ -0,0 +1 @@
export * from "./use-get-customer-controller";

View File

@ -0,0 +1,26 @@
import { useCustomerGetQuery } from "../../../../web/shared";
import { buildCustomerData } from "../utils";
export const useGetCustomerController = (customerId: string, options?: { enabled?: boolean }) => {
const {
data,
isLoading,
isError: isLoadError,
error: loadError,
refetch,
} = useCustomerGetQuery({
id: customerId,
enabled: options?.enabled ?? true,
});
const customerData = data ? buildCustomerData(data) : undefined;
return {
customerData,
isLoading,
isLoadError,
loadError,
refetch,
};
};

View File

@ -0,0 +1,64 @@
/**
* Representa un cliente con todo el shape de Customer.
*
* No usar objetos de dominio, todo tipos primitivos y strings,
* para desacoplar de la capa de dominio.
*/
export interface CustomerData {
id: string;
status: string;
reference: string | null;
isCompany: boolean;
name: string;
tradeName: string | null;
tin: string | null;
address: {
street: string | null;
street2: string | null;
city: string | null;
province: string | null;
postalCode: string | null;
country: string | null;
};
contact: {
emailPrimary: string | null;
emailSecondary: string | null;
phonePrimary: string | null;
phoneSecondary: string | null;
mobilePrimary: string | null;
mobileSecondary: string | null;
fax: string | null;
website: string | null;
};
legalRecord: string | null;
paymentMethod: {
id: string;
name: string;
description: string;
} | null;
paymentTerm: {
id: string;
description: string;
} | null;
taxRegime: {
code: string;
description: string;
} | null;
fiscalDefaults: {
usesEquivalenceSurcharge: boolean;
usesRetention: boolean;
};
languageCode: string;
currencyCode: string;
}

View File

@ -0,0 +1 @@
export * from './customer-data.entity';

View File

@ -0,0 +1 @@
export * from "./controllers";

View File

@ -0,0 +1,71 @@
import type { Customer } from "../../../../web/shared";
import type { CustomerData } from "../entities";
/**
* Mapper explícito para desacoplar UI del shape de customers/shared.
*/
export const buildCustomerData = (customer: Customer): CustomerData => {
return {
id: customer.id,
status: customer.status,
reference: customer.reference,
isCompany: customer.isCompany,
name: customer.name,
tradeName: customer.tradeName,
tin: customer.tin,
address: {
street: customer.address.street,
street2: null,
city: customer.address.city,
province: customer.address.province,
postalCode: customer.address.postalCode,
country: customer.address.country,
},
contact: {
emailPrimary: customer.contact.primaryEmail,
emailSecondary: customer.contact.secondaryEmail,
phonePrimary: customer.contact.primaryPhone,
phoneSecondary: customer.contact.secondaryPhone,
mobilePrimary: customer.contact.primaryMobile,
mobileSecondary: customer.contact.secondaryMobile,
fax: customer.contact.fax,
website: customer.contact.website,
},
legalRecord: customer.legalRecord,
paymentMethod: customer.paymentMethod
? {
id: customer.paymentMethod.id,
name: customer.paymentMethod.name,
description: customer.paymentMethod.description,
}
: null,
paymentTerm: customer.paymentTerm
? {
id: customer.paymentTerm.id,
description: customer.paymentTerm.description,
}
: null,
taxRegime: customer.taxRegime
? {
code: customer.taxRegime.code,
description: customer.taxRegime.description,
}
: null,
fiscalDefaults: {
usesEquivalenceSurcharge: customer.fiscalDefaults.usesEquivalenceSurcharge,
usesRetention: customer.fiscalDefaults.usesRetention,
},
languageCode: customer.languageCode,
currencyCode: customer.currencyCode,
};
};

View File

@ -0,0 +1 @@
export * from "./build-customer-data";

View File

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

View File

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

View File

@ -4,3 +4,4 @@ export * from "./companies";
export * from "./company-memberships";
export * from "./permissions";
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 { IIdentityPublicServices } from "./application";
export * from "./application";
export * from "./domain";
export * from "./infrastructure";
import { identityAuthRouter, models } from "./infrastructure";
import { buildIdentityDependencies } from "./infrastructure/di";
import { buildIdentityDependencies, buildIdentityPublicServices } from "./infrastructure/di";
export * from "./infrastructure/persistence/sequelize";
export type { IIdentityAuthPublicServices, IIdentityPublicServices } from "./application";
export type IdentityPublicServicesType = IIdentityPublicServices;
export const identityAPIModule: IModuleServer = {
name: "identity",
@ -28,8 +31,7 @@ export const identityAPIModule: IModuleServer = {
const internal = buildIdentityDependencies(params);
// 2) Servicios públicos (Application Services)
const identityServices = {};
//const identityServices: IIdentityPublicServices = {}; //buildIdentityPublicServices(params, internal);
const identityServices: IIdentityPublicServices = buildIdentityPublicServices(internal);
logger.info("🚀 Identity module dependencies registered", {
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 {
AccountAuthenticator,
type IAccessTokenVerifier,
type GetCurrentSessionUseCase,
GetCurrentSessionUseCase as GetCurrentSessionUseCaseImpl,
type LoginWithPasswordUseCase,
@ -12,6 +13,7 @@ import {
RefreshSessionUseCase as RefreshSessionUseCaseImpl,
SessionIssuer,
} from "../../application/authentication";
import type { IAccountRepository } from "../../application/accounts";
import { identityAuthenticateRequest } from "../express/middlewares";
import {
SequelizeAccountDomainMapper,
@ -30,6 +32,10 @@ import {
export type IdentityInternalDeps = {
auth: {
refreshTokenExpiration: string;
authenticateUserDependencies: {
accessTokenVerifier: IAccessTokenVerifier;
accountRepository: IAccountRepository;
};
authenticateRequest: ReturnType<typeof identityAuthenticateRequest>;
useCases: {
loginWithPassword: () => LoginWithPasswordUseCase;
@ -79,6 +85,10 @@ export const buildIdentityDependencies = (params: ModuleParams): IdentityInterna
return {
auth: {
refreshTokenExpiration: config.auth.jwt.refreshExpiration,
authenticateUserDependencies: {
accessTokenVerifier,
accountRepository,
},
authenticateRequest: identityAuthenticateRequest({
accessTokenVerifier,
accountRepository,

View File

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

View File

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

View File

@ -1,13 +1,12 @@
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() {
return (req: RequestWithAuth, res: Response, next: NextFunction) => {
if (!req.user) {
return (req: Request, res: Response, next: NextFunction) => {
if (!(req as RequestWithAuth).user) {
return ExpressController.errorResponse(new UnauthorizedApiError("Unauthorized"), req, res);
}
next();
};
}

View File

@ -1,12 +1,12 @@
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() {
return (req: RequestWithAuth, res: Response, next: NextFunction) => {
return (req: Request, res: Response, next: NextFunction) => {
/**
* TODO: validar membership real cuando exista persistencia de CompanyMembership.
*/
if (!req.user?.companyId) {
if (!(req as RequestWithAuth).user?.companyId) {
return ExpressController.errorResponse(
new ForbiddenApiError("Company context required"),
req,
@ -17,4 +17,3 @@ export function requireCompanyContext() {
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()];
}

View File

@ -1,7 +1,7 @@
import { type MapperParamsType, SequelizeDomainMapper } from "@erp/core/api";
import {
UniqueID,
UtcDate,
UtcDateTime,
ValidationErrorCollection,
type ValidationErrorDetail,
extractOrPushError,
@ -10,11 +10,7 @@ import {
} from "@repo/rdx-ddd";
import { Result } from "@repo/rdx-utils";
import {
RefreshToken,
RefreshTokenHash,
type RefreshTokenInternalProps,
} from "../../../../domain";
import { RefreshToken, RefreshTokenHash, type RefreshTokenInternalProps } from "../../../../domain";
import type { RefreshTokenCreationAttributes, RefreshTokenModel } from "../models";
function toUtcIsoString(value: Date | string): string {
@ -45,13 +41,13 @@ export class SequelizeRefreshTokenDomainMapper extends SequelizeDomainMapper<
errors
);
const expiresAt = extractOrPushError(
UtcDate.createFromISO(toUtcIsoString(source.expires_at)),
UtcDateTime.createFromISO(toUtcIsoString(source.expires_at)),
"expires_at",
errors
);
const revokedAt = extractOrPushError(
maybeFromNullableResult(source.revoked_at, (value) =>
UtcDate.createFromISO(toUtcIsoString(value))
UtcDateTime.createFromISO(toUtcIsoString(value))
),
"revoked_at",
errors
@ -62,7 +58,7 @@ export class SequelizeRefreshTokenDomainMapper extends SequelizeDomainMapper<
errors
);
const createdAt = extractOrPushError(
UtcDate.createFromISO(toUtcIsoString(source.created_at)),
UtcDateTime.createFromISO(toUtcIsoString(source.created_at)),
"created_at",
errors
);
@ -98,7 +94,9 @@ export class SequelizeRefreshTokenDomainMapper extends SequelizeDomainMapper<
token_hash: source.tokenHash.toPrimitive(),
expires_at: source.expiresAt.toISOString(),
revoked_at: maybeToNullable(source.revokedAt, (revokedAt) => revokedAt.toISOString()),
replaced_by_token_id: maybeToNullable(source.replacedByTokenId, (value) => value.toPrimitive()),
replaced_by_token_id: maybeToNullable(source.replacedByTokenId, (value) =>
value.toPrimitive()
),
created_at: source.createdAt.toISOString(),
});
}