fix: Correctly prefill username in case of non-org email invite in an org #12854

hariombalhara · 2023-12-18T14:09:24Z

What does this PR do?

In case of non-org email(e.g. [email protected]) when invited to an org, the signup page shows username as abc instead of abc-gmail - This issue is fixed now. It fixes the issue reported here fix: A user joining from invite link of a team doesn't automatically become member of the org #12774 (comment)
Also, username check wasn't considering the organization scope correctly and thus it was checking the username availability across all orgs - This is fixed now.

Type of change

Bug fix (non-breaking change which fixes an issue)
Tests (Unit/Integration/E2E or any other test)

How should this be tested?

See #12774 (comment) for more details.

Mandatory Tasks

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

… org

vercel · 2023-12-18T14:09:26Z

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

Name	Status	Preview	Comments	Updated (UTC)
api	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Dec 18, 2023 6:43pm
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Dec 18, 2023 6:43pm

5 Ignored Deployments

Name	Status	Preview	Updated (UTC)
ai	⬜️ Ignored (Inspect)	Visit Preview	Dec 18, 2023 6:43pm
cal	⬜️ Ignored (Inspect)	Visit Preview	Dec 18, 2023 6:43pm
cal-demo	⬜️ Ignored (Inspect)	Visit Preview	Dec 18, 2023 6:43pm
qa	⬜️ Ignored (Inspect)	Visit Preview	Dec 18, 2023 6:43pm
ui	⬜️ Ignored (Inspect)	Visit Preview	Dec 18, 2023 6:43pm

hariombalhara · 2023-12-18T14:09:36Z

Current dependencies on/for this PR:

main
- PR fix: Correctly prefill username in case of non-org email invite in an org #12854 👈

This stack of pull requests is managed by Graphite.

github-actions · 2023-12-18T14:09:37Z

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

hariombalhara · 2023-12-18T14:50:30Z

apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx

