feat: add 9business to free email provider + use local free email dom…

…ain list in 2 services
numerique-gouv · Oct 16, 2024 · a38cf37 · a38cf37
1 parent 3665a8c
commit a38cf37
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 6 deletions.
diff --git a/...ices/security/diceware-wordlist-fr-alt.ts → src/data/diceware-wordlist-fr-alt.ts b/...ices/security/diceware-wordlist-fr-alt.ts → src/data/diceware-wordlist-fr-alt.ts
diff --git a/src/services/did-you-mean/gouvfr-domains.ts → src/data/gouvfr-domains.ts b/src/services/did-you-mean/gouvfr-domains.ts → src/data/gouvfr-domains.ts
diff --git a/...-you-mean/most-used-free-email-domains.ts → src/data/most-used-free-email-domains.ts b/...-you-mean/most-used-free-email-domains.ts → src/data/most-used-free-email-domains.ts
@@ -1,4 +1,4 @@
-// arbitrary selection of free email provider domains used in municipalities
+// arbitrary selection of free email provider domains used by our users
 export default [
   "gmail.com",
   "orange.fr",
@@ -12,5 +12,6 @@ export default [
   "yahoo.com",
   "live.fr",
   "sfr.fr",
+  "9business.fr",
   "laposte.fr",
 ];
diff --git a/...rvices/did-you-mean/other-gouv-domains.ts → src/data/other-gouv-domains.ts b/...rvices/did-you-mean/other-gouv-domains.ts → src/data/other-gouv-domains.ts
diff --git a/src/services/did-you-mean.ts b/src/services/did-you-mean.ts
@@ -1,7 +1,7 @@
 import { run as spellCheckEmail } from "@zootools/email-spell-checker";
-import gouvfrDomains from "./did-you-mean/gouvfr-domains";
-import mostUsedFreeEmailDomains from "./did-you-mean/most-used-free-email-domains";
-import otherGouvDomains from "./did-you-mean/other-gouv-domains";
+import gouvfrDomains from "../data/gouvfr-domains";
+import mostUsedFreeEmailDomains from "../data/most-used-free-email-domains";
+import otherGouvDomains from "../data/other-gouv-domains";
 
 // Display an email suggestion for most used public domains
 export const getDidYouMeanSuggestion = (email: string): string => {

diff --git a/src/services/email.ts b/src/services/email.ts
@@ -5,6 +5,7 @@ import {
   FEATURE_CONSIDER_ALL_EMAIL_DOMAINS_AS_FREE,
   FEATURE_CONSIDER_ALL_EMAIL_DOMAINS_AS_NON_FREE,
 } from "../config/env";
+import mostUsedFreeEmailDomains from "../data/most-used-free-email-domains";
 
 export const isAFreeEmailProvider = (domain: string) => {
   if (FEATURE_CONSIDER_ALL_EMAIL_DOMAINS_AS_FREE) {
@@ -15,7 +16,7 @@ export const isAFreeEmailProvider = (domain: string) => {
     return false;
   }
 
-  return isFree(domain);
+  return isFree(domain) || mostUsedFreeEmailDomains.includes(domain);
 };
 
 export const getEmailDomain = (email: string) => {

diff --git a/src/services/security.ts b/src/services/security.ts
@@ -4,9 +4,9 @@ import { customAlphabet, nanoid } from "nanoid/async";
 import { parse_host } from "tld-extract";
 import { MONCOMPTEPRO_HOST } from "../config/env";
 import notificationMessages from "../config/notification-messages";
+import dicewareWordlistFrAlt from "../data/diceware-wordlist-fr-alt";
 import type { AmrValue } from "../types/express-session";
 import { owaspPasswordStrengthTest } from "./owasp-password-strength-tester";
-import dicewareWordlistFrAlt from "./security/diceware-wordlist-fr-alt";
 
 // TODO compare to https://github.com/anandundavia/manage-users/blob/master/src/api/utils/security.js
 export const hashPassword = async (plainPassword: string): Promise<string> => {

diff --git a/test/email.test.ts b/test/email.test.ts
@@ -29,6 +29,7 @@ describe("usesAFreeEmailProvider", () => {
     "[email protected]",
     "[email protected]",
     "[email protected]",
+    "[email protected]",
   ];
 
   emailAddressesThatUsesFreeEmailProviders.forEach((email) => {