Scheduling infrastructure for absolutely everyone.
fix: update email validation to include pm.me and other email provider domain (#25879)
Hariom Balharaee298af4ebff
diff --git a/packages/features/ee/organizations/lib/server/orgCreationUtils.test.ts b/packages/features/ee/organizations/lib/server/orgCreationUtils.test.tsindex 40c315d4b29..edae287df2f 100644--- a/packages/features/ee/organizations/lib/server/orgCreationUtils.test.ts+++ b/packages/features/ee/organizations/lib/server/orgCreationUtils.test.ts@@ -63,34 +63,52 @@ describe("orgCreationUtils", () => {it("should return true for all popular personal email providers", () => {const personalProviders = ["gmail.com",+ "googlemail.com","yahoo.com",+ "ymail.com",+ "rocketmail.com",+ "sbcglobal.net",+ "att.net","outlook.com","hotmail.com",+ "live.com",+ "msn.com",+ "outlook.co",+ "hotmail.co.uk","aol.com","icloud.com",+ "me.com",+ "mac.com","mail.com",+ "email.com",+ "post.com",+ "consultant.com",+ "myself.com",+ "dr.com",+ "europe.com",+ "engineer.com",+ "asia.com",+ "usa.com","protonmail.com","proton.me",+ "pm.me",+ "protonmail.ch","zoho.com","yandex.com","gmx.com",+ "gmx.de","fastmail.com","inbox.com",- "me.com","hushmail.com",- "live.com","rediffmail.com","tutanota.com","mail.ru",- "usa.com","qq.com","163.com",+ "naver.com","web.de",- "rocketmail.com","excite.com","lycos.com",- "outlook.co",- "hotmail.co.uk",];personalProviders.forEach((provider) => {diff --git a/packages/features/ee/organizations/lib/server/orgCreationUtils.ts b/packages/features/ee/organizations/lib/server/orgCreationUtils.tsindex 80ec76348e0..3ab69b6221b 100644--- a/packages/features/ee/organizations/lib/server/orgCreationUtils.ts+++ b/packages/features/ee/organizations/lib/server/orgCreationUtils.ts@@ -25,34 +25,52 @@ export function isNotACompanyEmail(email: string) {// A list of popular @domains that can't be used to allow automatic acceptance of memberships to organizationconst emailProviders = ["gmail.com",+ "googlemail.com","yahoo.com",+ "ymail.com",+ "rocketmail.com",+ "sbcglobal.net",+ "att.net","outlook.com","hotmail.com",+ "live.com",+ "msn.com",+ "outlook.co",+ "hotmail.co.uk","aol.com","icloud.com",+ "me.com",+ "mac.com","mail.com",+ "email.com",+ "post.com",+ "consultant.com",+ "myself.com",+ "dr.com",+ "europe.com",+ "engineer.com",+ "asia.com",+ "usa.com","protonmail.com","proton.me",+ "pm.me",+ "protonmail.ch","zoho.com","yandex.com","gmx.com",+ "gmx.de","fastmail.com","inbox.com",- "me.com","hushmail.com",- "live.com","rediffmail.com","tutanota.com","mail.ru",- "usa.com","qq.com","163.com",+ "naver.com","web.de",- "rocketmail.com","excite.com","lycos.com",- "outlook.co",- "hotmail.co.uk",];const emailParts = email.split("@");diff --git a/packages/features/ee/organizations/lib/utils.ts b/packages/features/ee/organizations/lib/utils.tsindex d131233a71c..d7ecd3ff34b 100644--- a/packages/features/ee/organizations/lib/utils.ts+++ b/packages/features/ee/organizations/lib/utils.ts@@ -1,9 +1,9 @@export function extractDomainFromEmail(email: string) {let out = "";try {- const match = email.match(/^(?:.*?:\/\/)?.*?([\w\-]*(?:\.\w{2,}|\.\w{2,}\.\w{2}))(?:[\/?#:]|$)/);+ const match = email.match(/^(?:.*?:\/\/)?.*?([\w-]*(?:\.\w{2,}|\.\w{2,}\.\w{2}))(?:[/?#:]|$)/);out = (match && match[1]) ?? "";- } catch (ignore) {}+ } catch { /* empty */ }return out.split(".")[0];}@@ -14,34 +14,52 @@ export function isCompanyEmail(email: string): boolean {// A list of popular @domains that are personal email providersconst personalEmailProviders = ["gmail.com",+ "googlemail.com","yahoo.com",+ "ymail.com",+ "rocketmail.com",+ "sbcglobal.net",+ "att.net","outlook.com","hotmail.com",+ "live.com",+ "msn.com",+ "outlook.co",+ "hotmail.co.uk","aol.com","icloud.com",+ "me.com",+ "mac.com","mail.com",+ "email.com",+ "post.com",+ "consultant.com",+ "myself.com",+ "dr.com",+ "europe.com",+ "engineer.com",+ "asia.com",+ "usa.com","protonmail.com","proton.me",+ "pm.me",+ "protonmail.ch","zoho.com","yandex.com","gmx.com",+ "gmx.de","fastmail.com","inbox.com",- "me.com","hushmail.com",- "live.com","rediffmail.com","tutanota.com","mail.ru",- "usa.com","qq.com","163.com",+ "naver.com","web.de",- "rocketmail.com","excite.com","lycos.com",- "outlook.co",- "hotmail.co.uk",];const emailParts = email.split("@");