fix: Support adding a non-existent email as the owner of the organization #14569

hariombalhara · 2024-04-13T11:46:06Z

What does this PR do?

Fixes #14779
Fixes CAL-3566

Loom(https://www.loom.com/share/2da4f13d16874639ba66cf174052b7bb)

Also, now if a user can't be invited, an error is shown instead of silently ignoring the problem

Type of change

New feature (non-breaking change which adds functionality)

How should this be tested?

Go to settings/organizations/new and provide an email that doesn't exist in DB yet
Go with the flow

Automated Tests

Added a test to verify the new flow.
Modified existing test that creates an organization for existing user to verify emails as well.

Mandatory Tasks

Make sure you have self-reviewed the code. A decent size PR without self-review might be rejected.

vercel · 2024-04-13T11:46:11Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
platform-starter-kit	❌ Failed (Inspect)			May 5, 2024 9:15pm

4 Ignored Deployments

Name	Status	Preview	Updated (UTC)
ai	⬜️ Ignored (Inspect)	Visit Preview	May 5, 2024 9:15pm
cal	⬜️ Ignored (Inspect)	Visit Preview	May 5, 2024 9:15pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview	May 5, 2024 9:15pm
qa-not-in-use	⬜️ Ignored (Inspect)	Visit Preview	May 5, 2024 9:15pm

github-actions · 2024-04-13T11:46:18Z

Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link.

hariombalhara · 2024-04-13T11:46:20Z

fix: Support adding a non-existent email as the owner of the organization #14569 👈
main

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @hariombalhara and the rest of your teammates on Graphite

…ation

github-actions · 2024-04-13T12:16:10Z

📦 Next.js Bundle Analysis for @calcom/web

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

This PR introduced no changes to the JavaScript bundle! 🙌

deploysentinel · 2024-04-13T12:17:40Z

No failed tests 🎉

…ing_an_non-existent_email_as_the_owner_of_the_organization

linear · 2024-04-27T10:20:49Z

CAL-3566 Allow admin to create an organization with a non-existent user

…il_as_the_owner_of_the_organization

joeauyeung

Great work so far @hariombalhara.

I would say the only blocking comment I have is around user creation. Other than that all my other comments are non-blocking.

Non-blocking

If there is no name, maybe we don't include the "Hi, {email}". Feels weird

If the user didn't exist before, can we add the email verification link in this email as well?

packages/lib/server/repository/user.ts

packages/trpc/server/routers/viewer/organizations/create.handler.ts

packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.ts

…il_as_the_owner_of_the_organization

…er.ts Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>

…existent_email_as_the_owner_of_the_organization' into 04-13-fix_support_adding_an_non-existent_email_as_the_owner_of_the_organization

hariombalhara · 2024-05-03T07:06:13Z

If there is no name, maybe we don't include the "Hi, {email}". Feels weird

I think you meant 'Hi, {username}'. This is an existing verification email and we send username only in there. Could be an improvement though.

If the user didn't exist before, can we add the email verification link in this email as well?

I wanted to keep the approach simple. This would complicate the organization creation email more. We can certainly do it if needed later.

…il_as_the_owner_of_the_organization

joeauyeung

Comments have been resolved or are out of scope for this PR. As always a great discussion @hariombalhara

…il_as_the_owner_of_the_organization

shirazdole · 2024-05-08T03:46:54Z

Nice! Does this extend to Platform as well? cc @hariombalhara (can someone tag Morgan idk his github name lol) or do we still have to make sure Platform users create an account?

hariombalhara · 2024-05-08T04:24:06Z

cc @ThyMinimalDev

github-actions bot added the ❗️ migrations contains migration files label Apr 13, 2024

keithwillcode added consumer core area: core, team members only labels Apr 13, 2024

vercel bot deployed to Preview – ai April 13, 2024 11:48 View deployment

hariombalhara force-pushed the 04-13-fix_support_adding_an_non-existent_email_as_the_owner_of_the_organization branch from 785281e to 9601522 Compare April 13, 2024 11:50

vercel bot deployed to Preview – ai April 13, 2024 11:53 View deployment

vercel bot had a problem deploying to Preview – api April 13, 2024 11:55 Failure

fix: Support adding an non-existent email as the owner of the organiz…

aebad2e

…ation

hariombalhara force-pushed the 04-13-fix_support_adding_an_non-existent_email_as_the_owner_of_the_organization branch from 9601522 to aebad2e Compare April 13, 2024 11:59

vercel bot deployed to Preview – ai April 13, 2024 12:01 View deployment

vercel bot deployed to Preview – api April 13, 2024 12:11 View deployment

vercel bot deployed to Preview – dev April 13, 2024 12:22 View deployment

hariombalhara added 2 commits April 14, 2024 13:42

Merge remote-tracking branch 'origin/main' into 04-13-fix_support_add…

f88758f

…ing_an_non-existent_email_as_the_owner_of_the_organization

Merge remote-tracking branch 'origin/main' into 04-13-fix_support_add…

719d1c4

…ing_an_non-existent_email_as_the_owner_of_the_organization

hariombalhara force-pushed the 04-13-fix_support_adding_an_non-existent_email_as_the_owner_of_the_organization branch from 1eff72c to 719d1c4 Compare April 14, 2024 08:13

vercel bot deployed to Preview – api April 14, 2024 08:19 View deployment

vercel bot deployed to Preview – dev April 14, 2024 08:32 View deployment

keithwillcode added this to the v4.1 milestone Apr 16, 2024

hariombalhara added 3 commits April 27, 2024 14:28

Remove dead code

0f8a776

Merge remote-tracking branch 'origin/main' into 04-13-fix_support_add…

e504d5e

…ing_an_non-existent_email_as_the_owner_of_the_organization

fixes

054c0cd

vercel bot had a problem deploying to Preview – platform-starter-kit April 27, 2024 10:13 Failure

vercel bot deployed to Preview – ai April 27, 2024 10:15 View deployment

vercel bot deployed to Preview – api April 27, 2024 10:19 View deployment

Merge branch 'main' into 04-13-fix_support_adding_an_non-existent_ema…

8ed5991

…il_as_the_owner_of_the_organization

vercel bot deployed to Preview – api May 2, 2024 14:26 View deployment

vercel bot had a problem deploying to Preview – dev May 2, 2024 14:31 Failure

joeauyeung requested changes May 2, 2024

View reviewed changes

packages/lib/server/repository/user.ts Show resolved Hide resolved

packages/trpc/server/routers/viewer/organizations/create.handler.ts Outdated Show resolved Hide resolved

packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.ts Outdated Show resolved Hide resolved

Merge branch 'main' into 04-13-fix_support_adding_an_non-existent_ema…

ecef7fb

…il_as_the_owner_of_the_organization

vercel bot deployed to Preview – ai May 2, 2024 15:37 View deployment

vercel bot deployed to Preview – api May 2, 2024 15:45 View deployment

vercel bot had a problem deploying to Preview – dev May 2, 2024 16:15 Failure

hariombalhara and others added 3 commits May 3, 2024 12:24

Update packages/trpc/server/routers/viewer/organizations/create.handl…

49408c9

…er.ts Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>

Fix typo everywhere

eb4cd2e

Merge remote-tracking branch 'origin/04-13-fix_support_adding_an_non-…

9f9a7df

…existent_email_as_the_owner_of_the_organization' into 04-13-fix_support_adding_an_non-existent_email_as_the_owner_of_the_organization

vercel bot deployed to Preview – api May 3, 2024 07:06 View deployment

hariombalhara requested a review from joeauyeung May 3, 2024 07:08

vercel bot deployed to Preview – dev May 3, 2024 07:17 View deployment

joeauyeung mentioned this pull request May 3, 2024

[CAL-3632] On signup, use the UserRepository.create method #14869

Open

Merge branch 'main' into 04-13-fix_support_adding_an_non-existent_ema…

7eb4d8f

…il_as_the_owner_of_the_organization

joeauyeung approved these changes May 3, 2024

View reviewed changes

vercel bot deployed to Preview – ai May 3, 2024 14:36 View deployment

vercel bot deployed to Preview – api May 3, 2024 14:39 View deployment

vercel bot deployed to Preview – dev May 3, 2024 14:46 View deployment

Merge branch 'main' into 04-13-fix_support_adding_an_non-existent_ema…

87757eb

…il_as_the_owner_of_the_organization

PeerRich approved these changes May 5, 2024

View reviewed changes

vercel bot deployed to Preview – api May 5, 2024 21:20 View deployment

vercel bot deployed to Preview – dev May 5, 2024 21:26 View deployment

hariombalhara enabled auto-merge (squash) May 6, 2024 07:04

hariombalhara merged commit 3a0c766 into main May 6, 2024
41 checks passed

hariombalhara deleted the 04-13-fix_support_adding_an_non-existent_email_as_the_owner_of_the_organization branch May 6, 2024 07:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Support adding a non-existent email as the owner of the organization #14569

fix: Support adding a non-existent email as the owner of the organization #14569

hariombalhara commented Apr 13, 2024 •

edited

vercel bot commented Apr 13, 2024 •

edited

github-actions bot commented Apr 13, 2024 •

edited

hariombalhara commented Apr 13, 2024

github-actions bot commented Apr 13, 2024 •

edited

deploysentinel bot commented Apr 13, 2024 •

edited

linear bot commented Apr 27, 2024

joeauyeung left a comment

hariombalhara commented May 3, 2024 •

edited

joeauyeung left a comment

shirazdole commented May 8, 2024

hariombalhara commented May 8, 2024

fix: Support adding a non-existent email as the owner of the organization #14569

fix: Support adding a non-existent email as the owner of the organization #14569

Conversation

hariombalhara commented Apr 13, 2024 • edited

What does this PR do?

Type of change

How should this be tested?

Automated Tests

Mandatory Tasks

vercel bot commented Apr 13, 2024 • edited

github-actions bot commented Apr 13, 2024 • edited

hariombalhara commented Apr 13, 2024

github-actions bot commented Apr 13, 2024 • edited

📦 Next.js Bundle Analysis for @calcom/web

deploysentinel bot commented Apr 13, 2024 • edited

linear bot commented Apr 27, 2024

joeauyeung left a comment

Choose a reason for hiding this comment

Non-blocking

hariombalhara commented May 3, 2024 • edited

joeauyeung left a comment

Choose a reason for hiding this comment

shirazdole commented May 8, 2024

hariombalhara commented May 8, 2024

hariombalhara commented Apr 13, 2024 •

edited

vercel bot commented Apr 13, 2024 •

edited

github-actions bot commented Apr 13, 2024 •

edited

github-actions bot commented Apr 13, 2024 •

edited

deploysentinel bot commented Apr 13, 2024 •

edited

hariombalhara commented May 3, 2024 •

edited