fix: email-address with apostrophe not accepted

[RajdeepDs]

What does this PR do?

• Fixes #15471

Mandatory Tasks (DO NOT REMOVE)

• [x] I have self-reviewed the code (A decent size PR without self-review might be rejected)
• [ ] I have added a Docs issue here if this PR makes changes that would require a documentation change
• [ ] I have added or modified automated tests that prove my fix is effective or that my feature works (PRs might be rejected if logical changes are not properly tested)

[vercel[bot]]

@RajdeepDs is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

[CLAassistant]

All committers have signed the CLA.

[graphite-app[bot]]

Graphite Automations

"Add community label" took an action on this PR • (06/22/24)

1 label was added to this PR based on Keith Williams's automation.

"Add consumer team as reviewer" took an action on this PR • (06/22/24)

1 reviewer was added to this PR based on Keith Williams's automation.

"Add foundation team as reviewer" took an action on this PR • (06/25/24)

1 reviewer was added to this PR based on Keith Williams's automation.

[github-actions[bot]]

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

Ninety-two Pages Changed Size

The following pages changed size from the code in this PR compared to its base branch:

Page	Size (compressed)	First Load	% of Budget (350 KB)
/apps	277.5 KB	505.16 KB	144.33% (🟢 -1.91%)
/apps/[slug]	294.88 KB	522.54 KB	149.30% (🟢 -1.97%)
/apps/[slug]/[...pages]	587.36 KB	815.02 KB	232.86% (🟢 -1.51%)
/apps/categories	254.55 KB	482.21 KB	137.77% (🟢 -1.71%)
/apps/categories/[category]	259.36 KB	487.01 KB	139.15% (🟢 -1.99%)
/apps/installation/[[...step]]	467.44 KB	695.1 KB	198.60% (🔴 +85.65%)
/apps/installed/[category]	278.5 KB	506.15 KB	144.62% (🟢 -1.75%)
/auth/saml-idp	12.22 KB	239.88 KB	68.54% (🟢 -20.80%)
/availability	426.95 KB	654.61 KB	187.03% (🟢 -1.56%)
/availability/[schedule]	410.82 KB	638.48 KB	182.42% (🟢 -1.57%)
/booking/[uid]	236.92 KB	464.57 KB	132.74% (🟡 +0.26%)
/booking/[uid]/embed	236.92 KB	464.58 KB	132.74% (🟡 +0.26%)
/bookings/[status]	324.62 KB	552.28 KB	157.79% (🟢 -1.59%)
/enterprise	254.6 KB	482.26 KB	137.79% (🟢 -1.71%)
/event-types	559.97 KB	787.63 KB	225.04% (🟢 -1.55%)
/event-types/[type]	435.74 KB	663.4 KB	189.54% (🟢 -1.65%)
/getting-started/[[...step]]	448.2 KB	675.85 KB	193.10% (🟡 +10.74%)
/insights	474.55 KB	702.2 KB	200.63% (🟢 -1.71%)
/more	254.11 KB	481.77 KB	137.65% (🟢 -1.72%)
/org/[orgSlug]	266.88 KB	494.54 KB	141.30% (🟡 +0.14%)
/org/[orgSlug]/[user]	273 KB	500.65 KB	143.04% (🟡 +0.15%)
/org/[orgSlug]/[user]/embed	273.02 KB	500.68 KB	143.05% (🟡 +0.15%)
/org/[orgSlug]/embed	266.9 KB	494.55 KB	141.30% (🟡 +0.15%)
/org/[orgSlug]/team/[slug]	266.89 KB	494.54 KB	141.30% (🟡 +0.15%)
/payment/[uid]	121.27 KB	348.93 KB	99.69% (🟡 +0.20%)
/settings/admin	260.58 KB	488.24 KB	139.50% (🟢 -1.69%)
/settings/admin/apps	273.96 KB	501.62 KB	143.32% (🟢 -1.68%)
/settings/admin/apps/[category]	273.95 KB	501.61 KB	143.32% (🟢 -1.68%)
/settings/admin/flags	264.41 KB	492.07 KB	140.59% (🟢 -1.69%)
/settings/admin/impersonation	260.97 KB	488.63 KB	139.61% (🟢 -1.69%)
/settings/admin/lockedSMS	282.07 KB	509.72 KB	145.64% (🟢 -1.67%)
/settings/admin/lockedSMS/lockedSMSView	119.52 KB	347.17 KB	99.19% (🟢 -0.15%)
/settings/admin/oAuth	272.69 KB	500.35 KB	142.96% (🟢 -1.69%)
/settings/admin/oAuth/oAuthView	95.41 KB	323.07 KB	92.30% (🟢 -0.20%)
/settings/admin/orgMigrations/_OrgMigrationLayout	249.36 KB	477.02 KB	136.29% (🟢 -1.73%)
/settings/admin/orgMigrations/moveTeamToOrg	299.33 KB	526.99 KB	150.57% (🟢 -1.65%)
/settings/admin/orgMigrations/moveUserToOrg	319.16 KB	546.82 KB	156.23% (🟢 -1.62%)
/settings/admin/orgMigrations/removeTeamFromOrg	299.1 KB	526.75 KB	150.50% (🟢 -1.65%)
/settings/admin/orgMigrations/removeUserFromOrg	299.11 KB	526.76 KB	150.50% (🟢 -1.65%)
/settings/admin/organizations	262.47 KB	490.12 KB	140.04% (🟢 -1.69%)
/settings/admin/organizations/[id]/edit	261.13 KB	488.78 KB	139.65% (🟢 -1.69%)
/settings/admin/users	263.24 KB	490.89 KB	140.26% (🟢 -1.69%)
/settings/admin/users/[id]/edit	392.49 KB	620.15 KB	177.19% (🟢 -1.64%)
/settings/admin/users/add	392.16 KB	619.82 KB	177.09% (🟢 -1.64%)
/settings/billing	260.79 KB	488.44 KB	139.55% (🟢 -1.68%)
/settings/developer/api-keys	265.18 KB	492.84 KB	140.81% (🟢 -1.69%)
/settings/developer/webhooks	265.36 KB	493.01 KB	140.86% (🟢 -1.69%)
/settings/developer/webhooks/[id]	266.34 KB	493.99 KB	141.14% (🟢 -1.67%)
/settings/developer/webhooks/new	266.36 KB	494.02 KB	141.15% (🟢 -1.67%)
/settings/my-account/appearance	313.85 KB	541.51 KB	154.72% (🟢 -1.67%)
/settings/my-account/calendars	272.21 KB	499.86 KB	142.82% (🟢 -1.73%)
/settings/my-account/conferencing	273.12 KB	500.78 KB	143.08% (🟢 -1.72%)
/settings/my-account/general	376.29 KB	603.95 KB	172.56% (🟢 -1.68%)
/settings/my-account/out-of-office	265.82 KB	493.47 KB	140.99% (🟢 -1.69%)
/settings/my-account/profile	408.91 KB	636.57 KB	181.88% (🟢 -1.63%)
/settings/organizations/[id]/about	159.7 KB	387.36 KB	110.67% (🟡 +0.49%)
/settings/organizations/[id]/add-teams	159.7 KB	387.35 KB	110.67% (🟡 +0.49%)
/settings/organizations/admin-api	260.74 KB	488.4 KB	139.54% (🟢 -1.69%)
/settings/organizations/appearance	122.37 KB	350.03 KB	100.01% (🟢 -48.01%)
/settings/organizations/billing	260.82 KB	488.48 KB	139.57% (🟢 -1.69%)
/settings/organizations/dsync	293.44 KB	521.1 KB	148.89% (🟢 -1.69%)
/settings/organizations/general	349.13 KB	576.79 KB	164.80% (🟢 -1.69%)
/settings/organizations/members	400.45 KB	628.1 KB	179.46% (🟢 -1.64%)
/settings/organizations/new	159.71 KB	387.37 KB	110.68% (🟡 +0.48%)
/settings/organizations/privacy	266.34 KB	494 KB	141.14% (🟢 -1.69%)
/settings/organizations/profile	417.35 KB	645 KB	184.29% (🟡 +2.92%)
/settings/organizations/sso	271.41 KB	499.07 KB	142.59% (🟢 -1.69%)
/settings/organizations/teams/other	261.65 KB	489.31 KB	139.80% (🟢 -1.69%)
/settings/organizations/teams/other/[id]/appearance	273.56 KB	501.21 KB	143.20% (🟢 -1.63%)
/settings/organizations/teams/other/[id]/members	268.25 KB	495.91 KB	141.69% (🟢 -1.69%)
/settings/organizations/teams/other/[id]/profile	472.03 KB	699.68 KB	199.91% (🟢 -1.67%)
/settings/platform	259.21 KB	486.87 KB	139.10% (🟢 -1.71%)
/settings/platform/new	120.72 KB	348.37 KB	99.54% (🟡 +0.51%)
/settings/platform/oauth-clients/[clientId]/edit	257.52 KB	485.17 KB	138.62% (🟢 -1.71%)
/settings/platform/oauth-clients/create	256.66 KB	484.32 KB	138.38% (🟢 -1.72%)
/settings/security/impersonation	265.99 KB	493.65 KB	141.04% (🟢 -1.69%)
/settings/security/password	304.23 KB	531.88 KB	151.97% (🟢 -1.65%)
/settings/security/sso	270.86 KB	498.52 KB	142.43% (🟢 -1.69%)
/settings/security/two-factor-auth	269.47 KB	497.13 KB	142.04% (🟢 -1.69%)
/settings/teams	260.32 KB	487.97 KB	139.42% (🟢 -1.69%)
/settings/teams/[id]/appearance	273.54 KB	501.2 KB	143.20% (🟢 -1.64%)
/settings/teams/[id]/billing	260.82 KB	488.48 KB	139.57% (🟢 -1.69%)
/settings/teams/[id]/members	378.37 KB	606.03 KB	173.15% (🟢 -1.68%)
/settings/teams/[id]/profile	472.86 KB	700.51 KB	200.15% (🟢 -1.66%)
/settings/teams/new	193.05 KB	420.71 KB	120.20% (🟢 -1.81%)
/team/[slug]	266.81 KB	494.47 KB	141.28% (🟡 +0.14%)
/team/[slug]/embed	266.88 KB	494.54 KB	141.30% (🟡 +0.15%)
/teams	254.34 KB	481.99 KB	137.71% (🟢 -1.71%)
/upgrade	254.46 KB	482.12 KB	137.75% (🟢 -1.71%)
/video/[uid]	291.31 KB	518.97 KB	148.28% (🟢 -0.15%)
/workflows	286.36 KB	514.02 KB	146.86% (🟢 -1.65%)
/workflows/[workflow]	414.71 KB	642.36 KB	183.53% (🟢 -1.42%)

