@proconnect-gouv/proconnect.identite 1.0.0 → 1.2.0

package/src/repositories/organization/upsert.ts

@@ -12,29 +12,31 @@ import type { QueryResult } from "pg";
 export function upsertFactory({ pg }: DatabaseContext) {
   return async function upsert({
     siret,
-    organizationInfo: {
-      libelle: cached_libelle,
-      nomComplet: cached_nom_complet,
-      enseigne: cached_enseigne,
-      trancheEffectifs: cached_tranche_effectifs,
-      trancheEffectifsUniteLegale: cached_tranche_effectifs_unite_legale,
-      libelleTrancheEffectif: cached_libelle_tranche_effectif,
-      etatAdministratif: cached_etat_administratif,
-      estActive: cached_est_active,
-      statutDiffusion: cached_statut_diffusion,
-      estDiffusible: cached_est_diffusible,
-      adresse: cached_adresse,
-      codePostal: cached_code_postal,
-      codeOfficielGeographique: cached_code_officiel_geographique,
-      activitePrincipale: cached_activite_principale,
-      libelleActivitePrincipale: cached_libelle_activite_principale,
-      categorieJuridique: cached_categorie_juridique,
-      libelleCategorieJuridique: cached_libelle_categorie_juridique,
-    },
+    organizationInfo,
   }: {
     siret: string;
     organizationInfo: OrganizationInfo;
   }) {
+    const {
+      cached_libelle,
+      cached_nom_complet,
+      cached_enseigne,
+      cached_tranche_effectifs,
+      cached_tranche_effectifs_unite_legale,
+      cached_libelle_tranche_effectif,
+      cached_etat_administratif,
+      cached_est_active,
+      cached_statut_diffusion,
+      cached_est_diffusible,
+      cached_adresse,
+      cached_code_postal,
+      cached_code_officiel_geographique,
+      cached_activite_principale,
+      cached_libelle_activite_principale,
+      cached_categorie_juridique,
+      cached_libelle_categorie_juridique,
+    } = toPartialOrganization(organizationInfo);
+
     const { rows }: QueryResult<Organization> = await pg.query(
       `
     INSERT INTO organizations
@@ -140,3 +142,51 @@ export function upsertFactory({ pg }: DatabaseContext) {
 }
 
 export type UpsertHandler = ReturnType<typeof upsertFactory>;
+
+//
+
+function toPartialOrganization(organization_info: OrganizationInfo) {
+  const {
+    activitePrincipale: cached_activite_principale,
+    adresse: cached_adresse,
+    categorieJuridique: cached_categorie_juridique,
+    codeOfficielGeographique: cached_code_officiel_geographique,
+    codePostal: cached_code_postal,
+    enseigne: cached_enseigne,
+    estActive: cached_est_active,
+    estDiffusible: cached_est_diffusible,
+    etatAdministratif: cached_etat_administratif,
+    libelle: cached_libelle,
+    libelleActivitePrincipale: cached_libelle_activite_principale,
+    libelleCategorieJuridique: cached_libelle_categorie_juridique,
+    libelleTrancheEffectif: cached_libelle_tranche_effectif,
+    nomComplet: cached_nom_complet,
+    siret,
+    statutDiffusion: cached_statut_diffusion,
+    trancheEffectifs: cached_tranche_effectifs,
+    trancheEffectifsUniteLegale: cached_tranche_effectifs_unite_legale,
+  } = organization_info;
+  return {
+    cached_activite_principale,
+    cached_adresse,
+    cached_categorie_juridique,
+    cached_code_officiel_geographique,
+    cached_code_postal,
+    cached_enseigne,
+    cached_est_active,
+    cached_est_diffusible,
+    cached_etat_administratif,
+    cached_libelle_activite_principale,
+    cached_libelle_categorie_juridique,
+    cached_libelle_tranche_effectif,
+    cached_libelle,
+    cached_nom_complet,
+    cached_statut_diffusion,
+    cached_tranche_effectifs_unite_legale,
+    cached_tranche_effectifs,
+    siret,
+  } satisfies Omit<
+    Organization,
+    "created_at" | "id" | "updated_at" | "organization_info_fetched_at"
+  >;
+}

package/src/repositories/user/find-by-email.test.ts

@@ -31,7 +31,7 @@ suite("findByEmailFactory", () => {
       email: "lion.eljonson@darkangels.world",
       email_verified: false,
       email_verified_at: null,
-      encrypted_password: "",
+      encrypted_password: null,
       encrypted_totp_key: null,
       family_name: "el'jonson",
       force_2fa: false,

package/src/repositories/user/find-by-id.test.ts

@@ -33,7 +33,7 @@ suite("findByIdFactory", () => {
       email: "lion.eljonson@darkangels.world",
       email_verified: false,
       email_verified_at: null,
-      encrypted_password: "",
+      encrypted_password: null,
       encrypted_totp_key: null,
       family_name: "el'jonson",
       force_2fa: false,

package/src/repositories/user/get-by-id.test.ts

@@ -34,7 +34,7 @@ suite("getByIdFactory", () => {
       email: "lion.eljonson@darkangels.world",
       email_verified: false,
       email_verified_at: null,
-      encrypted_password: "",
+      encrypted_password: null,
       encrypted_totp_key: null,
       family_name: "el'jonson",
       force_2fa: false,

package/src/repositories/user/get-franceconnect-user-info.test.ts

@@ -37,6 +37,7 @@ describe("getFranceConnectUserInfo", () => {
     const user = await getFranceConnectUserInfo(1);
     assert.ok(user);
     assert.deepEqual(user, {
+      birthcountry: null,
       birthdate: new Date("8888-08-08"),
       birthplace: "Caliban",
       created_at: new Date("4444-04-04"),

package/src/repositories/user/upsert-franceconnect-userinfo.test.ts

@@ -41,6 +41,7 @@ describe("upsertFranceconnectUserinfo", () => {
     });
 
     assert.deepEqual(user, {
+      birthcountry: null,
       birthdate: new Date("8888-08-08"),
       birthplace: "Caliban",
       created_at: new Date("4444-04-01"),
@@ -76,6 +77,7 @@ describe("upsertFranceconnectUserinfo", () => {
     });
 
     assert.deepEqual(user, {
+      birthcountry: null,
       birthdate: null,
       birthplace: null,
       created_at: new Date("4444-04-01"),

package/src/services/organization/index.ts

@@ -2,3 +2,5 @@
 
 export * from "./is-domain-allowed-for-organization.js";
 export * from "./is-entreprise-unipersonnelle.js";
+export * from "./is-public-service.js";
+export * from "./is-syndicat-communal.js";

package/src/services/organization/is-public-service.test.ts

@@ -0,0 +1,99 @@
+//
+
+import type { Organization } from "#src/types";
+import {
+  association_org_info,
+  bpifrance_org_info,
+  dinum_org_info,
+  entreprise_unipersonnelle_org_info,
+  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";
+
+describe("isPublicService", () => {
+  it("should return false for bad call", () => {
+    assert.equal(isPublicService({} as Organization), false);
+  });
+
+  it("should return true for collectivite territoriale", () => {
+    assert.equal(isPublicService(lamalou_org_info), true);
+  });
+
+  it("should return true for administration centrale", () => {
+    assert.equal(isPublicService(dinum_org_info), true);
+  });
+
+  it("should return false for unipersonnelle organization", () => {
+    assert.equal(isPublicService(entreprise_unipersonnelle_org_info), false);
+  });
+
+  it("should return false for association", () => {
+    assert.equal(isPublicService(association_org_info), false);
+  });
+
+  it("should return true for établissement public à caractère industriel et commercial", () => {
+    assert.equal(isPublicService(onf_org_info), 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);
+  });
+
+  it("should return true for public etablissement", () => {
+    assert.equal(isPublicService(trackdechets_public_org_info), true);
+  });
+
+  it("should return false for blacklisted SIREN", () => {
+    const blacklisted_org = {
+      siret: "34867901000123",
+      cached_categorie_juridique: "7120",
+      cached_etat_administratif: "A",
+    } as Organization;
+    assert.equal(isPublicService(blacklisted_org), false);
+  });
+
+  it("should return false for closed entities", () => {
+    const closed_org = {
+      siret: "12345678900123",
+      cached_categorie_juridique: "7120",
+      cached_etat_administratif: "C",
+    } as Organization;
+    assert.equal(isPublicService(closed_org), false);
+  });
+
+  it("should return true for entities with exact nature juridique codes", () => {
+    const exact_nature_org = {
+      siret: "12345678900123",
+      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: "13003013300123",
+      cached_categorie_juridique: "5599", // Non-public nature juridique
+      cached_etat_administratif: "A",
+    } as Organization;
+    assert.equal(isPublicService(whitelisted_siren_org), true);
+  });
+
+  it("should return true for CARSAT BRETAGNE (annuaire-entreprises whitelist)", () => {
+    const carsat_bretagne_org = {
+      siret: "77774932600123",
+      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);
+  });
+});

package/src/services/organization/is-public-service.ts

@@ -0,0 +1,35 @@
+//
+
+import {
+  NATURE_JURIDIQUE_SERVICE_PUBLIC,
+  SERVICE_PUBLIC_BLACKLIST,
+  SERVICE_PUBLIC_WHITELIST,
+} from "@proconnect-gouv/proconnect.annuaire_entreprises";
+import type { Organization } from "@proconnect-gouv/proconnect.identite/types";
+
+// inspired from https://github.com/annuaire-entreprises-data-gouv-fr/search-infra/blob/f1e56ac476b0b1730115f7b1f0667e8509ee5379/workflows/data_pipelines/elasticsearch/data_enrichment.py#L155-L189
+export const isPublicService = ({
+  cached_categorie_juridique,
+  cached_etat_administratif,
+  siret,
+}: Organization): boolean => {
+  const siren = (siret || "").substring(0, 9);
+
+  // Entities in the blacklist are never considered public services
+  if (SERVICE_PUBLIC_BLACKLIST.includes(siren)) {
+    return false;
+  }
+
+  // Closed entities are not considered public services
+  if (cached_etat_administratif === "C") {
+    return false;
+  }
+
+  // Check if entity is in whitelist or has a public service legal nature code
+  const cat_jur_ok =
+    cached_categorie_juridique &&
+    NATURE_JURIDIQUE_SERVICE_PUBLIC.includes(cached_categorie_juridique);
+  const whitelist_ok = SERVICE_PUBLIC_WHITELIST.includes(siren);
+
+  return cat_jur_ok || whitelist_ok;
+};

package/src/services/organization/is-syndicat-communal.test.ts

@@ -0,0 +1,31 @@
+import type { Organization } from "#src/types";
+import assert from "node:assert";
+import { describe, it } from "node:test";
+import { isSyndicatCommunal } from "./is-syndicat-communal.js";
+
+describe("isSyndicatCommunal", () => {
+  it("should return false when cached_libelle_categorie_juridique is undefined", () => {
+    const org = {} as Organization;
+    assert.equal(isSyndicatCommunal(org), false);
+  });
+
+  it("should return false when cached_libelle_categorie_juridique is null", () => {
+    const org = { cached_activite_principale: null } as Organization;
+    assert.equal(isSyndicatCommunal(org), false);
+  });
+
+  it("should return false for a categorie juridique not in the list", () => {
+    const org = {
+      cached_libelle_categorie_juridique:
+        "cette catégorie juridique n'existe pas",
+    } as Organization;
+    assert.equal(isSyndicatCommunal(org), false);
+  });
+
+  it("should return true for categorie juridique 'Syndicat mixte fermé' ", () => {
+    const org = {
+      cached_libelle_categorie_juridique: "Syndicat mixte fermé",
+    } as Organization;
+    assert.equal(isSyndicatCommunal(org), true);
+  });
+});

package/src/services/organization/is-syndicat-communal.ts

@@ -0,0 +1,18 @@
+import type { Organization } from "#src/types";
+
+const cat_jur = [
+  "Centre communal d'action sociale",
+  "Établissement public local social et médico-social",
+  "Syndicat intercommunal à vocation multiple (SIVOM)",
+  "Syndicat intercommunal à vocation unique (SIVU)",
+  "Syndicat mixte fermé",
+];
+
+export const isSyndicatCommunal = ({
+  cached_libelle_categorie_juridique,
+}: Pick<Organization, "cached_libelle_categorie_juridique">): boolean => {
+  if (!cached_libelle_categorie_juridique) {
+    return false;
+  }
+  return cat_jur.includes(cached_libelle_categorie_juridique);
+};

package/src/types/dirigeant.ts

@@ -5,9 +5,12 @@ import { z } from "zod";
 //
 
 export const IdentityVectorSchema = z.object({
+  birthcountry: z.string().nullable(),
   birthdate: z.date().nullable(),
   birthplace: z.string().nullable(),
   family_name: z.string().nullable(),
+  gender: z.enum(["male", "female"]).nullable(),
   given_name: z.string().nullable(),
 });
+
 export type IdentityVector = z.output<typeof IdentityVectorSchema>;

package/src/types/franceconnect.ts

@@ -8,6 +8,7 @@ import { z } from "zod";
  * @see https://docs.partenaires.franceconnect.gouv.fr/fs/fs-technique/fs-technique-scope-fc/#liste-des-claims
  */
 export const FranceConnectUserInfoResponseSchema = z.object({
+  birthcountry: z.string(),
   birthdate: z.coerce.date(),
   birthplace: z.string(),
   family_name: z.string(),

package/src/types/organization-info.ts

@@ -1,5 +1,5 @@
 //
-import type { TrancheEffectifs } from "@proconnect-gouv/proconnect.entreprise/types";
+import type { TrancheEffectifs } from "@proconnect-gouv/proconnect.api_entreprise/types";
 import { z } from "zod";
 
 //

package/src/types/organization.ts

@@ -1,6 +1,6 @@
 //
 
-import type { TrancheEffectifs } from "@proconnect-gouv/proconnect.entreprise/types";
+import type { TrancheEffectifs } from "@proconnect-gouv/proconnect.api_entreprise/types";
 
 //
 
@@ -16,9 +16,9 @@ export interface Organization {
   cached_tranche_effectifs_unite_legale: string | null;
   cached_libelle_tranche_effectif: string | null;
   cached_etat_administratif: string | null;
-  cached_est_active: string | null;
+  cached_est_active: boolean | null;
   cached_statut_diffusion: string | null;
-  cached_est_diffusible: string | null;
+  cached_est_diffusible: boolean | null;
   cached_adresse: string | null;
   cached_code_postal: string | null;
   cached_code_officiel_geographique: string | null;

package/testing/seed/franceconnect/index.ts

@@ -1,21 +1,23 @@
 import type { FranceConnectUserInfo } from "#src/types";
 
 export const LiElJonsonFranceConnectUserInfo: FranceConnectUserInfo = {
-  birthdate: new Date(29000, 10, 7),
-  birthplace: "Caliban",
+  birthcountry: "99100",
+  birthdate: new Date(Date.UTC(28500, 1, 5)),
+  birthplace: "75056",
   created_at: new Date("4444-04-04"),
-  family_name: "El’Jonson",
+  family_name: "EL'JONSON",
   gender: "male",
-  given_name: "Li",
-  preferred_username: "Li",
+  given_name: "LION",
+  preferred_username: "Lion",
   sub: "abcdefghijklmnopqrstuvwxyz",
   updated_at: new Date("4444-04-05"),
   user_id: NaN,
 };
 
 export const BelisariusCawlFranceConnectUserInfo: FranceConnectUserInfo = {
-  birthdate: new Date(28500, 1, 5),
-  birthplace: "MARS",
+  birthcountry: "99100",
+  birthdate: new Date(Date.UTC(28500, 1, 5)),
+  birthplace: "13055",
   created_at: new Date("2023-04-10"),
   family_name: "CAWL",
   gender: "male",
@@ -27,8 +29,9 @@ export const BelisariusCawlFranceConnectUserInfo: FranceConnectUserInfo = {
 };
 
 export const RogalDornFranceConnectUserInfo: FranceConnectUserInfo = {
-  birthdate: new Date(29000, 0, 7),
-  birthplace: "INWIT",
+  birthcountry: "99102",
+  birthdate: new Date(Date.UTC(29000, 0, 7)),
+  birthplace: "",
   created_at: new Date("2023-04-10"),
   family_name: "DORN",
   gender: "male",

package/testing/seed/organizations/index.ts

@@ -39,3 +39,111 @@ export const entreprise_unipersonnelle_org_info = {
   cached_categorie_juridique: "1000",
   cached_libelle_categorie_juridique: "Entrepreneur individuel",
 } as Organization;
+
+export const lamalou_org_info = {
+  siret: "21340126800130",
+  cached_tranche_effectifs: "12",
+  cached_tranche_effectifs_unite_legale: "21",
+  cached_libelle_tranche_effectif: "20 à 49 salariés, en 2020",
+  cached_activite_principale: "84.11Z",
+  cached_libelle_activite_principale:
+    "84.11Z - Administration publique générale",
+  cached_categorie_juridique: "7210",
+  cached_libelle_categorie_juridique: "Commune et commune nouvelle",
+} as Organization;
+
+export const dinum_org_info = {
+  siret: "13002526500013",
+  cached_tranche_effectifs: "22",
+  cached_tranche_effectifs_unite_legale: "22",
+  cached_libelle_tranche_effectif: "100 à 199 salariés, en 2020",
+  cached_activite_principale: "84.11Z",
+  cached_libelle_activite_principale:
+    "84.11Z - Administration publique générale",
+  cached_categorie_juridique: "7120",
+  cached_libelle_categorie_juridique: "Service central d'un ministère",
+} as Organization;
+
+export const onf_org_info = {
+  siret: "66204311604119",
+  cached_tranche_effectifs: null,
+  cached_tranche_effectifs_unite_legale: "52",
+  cached_libelle_tranche_effectif: null,
+  cached_activite_principale: "02.40Z",
+  cached_libelle_activite_principale:
+    "02.40Z - Services de soutien à l'exploitation forestière",
+  cached_categorie_juridique: "4110",
+  cached_libelle_categorie_juridique:
+    "Établissement public national à caractère industriel ou commercial doté d'un comptable public",
+} as Organization;
+
+export const bpifrance_org_info = {
+  siret: "32025248901075",
+  cached_tranche_effectifs: "42",
+  cached_tranche_effectifs_unite_legale: "51",
+  cached_libelle_tranche_effectif: "1 000 à 1 999 salariés, en 2021",
+  cached_activite_principale: "64.92Z",
+  cached_libelle_activite_principale: "64.92Z - Autre distribution de crédit",
+  cached_categorie_juridique: "5599",
+  cached_libelle_categorie_juridique: "SA à conseil d'administration (s.a.i.)",
+} as Organization;
+
+export const whitelisted_org_info = {
+  siret: "18000001000017",
+  cached_tranche_effectifs: "22",
+  cached_tranche_effectifs_unite_legale: "32",
+  cached_libelle_tranche_effectif: "100 à 199 salariés, en 2022",
+  cached_activite_principale: "84.11Z",
+  cached_libelle_activite_principale:
+    "84.11Z - Administration publique générale",
+  cached_categorie_juridique: "7490",
+  cached_libelle_categorie_juridique:
+    "Autre personne morale de droit administratif",
+} as Organization;
+
+export const trackdechets_public_org_info = {
+  siret: "25680169700010",
+  cached_tranche_effectifs: "NN",
+  cached_tranche_effectifs_unite_legale: "NN",
+  cached_libelle_tranche_effectif:
+    "Unité non employeuse (pas de salarié au cours de l'année de référence et pas d'effectif au 31/12)",
+  cached_activite_principale: "38.21Z",
+  cached_libelle_activite_principale:
+    "38.21Z - Traitement et élimination des déchets non dangereux",
+  cached_categorie_juridique: "7354",
+  cached_libelle_categorie_juridique: "Syndicat mixte fermé",
+} as Organization;
+
+export const rogal_dorn_org_info = {
+  siret: "94957325700019",
+  cached_tranche_effectifs: null,
+  cached_tranche_effectifs_unite_legale: null,
+  cached_libelle_tranche_effectif: "",
+  cached_activite_principale: "62.02A",
+  cached_libelle_activite_principale:
+    "62.02A - Conseil en systèmes et logiciels informatiques",
+  cached_categorie_juridique: "1000",
+  cached_libelle_categorie_juridique: "Entrepreneur individuel",
+} as Organization;
+
+export const papillon_org_info = {
+  cached_activite_principale: "47.59A",
+  cached_adresse:
+    "5-7, 5 rue du moulin aux moines, 72650 La chapelle-saint-aubin",
+  cached_categorie_juridique: "5710",
+  cached_code_officiel_geographique: "72065",
+  cached_code_postal: "72650",
+  cached_enseigne: "",
+  cached_est_active: true,
+  cached_est_diffusible: true,
+  cached_etat_administratif: "A",
+  cached_libelle_activite_principale: "47.59A - Commerce de détail de meubles",
+  cached_libelle_categorie_juridique: "SAS, société par actions simplifiée",
+  cached_libelle_tranche_effectif: "3 à 5 salariés, en 2022",
+  cached_libelle: "Papillon",
+  cached_nom_complet: "Papillon",
+  cached_statut_diffusion: "diffusible",
+  cached_tranche_effectifs_unite_legale: "11",
+  cached_tranche_effectifs: "02",
+  siret: "39234600300198",
+} as Organization;

package/tsconfig.json

@@ -1,14 +1,18 @@
 {
   "compilerOptions": {
-    "baseUrl": "./src",
     "declaration": true,
     "declarationMap": true,
     "outDir": "./dist",
     "resolveJsonModule": true,
-    "types": ["node"]
+    "types": ["node"],
+    "paths": {
+      "#src/*": ["./src/*/index.ts"],
+      "#testing/*": ["./testing/*/index.ts"]
+    }
   },
   "extends": "@proconnect-gouv/proconnect.devtools.typescript/base/tsconfig.json",
   "references": [
+    { "path": "../annuaire_entreprises/tsconfig.lib.json" },
     { "path": "../core/tsconfig.lib.json" },
     { "path": "../entreprise/tsconfig.lib.json" },
     { "path": "../insee/tsconfig.lib.json" }