@proconnect-gouv/proconnect.identite 1.6.2 → 1.7.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @proconnect-gouv/proconnect.identite
 
+## 1.7.0
+
+### Minor Changes
+
+- [#1762](https://github.com/proconnect-gouv/proconnect-identite/pull/1762) [`8d3fc90`](https://github.com/proconnect-gouv/proconnect-identite/commit/8d3fc90e8e1302ed3193b69baeecce66df0e9e1a) Thanks [@rdubigny](https://github.com/rdubigny)! - Les verification_type de la table email_domains ne peuvent plus être null. Ils prennent la valeur not_verified_yet à la place. On décommissione aussi la function forceJoinOrganization disponible via API au profil d'une logique centralisée dans Hyyypertool.
+
 ## 1.6.2
 
 ### Patch Changes

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

@@ -1,5 +1,4 @@
 export * from "./adapters/index.js";
-export * from "./force-join-organization.js";
 export * from "./get-organization-info.js";
 export * from "./mark-domain-as-verified.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/managers/organization/index.ts"],"names":[],"mappings":"AAEA,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/managers/organization/index.ts"],"names":[],"mappings":"AAEA,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC"}

package/dist/managers/organization/index.js

@@ -1,5 +1,4 @@
 //
 export * from "./adapters/index.js";
-export * from "./force-join-organization.js";
 export * from "./get-organization-info.js";
 export * from "./mark-domain-as-verified.js";

package/dist/managers/organization/mark-domain-as-verified.d.ts

@@ -1,7 +1,7 @@
 import type { AddDomainHandler, DeleteEmailDomainsByVerificationTypesHandler } from "#src/repositories/email-domain";
 import type { FindByIdHandler, GetUsersByOrganizationHandler } from "#src/repositories/organization";
 import type { UpdateUserOrganizationLinkHandler } from "#src/repositories/user";
-import { type EmailDomainVerificationType } from "#src/types";
+import { type EmailDomainNoPendingVerificationType } from "#src/types";
 type FactoryDependencies = {
     addDomain: AddDomainHandler;
     deleteEmailDomainsByVerificationTypes: DeleteEmailDomainsByVerificationTypesHandler;
@@ -12,8 +12,17 @@ type FactoryDependencies = {
 export declare function markDomainAsVerifiedFactory({ addDomain, deleteEmailDomainsByVerificationTypes, findOrganizationById, getUsers, updateUserOrganizationLink, }: FactoryDependencies): ({ organization_id, domain, domain_verification_type, }: {
     organization_id: number;
     domain: string;
-    domain_verification_type: NonNullable<EmailDomainVerificationType>;
-}) => Promise<import("#src/types").EmailDomain>;
+    domain_verification_type: EmailDomainNoPendingVerificationType;
+}) => Promise<{
+    id: number;
+    organization_id: number;
+    domain: string;
+    verification_type: "official_contact" | "trackdechets_postal_mail" | "verified" | "external" | "not_verified_yet" | "blacklisted" | "refused";
+    can_be_suggested: boolean;
+    verified_at: Date | null;
+    created_at: Date;
+    updated_at: Date;
+}>;
 export type MarkDomainAsVerifiedHandler = ReturnType<typeof markDomainAsVerifiedFactory>;
 export {};
 //# sourceMappingURL=mark-domain-as-verified.d.ts.map