Details

Only the gzipped size is provided here based on an expert tip.

First Load is the size of the global bundle plus the bundle for the individual page. If a user were to show up to your website and land on a given page, the first load size represents the amount of javascript that user would need to download. If next/link is used, subsequent page loads would only need to download that page's bundle (the number in the "Size" column), since the global bundle has already been downloaded.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

The "Budget %" column shows what percentage of your performance budget the First Load total takes up. For example, if your budget was 100kb, and a given page's first load size was 10kb, it would be 10% of your budget. You can also see how much this has increased or decreased compared to the base branch of your PR. If this percentage has increased by 20% or more, there will be a red status indicator applied, indicating that special attention should be given to this. If you see "+/-

[RajdeepDs]

Hi @keithwillcode, I'm noticing that the tests for this pull request are failing. I'm not entirely familiar with the specific tests required. Could you provide some guidance on how to address these failures?

[hariombalhara]

This one seems to be fixed in later zod versions. I think upgrading zod should fix it everywhere? It seems we haven't updated in a while. So, it is due anyway.

https://github.com/colinhacks/zod/pull/2889

[zomars]

Agreed with @hariombalhara we need to make sure that updateProfile and signup are all using the same regex

[RajdeepDs]

@zomars I have already ensured that updateProfile and signup are all using the same regex.

