@proconnect-gouv/proconnect.identite 1.2.0 → 1.3.0

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

@@ -81,7 +81,7 @@ describe("isPublicService", () => {
 
   it("should return true for whitelisted SIREN even with non-public nature juridique", () => {
     const whitelisted_siren_org = {
-      siret: "13003013300123",
+      siret: "33465403500123",
       cached_categorie_juridique: "5599", // Non-public nature juridique
       cached_etat_administratif: "A",
     } as Organization;

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

@@ -7,12 +7,17 @@ import {
 } 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
+// inspired from https://github.com/annuaire-entreprises-data-gouv-fr/search-infra/blob/4ec29b1ef3370e0f840bd55dd6d38a4811faf18d/workflows/data_pipelines/elasticsearch/data_enrichment.py#L169-L209
 export const isPublicService = ({
   cached_categorie_juridique,
   cached_etat_administratif,
   siret,
 }: Organization): boolean => {
+  // Check if nature juridique is undefined/null
+  if (!cached_categorie_juridique) {
+    return false;
+  }
+
   const siren = (siret || "").substring(0, 9);
 
   // Entities in the blacklist are never considered public services
@@ -25,11 +30,19 @@ export const isPublicService = ({
     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);
+  // Check if entity is in whitelist (takes priority)
+  if (SERVICE_PUBLIC_WHITELIST.includes(siren)) {
+    return true;
+  }
+
+  // Legal nature codes starting with 4 or 7 are public services
+  if (
+    cached_categorie_juridique.startsWith("4") ||
+    cached_categorie_juridique.startsWith("7")
+  ) {
+    return true;
+  }
 
-  return cat_jur_ok || whitelist_ok;
+  // Check if entity has a specific public service legal nature code
+  return NATURE_JURIDIQUE_SERVICE_PUBLIC.includes(cached_categorie_juridique);
 };

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

@@ -3,6 +3,7 @@ import type { Organization } from "#src/types";
 const cat_jur = [
   "Centre communal d'action sociale",
   "Établissement public local social et médico-social",
+  "Groupement de coopération sanitaire à gestion publique",
   "Syndicat intercommunal à vocation multiple (SIVOM)",
   "Syndicat intercommunal à vocation unique (SIVU)",
   "Syndicat mixte fermé",

package/src/types/franceconnect.ts

@@ -26,13 +26,12 @@ export type FranceConnectUserInfoResponse = z.output<
 //
 
 export const FranceConnectUserInfoSchema =
-  FranceConnectUserInfoResponseSchema.merge(
-    z.object({
-      created_at: z.coerce.date(),
-      updated_at: z.coerce.date(),
-      user_id: z.number(),
-    }),
-  );
+  FranceConnectUserInfoResponseSchema.extend({
+    created_at: z.coerce.date(),
+    updated_at: z.coerce.date(),
+    user_id: z.number(),
+  });
+
 export type FranceConnectUserInfo = z.output<
   typeof FranceConnectUserInfoSchema
 >;

package/src/types/{dirigeant.ts → identity-vector.ts}

@@ -14,3 +14,12 @@ export const IdentityVectorSchema = z.object({
 });
 
 export type IdentityVector = z.output<typeof IdentityVectorSchema>;
+
+export const NullIdentityVector: IdentityVector = IdentityVectorSchema.parse({
+  birthcountry: null,
+  birthdate: null,
+  birthplace: null,
+  family_name: null,
+  gender: null,
+  given_name: null,
+});

package/src/types/index.ts

@@ -2,9 +2,9 @@
 
 export * from "./claims.js";
 export * from "./contexts.js";
-export * from "./dirigeant.js";
 export * from "./email-domain.js";
 export * from "./franceconnect.js";
+export * from "./identity-vector.js";
 export * from "./organization-info.js";
 export * from "./organization.js";
 export * from "./user-organization-link.js";

package/src/types/organization-info.ts

@@ -19,6 +19,7 @@ export const OrganizationInfoSchema = z.object({
   libelleCategorieJuridique: z.string(),
   libelleTrancheEffectif: z.string(),
   nomComplet: z.string(),
+  siegeSocial: z.boolean(),
   siret: z.string(),
   statutDiffusion: z.enum([
     "diffusible",

package/src/types/organization.ts

@@ -26,5 +26,6 @@ export interface Organization {
   cached_libelle_activite_principale: string | null;
   cached_categorie_juridique: string | null;
   cached_libelle_categorie_juridique: string | null;
+  cached_siege_social: boolean | null;
   organization_info_fetched_at: Date | null;
 }

package/src/types/user-organization-link.ts

@@ -1,31 +1,37 @@
 import { z } from "zod";
 
-export const UserOrganizationLinkVerificationTypeSchema = z.enum([
+export const WeakLinkTypes = [
   "code_sent_to_official_contact_email",
   "domain",
   "imported_from_coop_mediation_numerique",
   "imported_from_inclusion_connect",
   "in_liste_dirigeants_rna",
   "in_liste_dirigeants_rne",
-  "no_validation_means_available",
-  "no_verification_means_for_entreprise_unipersonnelle",
-  "no_verification_means_for_small_association",
   "official_contact_email",
-  "organization_dirigeant",
   "proof_received",
   // Used in the sandbox environment to bypass the verification process
   "bypassed",
-]);
+] as const;
 
-export type UserOrganizationLinkVerificationType = z.output<
-  typeof UserOrganizationLinkVerificationTypeSchema
->;
+export const StrongLinkTypes = ["organization_dirigeant"] as const;
 
-//
+export const VerifiedLinkTypes = [
+  ...WeakLinkTypes,
+  ...StrongLinkTypes,
+] as const;
+
+export const UnverifiedLinkTypes = [
+  "no_validation_means_available",
+  "no_verification_means_for_entreprise_unipersonnelle",
+  "no_verification_means_for_small_association",
+  "domain_not_verified_yet",
+] as const;
+
+export const LinkTypes = z.enum([...VerifiedLinkTypes, ...UnverifiedLinkTypes]);
 
 export const BaseUserOrganizationLinkSchema = z.object({
   is_external: z.boolean(),
-  verification_type: UserOrganizationLinkVerificationTypeSchema.nullable(),
+  verification_type: LinkTypes,
   // updated when verification_type is changed
   verified_at: z.date().or(z.literal(null)),
   has_been_greeted: z.boolean(),