package/dist/managers/organization/mark-domain-as-verified.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mark-domain-as-verified.d.ts","sourceRoot":"","sources":["../../../src/managers/organization/mark-domain-as-verified.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,gBAAgB,EAChB,4CAA4C,EAC7C,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EACV,eAAe,EACf,6BAA6B,EAC9B,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAKL,KAAK,2BAA2B,EACjC,MAAM,YAAY,CAAC;AAMpB,KAAK,mBAAmB,GAAG;IACzB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,qCAAqC,EAAE,4CAA4C,CAAC;IACpF,oBAAoB,EAAE,eAAe,CAAC;IACtC,QAAQ,EAAE,6BAA6B,CAAC;IACxC,0BAA0B,EAAE,iCAAiC,CAAC;CAC/D,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,EAC1C,SAAS,EACT,qCAAqC,EACrC,oBAAoB,EACpB,QAAQ,EACR,0BAA0B,GAC3B,EAAE,mBAAmB,IAMuB,wDAIxC;IACD,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,wBAAwB,EAAE,WAAW,CAAC,2BAA2B,CAAC,CAAC;CACpE,+CAoFF;AAED,MAAM,MAAM,2BAA2B,GAAG,UAAU,CAClD,OAAO,2BAA2B,CACnC,CAAC"}
+{"version":3,"file":"mark-domain-as-verified.d.ts","sourceRoot":"","sources":["../../../src/managers/organization/mark-domain-as-verified.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,gBAAgB,EAChB,4CAA4C,EAC7C,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EACV,eAAe,EACf,6BAA6B,EAC9B,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAGL,KAAK,oCAAoC,EAK1C,MAAM,YAAY,CAAC;AAOpB,KAAK,mBAAmB,GAAG;IACzB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,qCAAqC,EAAE,4CAA4C,CAAC;IACpF,oBAAoB,EAAE,eAAe,CAAC;IACtC,QAAQ,EAAE,6BAA6B,CAAC;IACxC,0BAA0B,EAAE,iCAAiC,CAAC;CAC/D,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,EAC1C,SAAS,EACT,qCAAqC,EACrC,oBAAoB,EACpB,QAAQ,EACR,0BAA0B,GAC3B,EAAE,mBAAmB,IAMuB,wDAIxC;IACD,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,wBAAwB,EAAE,oCAAoC,CAAC;CAChE;;;;;;;;;GAgFF;AAED,MAAM,MAAM,2BAA2B,GAAG,UAAU,CAClD,OAAO,2BAA2B,CACnC,CAAC"}

package/dist/managers/organization/mark-domain-as-verified.js

@@ -1,7 +1,7 @@
 //
 import { NotFoundError } from "#src/errors";
 import { assignUserVerificationTypeToDomainFactory } from "#src/managers/user";
-import { EMAIL_DOMAIN_APPROVED_VERIFICATION_TYPES, EMAIL_DOMAIN_REJECTED_VERIFICATION_TYPES, } from "#src/types";
+import { EmailDomainApprovedVerificationTypes, EmailDomainPendingVerificationTypes, EmailDomainRejectedVerificationTypes, } from "#src/types";
 import { isEmpty } from "lodash-es";
 import { match } from "ts-pattern";
 export function markDomainAsVerifiedFactory({ addDomain, deleteEmailDomainsByVerificationTypes, findOrganizationById, getUsers, updateUserOrganizationLink, }) {
@@ -15,7 +15,7 @@ export function markDomainAsVerifiedFactory({ addDomain, deleteEmailDomainsByVer
             throw new NotFoundError();
         }
         return match(domain_verification_type)
-            .with(EMAIL_DOMAIN_APPROVED_VERIFICATION_TYPES.enum.official_contact, EMAIL_DOMAIN_APPROVED_VERIFICATION_TYPES.enum.trackdechets_postal_mail, EMAIL_DOMAIN_APPROVED_VERIFICATION_TYPES.enum.verified, ...EMAIL_DOMAIN_APPROVED_VERIFICATION_TYPES.options, async (approved_verification_type) => {
+            .with(...EmailDomainApprovedVerificationTypes, async (approved_verification_type) => {
             await assignUserVerificationTypeToDomain(organization_id, domain);
             return markDomainAsApproved({
                 organization_id,
@@ -23,7 +23,7 @@ export function markDomainAsVerifiedFactory({ addDomain, deleteEmailDomainsByVer
                 domain_verification_type: approved_verification_type,
             });
         })
-            .with(EMAIL_DOMAIN_REJECTED_VERIFICATION_TYPES.enum.blacklisted, EMAIL_DOMAIN_REJECTED_VERIFICATION_TYPES.enum.external, EMAIL_DOMAIN_REJECTED_VERIFICATION_TYPES.enum.refused, ...EMAIL_DOMAIN_REJECTED_VERIFICATION_TYPES.options, (rejected_verification_type) => markDomainAsRejected({
+            .with(...EmailDomainRejectedVerificationTypes, (rejected_verification_type) => markDomainAsRejected({
             organization_id,
             domain,
             domain_verification_type: rejected_verification_type,
@@ -35,8 +35,8 @@ export function markDomainAsVerifiedFactory({ addDomain, deleteEmailDomainsByVer
             organization_id,
             domain,
             domain_verification_types: [
-                ...EMAIL_DOMAIN_APPROVED_VERIFICATION_TYPES.options,
-                null,
+                ...EmailDomainApprovedVerificationTypes,
+                ...EmailDomainPendingVerificationTypes,
             ],
         });
         return addDomain({
@@ -50,8 +50,8 @@ export function markDomainAsVerifiedFactory({ addDomain, deleteEmailDomainsByVer
             organization_id,
             domain,
             domain_verification_types: [
-                null,
-                ...EMAIL_DOMAIN_REJECTED_VERIFICATION_TYPES.options,
+                ...EmailDomainPendingVerificationTypes,
+                ...EmailDomainRejectedVerificationTypes,
             ],
         });
         return addDomain({

package/dist/repositories/email-domain/add-domain.d.ts

@@ -1,8 +1,17 @@
-import type { DatabaseContext, EmailDomain } from "#src/types";
+import type { DatabaseContext, EmailDomainVerificationType } from "#src/types";
 export declare function addDomainFactory({ pg }: DatabaseContext): ({ organization_id, domain, verification_type, }: {
     organization_id: number;
     domain: string;
-    verification_type: EmailDomain["verification_type"];
-}) => Promise<EmailDomain>;
+    verification_type: EmailDomainVerificationType;
+}) => Promise<{
+    id: number;
+    organization_id: number;
+    domain: string;
+    verification_type: "official_contact" | "trackdechets_postal_mail" | "verified" | "external" | "not_verified_yet" | "blacklisted" | "refused";
+    can_be_suggested: boolean;
+    verified_at: Date | null;
+    created_at: Date;
+    updated_at: Date;
+}>;
 export type AddDomainHandler = ReturnType<typeof addDomainFactory>;
 //# sourceMappingURL=add-domain.d.ts.map

package/dist/repositories/email-domain/add-domain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-domain.d.ts","sourceRoot":"","sources":["../../../src/repositories/email-domain/add-domain.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAK/D,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,EAAE,EAAE,eAAe,IACtB,iDAI7B;IACD,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,WAAW,CAAC,mBAAmB,CAAC,CAAC;CACrD,0BA4BF;AAED,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC"}
+{"version":3,"file":"add-domain.d.ts","sourceRoot":"","sources":["../../../src/repositories/email-domain/add-domain.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,eAAe,EAEf,2BAA2B,EAC5B,MAAM,YAAY,CAAC;AAKpB,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,EAAE,EAAE,eAAe,IACtB,iDAI7B;IACD,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,2BAA2B,CAAC;CAChD;;;;;;;;;GA4BF;AAED,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC"}

package/dist/repositories/email-domain/delete-email-domains-by-verification-types.d.ts

@@ -1,7 +1,7 @@
-import type { DatabaseContext, EmailDomain } from "#src/types";
+import type { DatabaseContext, EmailDomain, EmailDomainVerificationType } from "#src/types";
 export declare function deleteEmailDomainsByVerificationTypesFactory({ pg, }: DatabaseContext): ({ organization_id, domain, domain_verification_types, }: {
     organization_id: EmailDomain["organization_id"];
-    domain_verification_types: EmailDomain["verification_type"][];
+    domain_verification_types: EmailDomainVerificationType[];
     domain: EmailDomain["domain"];
 }) => Promise<import("pg").QueryResult<any>>;
 export type DeleteEmailDomainsByVerificationTypesHandler = ReturnType<typeof deleteEmailDomainsByVerificationTypesFactory>;

package/dist/repositories/email-domain/delete-email-domains-by-verification-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-email-domains-by-verification-types.d.ts","sourceRoot":"","sources":["../../../src/repositories/email-domain/delete-email-domains-by-verification-types.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAI/D,wBAAgB,4CAA4C,CAAC,EAC3D,EAAE,GACH,EAAE,eAAe,IAC4C,yDAIzD;IACD,eAAe,EAAE,WAAW,CAAC,iBAAiB,CAAC,CAAC;IAChD,yBAAyB,EAAE,WAAW,CAAC,mBAAmB,CAAC,EAAE,CAAC;IAC9D,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;CAC/B,4CAuBF;AAED,MAAM,MAAM,4CAA4C,GAAG,UAAU,CACnE,OAAO,4CAA4C,CACpD,CAAC"}
+{"version":3,"file":"delete-email-domains-by-verification-types.d.ts","sourceRoot":"","sources":["../../../src/repositories/email-domain/delete-email-domains-by-verification-types.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,2BAA2B,EAC5B,MAAM,YAAY,CAAC;AAIpB,wBAAgB,4CAA4C,CAAC,EAC3D,EAAE,GACH,EAAE,eAAe,IAC4C,yDAIzD;IACD,eAAe,EAAE,WAAW,CAAC,iBAAiB,CAAC,CAAC;IAChD,yBAAyB,EAAE,2BAA2B,EAAE,CAAC;IACzD,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;CAC/B,4CAmBF;AAED,MAAM,MAAM,4CAA4C,GAAG,UAAU,CACnE,OAAO,4CAA4C,CACpD,CAAC"}

package/dist/repositories/email-domain/delete-email-domains-by-verification-types.js

@@ -3,9 +3,7 @@
 export function deleteEmailDomainsByVerificationTypesFactory({ pg, }) {
     return async function deleteEmailDomainsByVerificationTypes({ organization_id, domain, domain_verification_types, }) {
         const SQL_VERIFICATION_TYPES = domain_verification_types
-            .map((type) => type === null
-            ? "verification_type IS NULL"
-            : `verification_type = '${type}'`)
+            .map((type) => `verification_type = '${type}'`)
             .join(" OR ");
         return pg.query(`
       DELETE FROM email_domains

package/dist/repositories/email-domain/find-email-domains-by-organization-id.d.ts

@@ -1,4 +1,13 @@
-import type { DatabaseContext, EmailDomain } from "#src/types";
-export declare function findEmailDomainsByOrganizationIdFactory({ pg, }: DatabaseContext): (organization_id: number) => Promise<EmailDomain[]>;
+import type { DatabaseContext } from "#src/types";
+export declare function findEmailDomainsByOrganizationIdFactory({ pg, }: DatabaseContext): (organization_id: number) => Promise<{
+    id: number;
+    organization_id: number;
+    domain: string;
+    verification_type: "official_contact" | "trackdechets_postal_mail" | "verified" | "external" | "not_verified_yet" | "blacklisted" | "refused";
+    can_be_suggested: boolean;
+    verified_at: Date | null;
+    created_at: Date;
+    updated_at: Date;
+}[]>;
 export type FindEmailDomainsByOrganizationIdHandler = ReturnType<typeof findEmailDomainsByOrganizationIdFactory>;
 //# sourceMappingURL=find-email-domains-by-organization-id.d.ts.map

package/dist/repositories/email-domain/find-email-domains-by-organization-id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find-email-domains-by-organization-id.d.ts","sourceRoot":"","sources":["../../../src/repositories/email-domain/find-email-domains-by-organization-id.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAK/D,wBAAgB,uCAAuC,CAAC,EACtD,EAAE,GACH,EAAE,eAAe,IAEd,iBAAiB,MAAM,4BAY1B;AAED,MAAM,MAAM,uCAAuC,GAAG,UAAU,CAC9D,OAAO,uCAAuC,CAC/C,CAAC"}
+{"version":3,"file":"find-email-domains-by-organization-id.d.ts","sourceRoot":"","sources":["../../../src/repositories/email-domain/find-email-domains-by-organization-id.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,YAAY,CAAC;AAK/D,wBAAgB,uCAAuC,CAAC,EACtD,EAAE,GACH,EAAE,eAAe,IAEd,iBAAiB,MAAM;;;;;;;;;KAY1B;AAED,MAAM,MAAM,uCAAuC,GAAG,UAAU,CAC9D,OAAO,uCAAuC,CAC/C,CAAC"}

package/dist/repositories/organization/find-by-user-id.d.ts

@@ -1,7 +1,7 @@
 import type { DatabaseContext, Organization } from "#src/types";
 export declare function findByUserIdFactory({ pg }: DatabaseContext): (userId: number) => Promise<(Organization & {
     is_external: boolean;
-    verification_type: "organization_dirigeant" | "code_sent_to_official_contact_email" | "domain" | "imported_from_coop_mediation_numerique" | "imported_from_inclusion_connect" | "in_liste_dirigeants_rna" | "in_liste_dirigeants_rne" | "official_contact_email" | "ordre_professionnel_domain" | "proof_received" | "verified_by_coop_mediation_numerique" | "bypassed" | "domain_not_verified_yet" | "no_validation_means_available" | "no_verification_means_for_entreprise_unipersonnelle" | "no_verification_means_for_small_association";
+    verification_type: "domain" | "organization_dirigeant" | "code_sent_to_official_contact_email" | "imported_from_coop_mediation_numerique" | "imported_from_inclusion_connect" | "in_liste_dirigeants_rna" | "in_liste_dirigeants_rne" | "official_contact_email" | "ordre_professionnel_domain" | "proof_received" | "verified_by_coop_mediation_numerique" | "bypassed" | "domain_not_verified_yet" | "no_validation_means_available" | "no_verification_means_for_entreprise_unipersonnelle" | "no_verification_means_for_small_association";
     verified_at: Date | null;
     has_been_greeted: boolean;
     needs_official_contact_email_verification: boolean;

package/dist/repositories/organization/get-users-by-organization.d.ts

@@ -1,7 +1,7 @@
 import type { DatabaseContext, User } from "#src/types";
 export declare function getUsersByOrganizationFactory({ pg }: DatabaseContext): (organization_id: number, additionalWhereClause?: string, additionalParams?: any[]) => Promise<(User & {
     is_external: boolean;
-    verification_type: "organization_dirigeant" | "code_sent_to_official_contact_email" | "domain" | "imported_from_coop_mediation_numerique" | "imported_from_inclusion_connect" | "in_liste_dirigeants_rna" | "in_liste_dirigeants_rne" | "official_contact_email" | "ordre_professionnel_domain" | "proof_received" | "verified_by_coop_mediation_numerique" | "bypassed" | "domain_not_verified_yet" | "no_validation_means_available" | "no_verification_means_for_entreprise_unipersonnelle" | "no_verification_means_for_small_association";
+    verification_type: "domain" | "organization_dirigeant" | "code_sent_to_official_contact_email" | "imported_from_coop_mediation_numerique" | "imported_from_inclusion_connect" | "in_liste_dirigeants_rna" | "in_liste_dirigeants_rne" | "official_contact_email" | "ordre_professionnel_domain" | "proof_received" | "verified_by_coop_mediation_numerique" | "bypassed" | "domain_not_verified_yet" | "no_validation_means_available" | "no_verification_means_for_entreprise_unipersonnelle" | "no_verification_means_for_small_association";
     verified_at: Date | null;
     has_been_greeted: boolean;
     needs_official_contact_email_verification: boolean;

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

@@ -1,6 +1,5 @@
 export * from "./find-by-id.js";
 export * from "./find-by-user-id.js";
-export * from "./get-by-id.js";
 export * from "./get-users-by-organization.js";
 export * from "./link-user-to-organization.js";
 export * from "./upsert.js";

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/repositories/organization/index.ts"],"names":[],"mappings":"AAEA,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/repositories/organization/index.ts"],"names":[],"mappings":"AAEA,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,aAAa,CAAC"}

package/dist/repositories/organization/index.js

@@ -1,7 +1,6 @@
 //
 export * from "./find-by-id.js";
 export * from "./find-by-user-id.js";
-export * from "./get-by-id.js";
 export * from "./get-users-by-organization.js";
 export * from "./link-user-to-organization.js";
 export * from "./upsert.js";

package/dist/repositories/organization/link-user-to-organization.d.ts

@@ -1,7 +1,7 @@
 import type { DatabaseContext, InsertUserOrganizationLink } from "#src/types";
 export declare function linkUserToOrganizationFactory({ pg }: DatabaseContext): ({ is_external, needs_official_contact_email_verification, organization_id, user_id, verification_type, }: InsertUserOrganizationLink) => Promise<{
     is_external: boolean;
-    verification_type: "organization_dirigeant" | "code_sent_to_official_contact_email" | "domain" | "imported_from_coop_mediation_numerique" | "imported_from_inclusion_connect" | "in_liste_dirigeants_rna" | "in_liste_dirigeants_rne" | "official_contact_email" | "ordre_professionnel_domain" | "proof_received" | "verified_by_coop_mediation_numerique" | "bypassed" | "domain_not_verified_yet" | "no_validation_means_available" | "no_verification_means_for_entreprise_unipersonnelle" | "no_verification_means_for_small_association";
+    verification_type: "domain" | "organization_dirigeant" | "code_sent_to_official_contact_email" | "imported_from_coop_mediation_numerique" | "imported_from_inclusion_connect" | "in_liste_dirigeants_rna" | "in_liste_dirigeants_rne" | "official_contact_email" | "ordre_professionnel_domain" | "proof_received" | "verified_by_coop_mediation_numerique" | "bypassed" | "domain_not_verified_yet" | "no_validation_means_available" | "no_verification_means_for_entreprise_unipersonnelle" | "no_verification_means_for_small_association";
     verified_at: Date | null;
     has_been_greeted: boolean;
     needs_official_contact_email_verification: boolean;

package/dist/repositories/user/update-user-organization-link.d.ts

@@ -1,7 +1,7 @@
 import type { DatabaseContext, UserOrganizationLink } from "#src/types";
 export declare function updateUserOrganizationLinkFactory({ pg }: DatabaseContext): (organization_id: number, user_id: number, fieldsToUpdate: Partial<UserOrganizationLink>) => Promise<{
     is_external: boolean;
-    verification_type: "organization_dirigeant" | "code_sent_to_official_contact_email" | "domain" | "imported_from_coop_mediation_numerique" | "imported_from_inclusion_connect" | "in_liste_dirigeants_rna" | "in_liste_dirigeants_rne" | "official_contact_email" | "ordre_professionnel_domain" | "proof_received" | "verified_by_coop_mediation_numerique" | "bypassed" | "domain_not_verified_yet" | "no_validation_means_available" | "no_verification_means_for_entreprise_unipersonnelle" | "no_verification_means_for_small_association";
+    verification_type: "domain" | "organization_dirigeant" | "code_sent_to_official_contact_email" | "imported_from_coop_mediation_numerique" | "imported_from_inclusion_connect" | "in_liste_dirigeants_rna" | "in_liste_dirigeants_rne" | "official_contact_email" | "ordre_professionnel_domain" | "proof_received" | "verified_by_coop_mediation_numerique" | "bypassed" | "domain_not_verified_yet" | "no_validation_means_available" | "no_verification_means_for_entreprise_unipersonnelle" | "no_verification_means_for_small_association";
     verified_at: Date | null;
     has_been_greeted: boolean;
     needs_official_contact_email_verification: boolean;

package/dist/types/email-domain.d.ts

@@ -1,25 +1,46 @@
 import { z } from "zod";
-export declare const EMAIL_DOMAIN_APPROVED_VERIFICATION_TYPES: z.ZodEnum<{
+export declare const EmailDomainApprovedVerificationTypes: readonly ["official_contact", "trackdechets_postal_mail", "verified", "external"];
+export type EmailDomainApprovedVerificationType = z.output<typeof EmailDomainApprovedVerificationTypes>;
+export declare const EmailDomainPendingVerificationTypes: readonly ["not_verified_yet"];
+export type EmailDomainPendingVerificationType = z.output<typeof EmailDomainPendingVerificationTypes>;
+export declare const EmailDomainRejectedVerificationTypes: readonly ["blacklisted", "refused"];
+export type EmailDomainRejectedVerificationType = z.output<typeof EmailDomainRejectedVerificationTypes>;
+export declare const EmailDomainNoPendingVerificationTypes: z.ZodEnum<{
     official_contact: "official_contact";
     trackdechets_postal_mail: "trackdechets_postal_mail";
     verified: "verified";
-}>;
-export type EmailDomainApprovedVerificationType = z.output<typeof EMAIL_DOMAIN_APPROVED_VERIFICATION_TYPES>;
-export declare const EMAIL_DOMAIN_REJECTED_VERIFICATION_TYPES: z.ZodEnum<{
+    external: "external";
     blacklisted: "blacklisted";
+    refused: "refused";
+}>;
+export type EmailDomainNoPendingVerificationType = z.output<typeof EmailDomainNoPendingVerificationTypes>;
+export declare const EmailDomainVerificationTypes: z.ZodEnum<{
+    official_contact: "official_contact";
+    trackdechets_postal_mail: "trackdechets_postal_mail";
+    verified: "verified";
     external: "external";
+    not_verified_yet: "not_verified_yet";
+    blacklisted: "blacklisted";
     refused: "refused";
 }>;
-export type EmailDomainRejectedVerificationType = z.output<typeof EMAIL_DOMAIN_REJECTED_VERIFICATION_TYPES>;
-export type EmailDomainVerificationType = EmailDomainApprovedVerificationType | EmailDomainRejectedVerificationType | null;
-export interface EmailDomain {
-    id: number;
-    organization_id: number;
-    domain: string;
-    verification_type: EmailDomainVerificationType;
-    can_be_suggested: boolean;
-    verified_at: Date | null;
-    created_at: Date;
-    updated_at: Date;
-}
+export type EmailDomainVerificationType = z.output<typeof EmailDomainVerificationTypes>;
+export declare const EmailDomainSchema: z.ZodObject<{
+    id: z.ZodNumber;
+    organization_id: z.ZodNumber;
+    domain: z.ZodString;
+    verification_type: z.ZodEnum<{
+        official_contact: "official_contact";
+        trackdechets_postal_mail: "trackdechets_postal_mail";
+        verified: "verified";
+        external: "external";
+        not_verified_yet: "not_verified_yet";
+        blacklisted: "blacklisted";
+        refused: "refused";
+    }>;
+    can_be_suggested: z.ZodBoolean;
+    verified_at: z.ZodNullable<z.ZodDate>;
+    created_at: z.ZodDate;
+    updated_at: z.ZodDate;
+}, z.core.$strip>;
+export type EmailDomain = z.output<typeof EmailDomainSchema>;
 //# sourceMappingURL=email-domain.d.ts.map

package/dist/types/email-domain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"email-domain.d.ts","sourceRoot":"","sources":["../../src/types/email-domain.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,wCAAwC;;;;EAInD,CAAC;AAEH,MAAM,MAAM,mCAAmC,GAAG,CAAC,CAAC,MAAM,CACxD,OAAO,wCAAwC,CAChD,CAAC;AAIF,eAAO,MAAM,wCAAwC;;;;EAInD,CAAC;AAEH,MAAM,MAAM,mCAAmC,GAAG,CAAC,CAAC,MAAM,CACxD,OAAO,wCAAwC,CAChD,CAAC;AAIF,MAAM,MAAM,2BAA2B,GACnC,mCAAmC,GACnC,mCAAmC,GACnC,IAAI,CAAC;AAET,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,2BAA2B,CAAC;IAE/C,gBAAgB,EAAE,OAAO,CAAC;IAG1B,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;CAClB"}
+{"version":3,"file":"email-domain.d.ts","sourceRoot":"","sources":["../../src/types/email-domain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,oCAAoC,mFAKvC,CAAC;AAEX,MAAM,MAAM,mCAAmC,GAAG,CAAC,CAAC,MAAM,CACxD,OAAO,oCAAoC,CAC5C,CAAC;AAGF,eAAO,MAAM,mCAAmC,+BAEtC,CAAC;AAEX,MAAM,MAAM,kCAAkC,GAAG,CAAC,CAAC,MAAM,CACvD,OAAO,mCAAmC,CAC3C,CAAC;AAEF,eAAO,MAAM,oCAAoC,qCAGvC,CAAC;AAEX,MAAM,MAAM,mCAAmC,GAAG,CAAC,CAAC,MAAM,CACxD,OAAO,oCAAoC,CAC5C,CAAC;AAEF,eAAO,MAAM,qCAAqC;;;;;;;EAGhD,CAAC;AAEH,MAAM,MAAM,oCAAoC,GAAG,CAAC,CAAC,MAAM,CACzD,OAAO,qCAAqC,CAC7C,CAAC;AAEF,eAAO,MAAM,4BAA4B;;;;;;;;EAIvC,CAAC;AAEH,MAAM,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAChD,OAAO,4BAA4B,CACpC,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;iBAY5B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,iBAAiB,CAAC,CAAC"}

package/dist/types/email-domain.js

@@ -1,14 +1,37 @@
-//
 import { z } from "zod";
-//
-export const EMAIL_DOMAIN_APPROVED_VERIFICATION_TYPES = z.enum([
+export const EmailDomainApprovedVerificationTypes = [
     "official_contact",
     "trackdechets_postal_mail",
     "verified",
-]);
-//
-export const EMAIL_DOMAIN_REJECTED_VERIFICATION_TYPES = z.enum([
-    "blacklisted", // unused
     "external", // domain used by external employees (eg. ext.numerique.gouv.fr)
+];
+// domain is not verified, but users are still permitted to use it
+export const EmailDomainPendingVerificationTypes = [
+    "not_verified_yet",
+];
+export const EmailDomainRejectedVerificationTypes = [
+    "blacklisted", // unused
     "refused",
+];
+export const EmailDomainNoPendingVerificationTypes = z.enum([
+    ...EmailDomainApprovedVerificationTypes,
+    ...EmailDomainRejectedVerificationTypes,
+]);
+export const EmailDomainVerificationTypes = z.enum([
+    ...EmailDomainApprovedVerificationTypes,
+    ...EmailDomainPendingVerificationTypes,
+    ...EmailDomainRejectedVerificationTypes,
 ]);
+export const EmailDomainSchema = z.object({
+    id: z.number(),
+    organization_id: z.number(),
+    domain: z.string(),
+    verification_type: EmailDomainVerificationTypes,
+    // Unused.
+    can_be_suggested: z.boolean(),
+    // Can be updated when verification_type changes.
+    // In practice, entries are deleted and recreated rather than updated directly
+    verified_at: z.date().nullable(),
+    created_at: z.date(),
+    updated_at: z.date(),
+});

package/dist/types/user-organization-link.d.ts

@@ -4,9 +4,9 @@ export declare const WeakLinkTypes: readonly ["code_sent_to_official_contact_ema
 export declare const SuperWeakLinkTypes: readonly ["domain_not_verified_yet"];
 export declare const UnverifiedLinkTypes: readonly ["no_validation_means_available", "no_verification_means_for_entreprise_unipersonnelle", "no_verification_means_for_small_association"];
 export declare const LinkTypes: z.ZodEnum<{
+    domain: "domain";
     organization_dirigeant: "organization_dirigeant";
     code_sent_to_official_contact_email: "code_sent_to_official_contact_email";
-    domain: "domain";
     imported_from_coop_mediation_numerique: "imported_from_coop_mediation_numerique";
     imported_from_inclusion_connect: "imported_from_inclusion_connect";
     in_liste_dirigeants_rna: "in_liste_dirigeants_rna";
@@ -21,12 +21,13 @@ export declare const LinkTypes: z.ZodEnum<{
     no_verification_means_for_entreprise_unipersonnelle: "no_verification_means_for_entreprise_unipersonnelle";
     no_verification_means_for_small_association: "no_verification_means_for_small_association";
 }>;
+export type LinkType = z.output<typeof LinkTypes>;
 export declare const BaseUserOrganizationLinkSchema: z.ZodObject<{
     is_external: z.ZodBoolean;
     verification_type: z.ZodEnum<{
+        domain: "domain";
         organization_dirigeant: "organization_dirigeant";
         code_sent_to_official_contact_email: "code_sent_to_official_contact_email";
-        domain: "domain";
         imported_from_coop_mediation_numerique: "imported_from_coop_mediation_numerique";
         imported_from_inclusion_connect: "imported_from_inclusion_connect";
         in_liste_dirigeants_rna: "in_liste_dirigeants_rna";
@@ -51,9 +52,9 @@ export type BaseUserOrganizationLink = z.output<typeof BaseUserOrganizationLinkS
 export declare const UserOrganizationLinkSchema: z.ZodObject<{
     is_external: z.ZodBoolean;
     verification_type: z.ZodEnum<{
+        domain: "domain";
         organization_dirigeant: "organization_dirigeant";
         code_sent_to_official_contact_email: "code_sent_to_official_contact_email";
-        domain: "domain";
         imported_from_coop_mediation_numerique: "imported_from_coop_mediation_numerique";
         imported_from_inclusion_connect: "imported_from_inclusion_connect";
         in_liste_dirigeants_rna: "in_liste_dirigeants_rna";
@@ -80,12 +81,10 @@ export declare const UserOrganizationLinkSchema: z.ZodObject<{
 }, z.core.$strip>;
 export type UserOrganizationLink = z.output<typeof UserOrganizationLinkSchema>;
 export declare const InsertUserOrganizationLinkSchema: z.ZodObject<{
-    user_id: z.ZodNumber;
-    organization_id: z.ZodNumber;
     verification_type: z.ZodEnum<{
+        domain: "domain";
         organization_dirigeant: "organization_dirigeant";
         code_sent_to_official_contact_email: "code_sent_to_official_contact_email";
-        domain: "domain";
         imported_from_coop_mediation_numerique: "imported_from_coop_mediation_numerique";
         imported_from_inclusion_connect: "imported_from_inclusion_connect";
         in_liste_dirigeants_rna: "in_liste_dirigeants_rna";
@@ -100,6 +99,8 @@ export declare const InsertUserOrganizationLinkSchema: z.ZodObject<{
         no_verification_means_for_entreprise_unipersonnelle: "no_verification_means_for_entreprise_unipersonnelle";
         no_verification_means_for_small_association: "no_verification_means_for_small_association";
     }>;
+    organization_id: z.ZodNumber;
+    user_id: z.ZodNumber;
     is_external: z.ZodOptional<z.ZodBoolean>;
     needs_official_contact_email_verification: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;

package/dist/types/user-organization-link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-organization-link.d.ts","sourceRoot":"","sources":["../../src/types/user-organization-link.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,eAAe,qCAAsC,CAAC;AAEnE,eAAO,MAAM,aAAa,6TAahB,CAAC;AAMX,eAAO,MAAM,kBAAkB,sCAAuC,CAAC;AAQvE,eAAO,MAAM,mBAAmB,kJAItB,CAAC;AAEX,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;EAAyD,CAAC;AAEhF,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;;iBASzC,CAAC;AAEH,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAC7C,OAAO,8BAA8B,CACtC,CAAC;AAIF,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAOtC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAI/E,eAAO,MAAM,gCAAgC;;;;;;;;;;;;;;;;;;;;;;;iBAW5C,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,CAAC,CAAC,MAAM,CAC/C,OAAO,gCAAgC,CACxC,CAAC"}
+{"version":3,"file":"user-organization-link.d.ts","sourceRoot":"","sources":["../../src/types/user-organization-link.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,eAAe,qCAAsC,CAAC;AAEnE,eAAO,MAAM,aAAa,6TAahB,CAAC;AAMX,eAAO,MAAM,kBAAkB,sCAAuC,CAAC;AAQvE,eAAO,MAAM,mBAAmB,kJAItB,CAAC;AAEX,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;EAAyD,CAAC;AAEhF,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,SAAS,CAAC,CAAC;AAElD,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;;iBASzC,CAAC;AAEH,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAC7C,OAAO,8BAA8B,CACtC,CAAC;AAIF,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAOtC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAI/E,eAAO,MAAM,gCAAgC;;;;;;;;;;;;;;;;;;;;;;;iBAW5C,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,CAAC,CAAC,MAAM,CAC/C,OAAO,gCAAgC,CACxC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proconnect-gouv/proconnect.identite",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "homepage": "https://github.com/proconnect-gouv/proconnect-identite/tree/main/packages/identite#readme",
   "bugs": "https://github.com/proconnect-gouv/proconnect-identite/issues",
   "repository": {

package/src/managers/organization/index.ts

@@ -1,6 +1,5 @@
 //
 
 export * from "./adapters/index.js";
-export * from "./force-join-organization.js";
 export * from "./get-organization-info.js";
 export * from "./mark-domain-as-verified.js";

package/src/managers/organization/mark-domain-as-verified.test.ts.snapshot

@@ -25,7 +25,8 @@ exports[`markDomainAsVerified > should update organization members > should call
           "official_contact",
           "trackdechets_postal_mail",
           "verified",
-          null
+          "external",
+          "not_verified_yet"
         ]
       }
     ],

package/src/managers/organization/mark-domain-as-verified.ts

@@ -12,12 +12,15 @@ import type {
 } from "#src/repositories/organization";
 import type { UpdateUserOrganizationLinkHandler } from "#src/repositories/user";
 import {
-  EMAIL_DOMAIN_APPROVED_VERIFICATION_TYPES,
-  EMAIL_DOMAIN_REJECTED_VERIFICATION_TYPES,
   type EmailDomainApprovedVerificationType,
+  EmailDomainApprovedVerificationTypes,
+  type EmailDomainNoPendingVerificationType,
+  EmailDomainPendingVerificationTypes,
   type EmailDomainRejectedVerificationType,
+  EmailDomainRejectedVerificationTypes,
   type EmailDomainVerificationType,
 } from "#src/types";
+
 import { isEmpty } from "lodash-es";
 import { match } from "ts-pattern";
 
@@ -50,7 +53,7 @@ export function markDomainAsVerifiedFactory({
   }: {
     organization_id: number;
     domain: string;
-    domain_verification_type: NonNullable<EmailDomainVerificationType>;
+    domain_verification_type: EmailDomainNoPendingVerificationType;
   }) {
     const organization = await findOrganizationById(organization_id);
 
@@ -60,10 +63,7 @@ export function markDomainAsVerifiedFactory({
 
     return match(domain_verification_type)
       .with(
-        EMAIL_DOMAIN_APPROVED_VERIFICATION_TYPES.enum.official_contact,
-        EMAIL_DOMAIN_APPROVED_VERIFICATION_TYPES.enum.trackdechets_postal_mail,
-        EMAIL_DOMAIN_APPROVED_VERIFICATION_TYPES.enum.verified,
-        ...EMAIL_DOMAIN_APPROVED_VERIFICATION_TYPES.options,
+        ...EmailDomainApprovedVerificationTypes,
         async (approved_verification_type) => {
           await assignUserVerificationTypeToDomain(organization_id, domain);
           return markDomainAsApproved({
@@ -74,10 +74,7 @@ export function markDomainAsVerifiedFactory({
         },
       )
       .with(
-        EMAIL_DOMAIN_REJECTED_VERIFICATION_TYPES.enum.blacklisted,
-        EMAIL_DOMAIN_REJECTED_VERIFICATION_TYPES.enum.external,
-        EMAIL_DOMAIN_REJECTED_VERIFICATION_TYPES.enum.refused,
-        ...EMAIL_DOMAIN_REJECTED_VERIFICATION_TYPES.options,
+        ...EmailDomainRejectedVerificationTypes,
         (rejected_verification_type) =>
           markDomainAsRejected({
             organization_id,
@@ -101,14 +98,15 @@ export function markDomainAsVerifiedFactory({
       organization_id,
       domain,
       domain_verification_types: [
-        ...EMAIL_DOMAIN_APPROVED_VERIFICATION_TYPES.options,
-        null,
+        ...EmailDomainApprovedVerificationTypes,
+        ...EmailDomainPendingVerificationTypes,
       ],
     });
     return addDomain({
       organization_id,
       domain,
-      verification_type: domain_verification_type,
+      verification_type:
+        domain_verification_type as EmailDomainVerificationType,
     });
   }
 
@@ -125,14 +123,15 @@ export function markDomainAsVerifiedFactory({
       organization_id,
       domain,
       domain_verification_types: [
-        null,
-        ...EMAIL_DOMAIN_REJECTED_VERIFICATION_TYPES.options,
+        ...EmailDomainPendingVerificationTypes,
+        ...EmailDomainRejectedVerificationTypes,
       ],
     });
     return addDomain({
       organization_id,
       domain,
-      verification_type: domain_verification_type,
+      verification_type:
+        domain_verification_type as EmailDomainVerificationType,
     });
   }
 }