@silexpert/core 2.0.123 → 2.0.124

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@silexpert/core",
-  "version": "2.0.123",
+  "version": "2.0.124",
   "description": "Silex Core perform HTTP Request and object binding. Silex core helps developers to retrieve and return formatted object",
   "keywords": [
     "accounting",

package/ts/api/resources/Mfa.ts

@@ -14,12 +14,16 @@ export class UserMfa extends Resource {
     return this.axios.$post('/mfa/disable', { userId });
   }
 
-  verifyCode(userId: number, code: string): Promise<{ success: boolean; token?: string }> {
-    return this.axios.$post('/mfa/verify/code', { userId, code });
+  verifyCode(userId: number, code: string, mfaChallengeToken?: string): Promise<{ success: boolean; token?: string }> {
+    return this.axios.$post('/mfa/verify/code', { userId, code, mfaChallengeToken });
   }
 
-  verifyRecoveryCode(userId: number, recoveryCode: string): Promise<{ success: boolean; token?: string }> {
-    return this.axios.$post('/mfa/verify/recovery-code', { userId, recoveryCode });
+  verifyRecoveryCode(
+    userId: number,
+    recoveryCode: string,
+    mfaChallengeToken?: string,
+  ): Promise<{ success: boolean; token?: string }> {
+    return this.axios.$post('/mfa/verify/recovery-code', { userId, recoveryCode, mfaChallengeToken });
   }
 
   isMfaEnabled(userId?: number): Promise<{ isEnabled: boolean }> {

package/ts/types/Enum/PrestationType.ts

@@ -230,7 +230,6 @@ export const allPrestationsWithBrochure = [
   PrestationType.COMPTA_POURCENTAGE_PREMIUM,
   PrestationType.COMPTA_POURCENTAGE_EXPRESS,
   PrestationType.COMPTA_POURCENTAGE_PREMIUM_EXPRESS,
-  PrestationType.BILAN_PREVISIONNEL,
   PrestationType.EXCEPTIONNEL,
   PrestationType.DECLARATION_IR,
 ];
@@ -276,6 +275,7 @@ export const allPrestations2025WithCGV = [
   PrestationType.ATTESTATION_MASSE_SALARIALE,
   PrestationType.ATTESTATION_1,
   PrestationType.ATTESTATION_NON_REMUNERATION_RECURRENTE,
+  PrestationType.BILAN_PREVISIONNEL,
 ];
 
 export const ClementineSubscriptionAccountancyExpertPrestations: PrestationType[] = [

package/ts/types/Interface/api/authentification/AuthenticationResponse.ts

@@ -9,6 +9,8 @@ export class IAuthenticationResponse {
   expiresAt?: Date;
   /** ID de l'utilisateur */
   userId?: number;
+  /** Jeton opaque de défi MFA lié à l'étape mot de passe */
+  mfaChallengeToken?: string;
   /** Message informatif */
   message?: string;
   /** Token JWT si authentification réussie */

package/ts/types/Interface/api/authentification/ReadAuthenticateCollaborater.ts

@@ -3,7 +3,14 @@ import { PrestationTypeDetail } from '../../../Enum/PrestationType.js';
 import { IUser } from '../../models/IUser.js';
 
 export class ReadAuthenticateCollaborater {
-  token: string;
+  /** JWT, absent tant que la vérification MFA n'est pas faite */
+  token?: string;
+  /** Vrai si un code MFA doit être vérifié via /mfa/verify/* avant d'obtenir le JWT */
+  requiresMfa?: boolean;
+  /** ID de l'utilisateur, à renvoyer avec le code MFA */
+  userId?: number;
+  /** Jeton opaque de défi MFA lié à l'étape mot de passe */
+  mfaChallengeToken?: string;
 }
 
 export class ReadConnectAs {

package/ts/types/Interface/api/mfa/VerifyCode.ts

@@ -1,4 +1,4 @@
-import { IsInt, IsNotEmpty, IsString, Length } from 'class-validator';
+import { IsInt, IsNotEmpty, IsOptional, IsString, Length } from 'class-validator';
 
 export class MfaVerifyCode {
   @IsNotEmpty()
@@ -8,4 +8,9 @@ export class MfaVerifyCode {
   @IsString()
   @Length(6, 6)
   code: string;
+
+  /** Optionnel le temps de la transition des anciennes versions de l'app mobile (SEC-04) */
+  @IsOptional()
+  @IsString()
+  mfaChallengeToken?: string;
 }

package/ts/types/Interface/api/mfa/VerifyRecoveryCode.ts

@@ -1,4 +1,4 @@
-import { IsInt, IsNotEmpty, IsString } from 'class-validator';
+import { IsInt, IsNotEmpty, IsOptional, IsString } from 'class-validator';
 
 export class MfaVerifyRecoveryCode {
   @IsNotEmpty()
@@ -8,4 +8,9 @@ export class MfaVerifyRecoveryCode {
   @IsString()
   @IsNotEmpty()
   recoveryCode: string;
+
+  /** Optionnel le temps de la transition des anciennes versions de l'app mobile (SEC-04) */
+  @IsOptional()
+  @IsString()
+  mfaChallengeToken?: string;
 }

package/ts/types/Interface/models/IApiError.ts

@@ -8,6 +8,10 @@ export enum Code {
   // HTTP Error
   tokenFailure = 'token_authentication_failure',
   authenticationFailure = 'authentication_credentials_failure',
+  /** MFA challenge missing, expired, used or bound to another user: the user must log in again */
+  mfaChallengeInvalid = 'mfa_challenge_invalid',
+  /** Too many wrong MFA codes for the same challenge: the user must log in again */
+  mfaTooManyAttempts = 'mfa_too_many_attempts',
   notFound = 'resource_not_found',
   forbidden = 'forbidden',
   fileNotFound = 'file_not_found',

package/ts/utils/commercialManagement/document.ts

@@ -31,6 +31,7 @@ import ejs from 'ejs';
 import 'dayjs/locale/fr.js';
 import { orderBy, groupBy, sumBy, round, uniq } from 'lodash-es';
 import sanitize from 'sanitize-html';
+import { isHtmlEmpty } from '../isHtml.js';
 
 type brandColorType = {
   primary: string;
@@ -89,7 +90,7 @@ export function generateCommercialDocument(
     paymentLink: payload.paymentLink ?? '#',
     idEstimateInvoiceType,
     title: payload.title ?? null,
-    cgv: payload.cgv ?? null,
+    cgv: isHtmlEmpty(payload.cgv) ? null : payload.cgv,
     // EJS `with` blocks throw a ReferenceError when a variable key is entirely absent from the data object, so seller
     // identity/address fields must always be defined even when the payload omits them.
     name: payload.name ?? null,

package/ts/utils/commercialManagement/templates/body.ts

@@ -120,7 +120,7 @@ export const bodyTemplate = `<html class="pdf-content">
       <br/><%= languageTemplate.template.common.options.approval %> : <br/><br/><br/><br/>
     <% } %>
 
-    <% if (cgv && (settings && settings.invoiceCgv)) { %>
+    <% if (cgv && settings && settings.invoiceCgv) { %>
       <br><div style="page-break-after:always;"></div>
       <div id="WYSIWYG"><%- cgv %></div>
     <% } %>

package/ts/utils/isHtml.ts

@@ -7,3 +7,17 @@ export function isHtml(text: string): boolean {
   const htmlRegex = /<([A-Za-z][A-Za-z0-9]*)\b[^>]*>(.*?)<\/\1>/i;
   return htmlRegex.test(text);
 }
+
+/**
+ * Verify if an HTML string is considered empty (e.g. "", "<p><br></p>", "<p>&nbsp;</p>", or empty tags with no visible text/image)
+ * @param html - The HTML string to verify
+ * @returns {boolean}
+ */
+export function isHtmlEmpty(html?: string | null): boolean {
+  if (!html) return true;
+  const textWithoutTags = html
+    .replace(/<(?!\/?img\b)[^>]*>/gi, '')
+    .replace(/&(?:nbsp|#160|#xa0);/gi, '')
+    .trim();
+  return textWithoutTags.length === 0;
+}

package/ts/utils/tests/document.spec.ts

@@ -1,5 +1,6 @@
 import { describe, expect, test } from 'vitest';
 import { generateCommercialDocument } from '../commercialManagement/document.js';
+import { isHtmlEmpty } from '../isHtml.js';
 import { EstimateInvoiceType } from '../../types/Enum/EstimateInvoice.js';
 import { CreateInvoiceDocument } from '../../types/Interface/api/commercialManagement/Create.js';
 import { DiscountType } from '../../types/Enum/CommercialManagement.js';
@@ -118,6 +119,23 @@ describe('generateCommercialDocument', () => {
     expect(result.body).not.toContain('<p>undefined</p>');
   });
 
+  test.each(['<p><br></p>', '<p><br/></p>', '<p></p>', '<p>&nbsp;</p>', '   '])(
+    'should not render CGV or page break when cgv contains empty HTML (%s)',
+    (emptyCgv: string): void => {
+      const payload: CreateInvoiceDocument = {
+        ...payloadWithoutSellerAddress,
+        cgv: emptyCgv,
+        settings: { invoiceCgv: true },
+      };
+
+      const result = generateCommercialDocument(EstimateInvoiceType.FACTURE, payload);
+
+      expect(result.data.cgv).toBeNull();
+      expect(result.body).not.toContain('page-break-after:always;');
+      expect(result.body).not.toContain('id="WYSIWYG"');
+    },
+  );
+
   test('should calculate VAT from rounded line totals after discounts and fractional quantities', () => {
     const payload = {
       ...payloadWithoutSellerAddress,
@@ -210,3 +228,24 @@ describe('generateCommercialDocument', () => {
     expect(result.data.totalTaxIncluded).toBe(-227);
   });
 });
+
+describe('isHtmlEmpty', () => {
+  test.each([
+    [undefined, true],
+    [null, true],
+    ['', true],
+    ['   ', true],
+    ['<p><br></p>', true],
+    ['<p><br/></p>', true],
+    ['<p></p>', true],
+    ['<p>&nbsp;</p>', true],
+    ['<p>&#160;</p>', true],
+    ['<p><br></p><p><br></p>', true],
+    ['<div><p><br></p></div>', true],
+    ['<p>Conditions Générales</p>', false],
+    ['<p><img src="test.png"></p>', false],
+    ['<img src="test.png" />', false],
+  ])('isHtmlEmpty(%j) should return %s', (input, expected) => {
+    expect(isHtmlEmpty(input as string)).toBe(expected);
+  });
+});