@proconnect-gouv/proconnect.identite 7.0.0 → 8.0.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @proconnect-gouv/proconnect.identite
 
+## 8.0.0
+
+### Major Changes
+
+- [#1952](https://github.com/proconnect-gouv/proconnect-identite/pull/1952) [`969ed75`](https://github.com/proconnect-gouv/proconnect-identite/commit/969ed759bc129a2807074c50cba690cd47639bfc) Thanks [@BenoitSerrano](https://github.com/BenoitSerrano)! - - évolution du calcul du statut "administration" et ajout des statuts "collectivite territoriale", "administration d'état" et "service public administratif"
+  - renommage de la fonction `isPublicService` en `computeServicePublicInfo`
+
+### Patch Changes
+
+- Updated dependencies [[`969ed75`](https://github.com/proconnect-gouv/proconnect-identite/commit/969ed759bc129a2807074c50cba690cd47639bfc)]:
+  - @proconnect-gouv/proconnect.annuaire_entreprises@2.0.0
+
+## 7.0.1
+
+### Patch Changes
+
+- [`c7e2d88`](https://github.com/proconnect-gouv/proconnect-identite/commit/c7e2d8870de0da81999001100e39e321eaffe740) Thanks [@douglasduteil](https://github.com/douglasduteil)! - 🐛 Correction de l'import de `pg` en `import type` dans `contexts.ts` pour éviter que le barrel `types` n'embarque `pg` dans les bundles navigateur.
+
+- Updated dependencies [[`144fbc3`](https://github.com/proconnect-gouv/proconnect-identite/commit/144fbc324c404bf505b379fdbaca1a5bac85adec)]:
+  - @proconnect-gouv/proconnect.annuaire_entreprises@1.1.5
+
 ## 7.0.0
 
 ### Patch Changes

package/README.md

@@ -44,7 +44,7 @@ Stateless business logic for organization validation and PostgreSQL utilities.
 ```typescript
 import {
   isEntrepriseUnipersonnelle,
-  isPublicService,
+  computeServicePublicInfo,
 } from "@proconnect-gouv/proconnect.identite/services/organization";
 import { hashToPostgresParams } from "@proconnect-gouv/proconnect.identite/services/postgres";
 ```

package/dist/services/organization/compute-service-public-info.d.ts

@@ -0,0 +1,8 @@
+import type { Organization } from "#src/types";
+export declare const computeServicePublicInfo: ({ cached_categorie_juridique, siret, cached_etat_administratif, }: Pick<Organization, "cached_categorie_juridique" | "cached_etat_administratif" | "siret">) => {
+    isServicePublic: boolean;
+    isAdministrationEtat?: boolean;
+    isCollectivite?: boolean;
+    isServicePublicAdministratif?: boolean;
+};
+//# sourceMappingURL=compute-service-public-info.d.ts.map

package/dist/services/organization/compute-service-public-info.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compute-service-public-info.d.ts","sourceRoot":"","sources":["../../../src/services/organization/compute-service-public-info.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAO/C,eAAO,MAAM,wBAAwB,GAAI,mEAItC,IAAI,CACL,YAAY,EACZ,4BAA4B,GAAG,2BAA2B,GAAG,OAAO,CACrE,KAAG;IACF,eAAe,EAAE,OAAO,CAAC;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,4BAA4B,CAAC,EAAE,OAAO,CAAC;CAwCxC,CAAC"}

package/dist/services/organization/compute-service-public-info.js

@@ -0,0 +1,32 @@
+//
+import { ADMINISTRATION_BLACKLIST, ADMINISTRATION_WHITELIST, ADMINISTRATIONS, } from "@proconnect-gouv/proconnect.annuaire_entreprises";
+export const computeServicePublicInfo = ({ cached_categorie_juridique, siret, cached_etat_administratif, }) => {
+    // Check if nature juridique is undefined/null
+    if (!cached_categorie_juridique) {
+        return { isServicePublic: false };
+    }
+    const siren = (siret || "").substring(0, 9);
+    // Entities in the blacklist are never considered public services
+    if (ADMINISTRATION_BLACKLIST.includes(siren)) {
+        return { isServicePublic: false };
+    }
+    // Closed entities are not considered public services
+    if (cached_etat_administratif === "C") {
+        return { isServicePublic: false };
+    }
+    // Check if entity is in whitelist (takes priority)
+    if (ADMINISTRATION_WHITELIST.includes(siren)) {
+        return { isServicePublic: true };
+    }
+    const ADMINISTRATION = ADMINISTRATIONS.find((ADMINISTRATION) => cached_categorie_juridique === `${ADMINISTRATION.codeJuridique}`);
+    if (!ADMINISTRATION) {
+        return { isServicePublic: false };
+    }
+    const { isAdministrationEtat, isCollectivite, isServicePublicAdministratif } = ADMINISTRATION;
+    return {
+        isServicePublic: true,
+        isAdministrationEtat,
+        isCollectivite,
+        isServicePublicAdministratif,
+    };
+};

package/dist/services/organization/index.d.ts

@@ -1,6 +1,6 @@
+export * from "./compute-service-public-info.js";
 export * from "./is-domain-allowed-for-organization.js";
 export * from "./is-entreprise-unipersonnelle.js";
 export * from "./is-organization-covered-by-certification-dirigeant.js";
-export * from "./is-public-service.js";
 export * from "./is-small-etablissement-public.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/services/organization/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/organization/index.ts"],"names":[],"mappings":"AAEA,cAAc,yCAAyC,CAAC;AACxD,cAAc,mCAAmC,CAAC;AAClD,cAAc,yDAAyD,CAAC;AACxE,cAAc,wBAAwB,CAAC;AACvC,cAAc,oCAAoC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/organization/index.ts"],"names":[],"mappings":"AAEA,cAAc,kCAAkC,CAAC;AACjD,cAAc,yCAAyC,CAAC;AACxD,cAAc,mCAAmC,CAAC;AAClD,cAAc,yDAAyD,CAAC;AACxE,cAAc,oCAAoC,CAAC"}

package/dist/services/organization/index.js

@@ -1,6 +1,6 @@
 //
+export * from "./compute-service-public-info.js";
 export * from "./is-domain-allowed-for-organization.js";
 export * from "./is-entreprise-unipersonnelle.js";
 export * from "./is-organization-covered-by-certification-dirigeant.js";
-export * from "./is-public-service.js";
 export * from "./is-small-etablissement-public.js";

package/dist/types/contexts.d.ts

@@ -1,4 +1,4 @@
-import Pg from "pg";
+import type Pg from "pg";
 export type DatabaseContext = {
     pg: Pg.Pool;
 };

package/dist/types/contexts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contexts.d.ts","sourceRoot":"","sources":["../../src/types/contexts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,IAAI,CAAC;AAIpB,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;CACb,CAAC"}
+{"version":3,"file":"contexts.d.ts","sourceRoot":"","sources":["../../src/types/contexts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAIzB,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;CACb,CAAC"}

package/dist/types/contexts.js

@@ -1,2 +1,2 @@
 //
-import Pg from "pg";
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proconnect-gouv/proconnect.identite",
-  "version": "7.0.0",
+  "version": "8.0.0",
   "homepage": "https://github.com/proconnect-gouv/proconnect-identite/tree/main/packages/identite#readme",
   "bugs": "https://github.com/proconnect-gouv/proconnect-identite/issues",
   "repository": {
@@ -51,7 +51,7 @@
   },
   "devDependencies": {
     "@electric-sql/pglite": "^0.3.12",
-    "@proconnect-gouv/proconnect.annuaire_entreprises": "^1.1.4",
+    "@proconnect-gouv/proconnect.annuaire_entreprises": "^2.0.0",
     "@proconnect-gouv/proconnect.api_entreprise": "^2.2.0",
     "@proconnect-gouv/proconnect.core": "^1.0.0",
     "@proconnect-gouv/proconnect.devtools.typescript": "1.0.0",
@@ -65,7 +65,7 @@
     "tsx": "^4.20.3"
   },
   "peerDependencies": {
-    "@proconnect-gouv/proconnect.annuaire_entreprises": "^1.1.4",
+    "@proconnect-gouv/proconnect.annuaire_entreprises": "^2.0.0",
     "@proconnect-gouv/proconnect.api_entreprise": "^2.2.0",
     "@proconnect-gouv/proconnect.core": "^1.0.0",
     "@proconnect-gouv/proconnect.insee": "^2.0.0",

package/src/services/organization/{is-public-service.test.ts → compute-service-public-info.test.ts}

@@ -9,47 +9,51 @@ import {
   lamalou_org_info,
   onf_org_info,
   trackdechets_public_org_info,
-  whitelisted_org_info,
 } from "#testing/seed/organizations";
 import assert from "node:assert/strict";
 import { describe, it } from "node:test";
-import { isPublicService } from "./is-public-service.js";
+import { computeServicePublicInfo } from "./compute-service-public-info.js";
 
-describe("isPublicService", () => {
+describe("computeServicePublicInfo", () => {
   it("should return false for bad call", () => {
-    assert.equal(isPublicService({} as Organization), false);
+    const result = computeServicePublicInfo({} as Organization);
+    assert.equal(result.isServicePublic, false);
   });
 
   it("should return true for collectivite territoriale", () => {
-    assert.equal(isPublicService(lamalou_org_info), true);
+    const result = computeServicePublicInfo(lamalou_org_info);
+    assert.equal(result.isServicePublic, true);
   });
 
   it("should return true for administration centrale", () => {
-    assert.equal(isPublicService(dinum_org_info), true);
+    const result = computeServicePublicInfo(dinum_org_info);
+    assert.equal(result.isServicePublic, true);
+    assert.equal(result.isAdministrationEtat, true);
   });
 
   it("should return false for unipersonnelle organization", () => {
-    assert.equal(isPublicService(entreprise_unipersonnelle_org_info), false);
+    const result = computeServicePublicInfo(entreprise_unipersonnelle_org_info);
+    assert.equal(result.isServicePublic, false);
   });
 
   it("should return false for association", () => {
-    assert.equal(isPublicService(association_org_info), false);
+    const result = computeServicePublicInfo(association_org_info);
+    assert.equal(result.isServicePublic, false);
   });
 
   it("should return true for établissement public à caractère industriel et commercial", () => {
-    assert.equal(isPublicService(onf_org_info), true);
+    const result = computeServicePublicInfo(onf_org_info);
+    assert.equal(result.isServicePublic, true);
   });
 
   it.skip("should return true for whitelisted établissement (BIP)", () => {
-    assert.equal(isPublicService(bpifrance_org_info), true);
-  });
-
-  it("should return true for whitelisted établissement", () => {
-    assert.equal(isPublicService(whitelisted_org_info), true);
+    const result = computeServicePublicInfo(bpifrance_org_info);
+    assert.equal(result.isServicePublic, true);
   });
 
   it("should return true for public etablissement", () => {
-    assert.equal(isPublicService(trackdechets_public_org_info), true);
+    const result = computeServicePublicInfo(trackdechets_public_org_info);
+    assert.equal(result.isServicePublic, true);
   });
 
   it("should return false for blacklisted SIREN", () => {
@@ -58,7 +62,8 @@ describe("isPublicService", () => {
       cached_categorie_juridique: "7120",
       cached_etat_administratif: "A",
     } as Organization;
-    assert.equal(isPublicService(blacklisted_org), false);
+    const result = computeServicePublicInfo(blacklisted_org);
+    assert.equal(result.isServicePublic, false);
   });
 
   it("should return false for closed entities", () => {
@@ -67,7 +72,8 @@ describe("isPublicService", () => {
       cached_categorie_juridique: "7120",
       cached_etat_administratif: "C",
     } as Organization;
-    assert.equal(isPublicService(closed_org), false);
+    const result = computeServicePublicInfo(closed_org);
+    assert.equal(result.isServicePublic, false);
   });
 
   it("should return true for entities with exact nature juridique codes", () => {
@@ -76,16 +82,8 @@ describe("isPublicService", () => {
       cached_categorie_juridique: "7111",
       cached_etat_administratif: "A",
     } as Organization;
-    assert.equal(isPublicService(exact_nature_org), true);
-  });
-
-  it("should return true for whitelisted SIREN even with non-public nature juridique", () => {
-    const whitelisted_siren_org = {
-      siret: "33465403500123",
-      cached_categorie_juridique: "5599", // Non-public nature juridique
-      cached_etat_administratif: "A",
-    } as Organization;
-    assert.equal(isPublicService(whitelisted_siren_org), true);
+    const result = computeServicePublicInfo(exact_nature_org);
+    assert.equal(result.isServicePublic, true);
   });
 
   it("should return true for CARSAT BRETAGNE (annuaire-entreprises whitelist)", () => {
@@ -94,6 +92,7 @@ describe("isPublicService", () => {
       cached_categorie_juridique: "8110", // Régime général de la Sécurité Sociale
       cached_etat_administratif: "A",
     } as Organization;
-    assert.equal(isPublicService(carsat_bretagne_org), true);
+    const result = computeServicePublicInfo(carsat_bretagne_org);
+    assert.equal(result.isServicePublic, true);
   });
 });

package/src/services/organization/compute-service-public-info.ts

@@ -0,0 +1,61 @@
+//
+
+import type { Organization } from "#src/types";
+import {
+  ADMINISTRATION_BLACKLIST,
+  ADMINISTRATION_WHITELIST,
+  ADMINISTRATIONS,
+} from "@proconnect-gouv/proconnect.annuaire_entreprises";
+
+export const computeServicePublicInfo = ({
+  cached_categorie_juridique,
+  siret,
+  cached_etat_administratif,
+}: Pick<
+  Organization,
+  "cached_categorie_juridique" | "cached_etat_administratif" | "siret"
+>): {
+  isServicePublic: boolean;
+  isAdministrationEtat?: boolean;
+  isCollectivite?: boolean;
+  isServicePublicAdministratif?: boolean;
+} => {
+  // Check if nature juridique is undefined/null
+  if (!cached_categorie_juridique) {
+    return { isServicePublic: false };
+  }
+
+  const siren = (siret || "").substring(0, 9);
+
+  // Entities in the blacklist are never considered public services
+  if (ADMINISTRATION_BLACKLIST.includes(siren)) {
+    return { isServicePublic: false };
+  }
+
+  // Closed entities are not considered public services
+  if (cached_etat_administratif === "C") {
+    return { isServicePublic: false };
+  }
+
+  // Check if entity is in whitelist (takes priority)
+  if (ADMINISTRATION_WHITELIST.includes(siren)) {
+    return { isServicePublic: true };
+  }
+
+  const ADMINISTRATION = ADMINISTRATIONS.find(
+    (ADMINISTRATION) =>
+      cached_categorie_juridique === `${ADMINISTRATION.codeJuridique}`,
+  );
+  if (!ADMINISTRATION) {
+    return { isServicePublic: false };
+  }
+  const { isAdministrationEtat, isCollectivite, isServicePublicAdministratif } =
+    ADMINISTRATION;
+
+  return {
+    isServicePublic: true,
+    isAdministrationEtat,
+    isCollectivite,
+    isServicePublicAdministratif,
+  };
+};

package/src/services/organization/index.ts

@@ -1,7 +1,7 @@
 //
 
+export * from "./compute-service-public-info.js";
 export * from "./is-domain-allowed-for-organization.js";
 export * from "./is-entreprise-unipersonnelle.js";
 export * from "./is-organization-covered-by-certification-dirigeant.js";
-export * from "./is-public-service.js";
 export * from "./is-small-etablissement-public.js";

package/src/types/contexts.ts

@@ -1,6 +1,6 @@
 //
 
-import Pg from "pg";
+import type Pg from "pg";
 
 //