@@ -74,7 +74,8 @@ const PremiumTextfield = (props: ICustomUsernameProps) => {
  const debouncedApiCall = useMemo(
    () =>
      debounce(async (username: string) => {
-        const { data } = await fetchUsername(username);
+        // TODO: Support orgSlug
+        const { data } = await fetchUsername(username, null);


We should read the orgSlug here from the correct place and pass that on.

github-actions · 2023-12-18T14:52:43Z

📦 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! 🙌

hariombalhara

Self review done

hariombalhara · 2023-12-18T14:53:55Z

apps/web/pages/signup.tsx

  // Detect if the team is an org by either the metadata flag or if it has a parent team
-  const isOrganization = tokenTeam.metadata?.isOrganization || tokenTeam?.parentId !== null;


Better naming

hariombalhara · 2023-12-18T14:56:54Z

apps/web/pages/signup.tsx

@@ -632,7 +637,14 @@ export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {
      prepopulateFormValues: !isOrgInviteByLink
        ? {
            email: verificationToken.identifier,
-            username: slugify(username),
+            username: isOrganizationOrATeamInOrganization


It fixes the prefilling issue.

deploysentinel · 2023-12-18T15:08:19Z

Current Playwright Test Results Summary

✅ 341 Passing - ❌ 2 Failing - ⚠️ 12 Flaky

Run may still be in progress, this comment will be updated as current testing workflow or job completes...

(Last updated on 12/18/2023 03:17:06pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 37c297f

Started: 12/18/2023 03:07:12pm UTC

❌ Failures

📄 apps/web/playwright/organization/organization-invitation.e2e.ts • 1 Failure

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Organization Email matching orgAutoAcceptEmail and a Verified Organization Org Invitation Retry 2 • Retry 1 • Initial Attempt Error: Test timeout of 60000ms exceeded. `Test timeout of 60000ms exceeded.`	-100% (-5) -5 / 5 runs failed over last 7 days	120% (6) 6 / 5 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 1 Failure

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Popup Tests should be able to reschedule Retry 2 • Retry 1 • Initial Attempt Error: Timed out 30000ms waiting for expect(received).toBeVisible()... `Timed out 30000ms waiting for expect(received).toBeVisible() Call log: - expect.toBeVisible with timeout 30000ms - waiting for locator('[data-testid=success-page]') - waiting for locator('[data-testid=success-page]')`	13.70% (37) 37 / 270 runs failed over last 7 days	80.37% (217) 217 / 270 runs flaked over last 7 days

⚠️ Flakes

📄 apps/web/playwright/organization/organization-invitation.e2e.ts • 2 Flakes

Top 1 Common Error Messages

`null`	2 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Organization Email not matching orgAutoAcceptEmail Org Invitation Retry 2 • Retry 1 • Initial Attempt	-112.50% (-9) -9 / 8 runs failed over last 7 days	112.50% (9) 9 / 8 runs flaked over last 7 days
Organization Email not matching orgAutoAcceptEmail Team invitation Retry 2 • Retry 1 • Initial Attempt	-62.50% (-5) -5 / 8 runs failed over last 7 days	100% (8) 8 / 8 runs flaked over last 7 days

📄 apps/web/playwright/team/team-invitation.e2e.ts • 2 Flakes

Top 1 Common Error Messages

`null`	2 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Team Invitation (non verified) Retry 2 • Retry 1 • Initial Attempt	3.77% (10) 10 / 265 runs failed over last 7 days	93.58% (248) 248 / 265 runs flaked over last 7 days
Team Invitation (verified) Retry 1 • Initial Attempt	0% (0) 0 / 265 runs failed over last 7 days	94.72% (251) 251 / 265 runs flaked over last 7 days

📄 apps/web/playwright/teams.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Teams - Org Can create teams via Wizard Retry 1 • Initial Attempt	1.50% (4) 4 / 267 runs failed over last 7 days	14.98% (40) 40 / 267 runs flaked over last 7 days

📄 apps/web/playwright/login.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
user can login & logout succesfully login flow user & logout using dashboard Retry 1 • Initial Attempt	0.37% (1) 1 / 267 run failed over last 7 days	23.22% (62) 62 / 267 runs flaked over last 7 days

📄 apps/web/playwright/settings/upload-avatar.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
UploadAvatar can upload an image Retry 1 • Initial Attempt	0.37% (1) 1 / 268 run failed over last 7 days	5.22% (14) 14 / 268 runs flaked over last 7 days

📄 apps/web/playwright/oauth-provider.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
OAuth Provider should create valid access toke & refresh token for team Retry 1 • Initial Attempt	0.36% (1) 1 / 274 run failed over last 7 days	46.72% (128) 128 / 274 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/preview.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Preview Preview - embed-core should load Retry 1 • Initial Attempt	0% (0) 0 / 267 runs failed over last 7 days	23.22% (62) 62 / 267 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 3 Flakes

Top 1 Common Error Messages

`null`	3 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Popup Tests should open embed iframe on click - Configured with light theme Retry 1 • Initial Attempt	1.11% (3) 3 / 270 runs failed over last 7 days	61.11% (165) 165 / 270 runs flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe according to system theme when no theme is configured through Embed API Retry 1 • Initial Attempt	0.37% (1) 1 / 270 run failed over last 7 days	83.70% (226) 226 / 270 runs flaked over last 7 days
Popup Tests should open Routing Forms embed on click Retry 1 • Initial Attempt	0.37% (1) 1 / 270 run failed over last 7 days	50.37% (136) 136 / 270 runs flaked over last 7 days

View Detailed Build Results

Udit-takkar

LGTM

…_of_non-org_email_invite_in_an_org

fix: Correctly prefill username in case of non-org email invite in an…

c70a2cc

… org

zomars added the core area: core, team members only label Dec 18, 2023

vercel bot deployed to Preview – ai December 18, 2023 14:13 View deployment

vercel bot deployed to Preview – api December 18, 2023 14:14 View deployment

vercel bot deployed to Preview – dev December 18, 2023 14:20 View deployment

hariombalhara mentioned this pull request Dec 18, 2023

fix: A user joining from invite link of a team doesn't automatically become member of the org #12774

Merged

3 tasks

vercel bot deployed to Preview – api December 18, 2023 14:49 View deployment

hariombalhara commented Dec 18, 2023

View reviewed changes

vercel bot deployed to Preview – dev December 18, 2023 14:52 View deployment

hariombalhara force-pushed the 12-18-fix_Correctly_prefill_username_in_case_of_non-org_email_invite_in_an_org branch from f15b504 to 6cbe72f Compare December 18, 2023 14:53

Update test

37c297f

hariombalhara force-pushed the 12-18-fix_Correctly_prefill_username_in_case_of_non-org_email_invite_in_an_org branch from 6cbe72f to 37c297f Compare December 18, 2023 14:56

vercel bot deployed to Preview – api December 18, 2023 15:03 View deployment

hariombalhara commented Dec 18, 2023

View reviewed changes

hariombalhara requested a review from Udit-takkar December 18, 2023 15:03

hariombalhara marked this pull request as ready for review December 18, 2023 15:03

vercel bot deployed to Preview – dev December 18, 2023 15:10 View deployment

Udit-takkar approved these changes Dec 18, 2023

View reviewed changes

Merge branch 'main' into 12-18-fix_Correctly_prefill_username_in_case…

6a8d7d2

…_of_non-org_email_invite_in_an_org

Udit-takkar enabled auto-merge (squash) December 18, 2023 18:36

vercel bot deployed to Preview – api December 18, 2023 18:42 View deployment

vercel bot deployed to Preview – dev December 18, 2023 18:43 View deployment

Udit-takkar merged commit 4b16860 into main Dec 19, 2023
23 checks passed

Udit-takkar deleted the 12-18-fix_Correctly_prefill_username_in_case_of_non-org_email_invite_in_an_org branch December 19, 2023 02:44

hariombalhara mentioned this pull request Dec 19, 2023

fix: [main] Signup can't be done for email matching org domain #12861

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Correctly prefill username in case of non-org email invite in an org #12854

fix: Correctly prefill username in case of non-org email invite in an org #12854

hariombalhara commented Dec 18, 2023 •

edited

Loading

vercel bot commented Dec 18, 2023 •

edited

Loading

hariombalhara commented Dec 18, 2023

github-actions bot commented Dec 18, 2023 •

edited

Loading

hariombalhara Dec 18, 2023

github-actions bot commented Dec 18, 2023 •

edited

Loading

hariombalhara left a comment

hariombalhara Dec 18, 2023

hariombalhara Dec 18, 2023

deploysentinel bot commented Dec 18, 2023 •

edited

Loading

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Udit-takkar left a comment

		// Detect if the team is an org by either the metadata flag or if it has a parent team
		const isOrganization = tokenTeam.metadata?.isOrganization \|\| tokenTeam?.parentId !== null;

fix: Correctly prefill username in case of non-org email invite in an org #12854

fix: Correctly prefill username in case of non-org email invite in an org #12854

Conversation

hariombalhara commented Dec 18, 2023 • edited Loading

What does this PR do?

Type of change

How should this be tested?

Mandatory Tasks

vercel bot commented Dec 18, 2023 • edited Loading

hariombalhara commented Dec 18, 2023

github-actions bot commented Dec 18, 2023 • edited Loading

hariombalhara Dec 18, 2023

Choose a reason for hiding this comment

github-actions bot commented Dec 18, 2023 • edited Loading

📦 Next.js Bundle Analysis for @calcom/web

hariombalhara left a comment

Choose a reason for hiding this comment

hariombalhara Dec 18, 2023

Choose a reason for hiding this comment

hariombalhara Dec 18, 2023

Choose a reason for hiding this comment

deploysentinel bot commented Dec 18, 2023 • edited Loading

Current Playwright Test Results Summary

❌ Failures

Test Case Results

Test Case Results

⚠️ Flakes

Top 1 Common Error Messages

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Udit-takkar left a comment

Choose a reason for hiding this comment

hariombalhara commented Dec 18, 2023 •

edited

Loading

vercel bot commented Dec 18, 2023 •

edited

Loading

github-actions bot commented Dec 18, 2023 •

edited

Loading

github-actions bot commented Dec 18, 2023 •

edited

Loading

deploysentinel bot commented Dec 18, 2023 •

edited

Loading