[RajdeepDs]

@hariombalhara I have made the changes as requested. However, I couldn't figure out what we should use instead of /// @zod.email(). Before committing the changes, I would appreciate your suggestion on this.

[Amit91848]

@RajdeepDs You can import the email schema in /packages/prisma/zod-utils.ts

And then instead of ///@zod.email() it would be ///@zod.custom(imports.emailSchema)

If there are still some doubts you can checkout how zod.custom is being used in other places in schema.prisma

https://github.com/calcom/cal.com/blob/a997edd8dbf77cd4ec5b61f9fe1ce34aaa291c2a/packages/prisma/zod-utils.ts#L112

https://github.com/calcom/cal.com/blob/a997edd8dbf77cd4ec5b61f9fe1ce34aaa291c2a/packages/prisma/schema.prisma#L92-L93

[github-actions[bot]]

This PR is being marked as stale due to inactivity.

[github-actions[bot]]

E2E results are ready!

• Workflow #34619.1 latest results

[github-actions[bot]]

This PR is being marked as stale due to inactivity.

[zomars]

/tip 20 @RajdeepDs

[algora-pbc[bot]]

@RajdeepDs: You just got a $20 tip! 👉 Complete your Algora onboarding to collect your payment.

[algora-pbc[bot]]

🎉🎈 @RajdeepDs has been awarded $20! 🎈🎊

• Share on socials
• Give feedback