fix: Embed Plus Org - Adds missing embed route, also fixes infinite redirection for migrated user in embed #12071

hariombalhara · 2023-10-25T02:56:47Z

What does this PR do?

Fixes infinite redirect in embed for migrated users
- Also, fixes existing query params not being forwarded.
Fixes never implemented /embed route for Org user profile page.

Added unit tests as well for the two important functions involved here.

Type of change

Bug fix (non-breaking change which fixes an issue)

How should this be tested?

Try visiting calcom.cal.local:3000/{ORG_USER}/embed - It was earlier giving 404
Migrate a user using /moveToOrg and open that user's old link app.cal.local:3000/{OLD_USER_NAME}/embed. It would go in infinite redirection

Mandatory Tasks

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

Checklist

I haven't added tests that prove my fix is effective or that my feature works

vercel · 2023-10-25T02:56:49Z

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

Name	Status	Preview	Comments	Updated (UTC)
ai	❌ Failed (Inspect)			Oct 26, 2023 3:53am
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Oct 26, 2023 3:53am

5 Ignored Deployments

Name	Status	Preview	Updated (UTC)
api	⬜️ Ignored (Inspect)	Visit Preview	Oct 26, 2023 3:53am
cal	⬜️ Ignored (Inspect)	Visit Preview	Oct 26, 2023 3:53am
cal-demo	⬜️ Ignored (Inspect)	Visit Preview	Oct 26, 2023 3:53am
qa	⬜️ Ignored (Inspect)	Visit Preview	Oct 26, 2023 3:53am
ui	⬜️ Ignored (Inspect)	Visit Preview	Oct 26, 2023 3:53am

github-actions · 2023-10-25T02:57:02Z

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

hariombalhara · 2023-10-25T02:59:08Z

apps/web/lib/withEmbedSsr.tsx

@@ -15,10 +15,9 @@ export default function withEmbedSsr(getServerSideProps: GetServerSideProps) {
      const destinationUrlObj = new URL(ssrResponse.redirect.destination, "https://base");

      // Make sure that redirect happens to /embed page and pass on embed query param as is for preserving Cal JS API namespace
-      const newDestinationUrl = `${
+      const newDestinationUrl = `${destinationUrlObj.origin}${


With the recent redirect being on another domain, it is important to use the origin as well otherwise it causes infinite redirect.

Flow:
User Migrated to Org Redirect(to org domain) -> This embed redirect (Stays on org domain) -> On Org domain, no redirect needed.

hariombalhara · 2023-10-25T02:59:51Z

apps/web/pages/org/[orgSlug]/[user]/embed.tsx

This caused an org member profile page to give 404 in embed.

hariombalhara · 2023-10-25T04:10:45Z

apps/web/pages/org/[orgSlug]/[user]/embed.tsx

Missing routes, caused an org member profile page to give 404 in embed.

github-actions · 2023-10-25T04:17:06Z

📦 Next.js Bundle Analysis for @calcom/web

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

New Page Added

The following page was added to the bundle from the code in this PR:

Page	Size (compressed)	First Load	% of Budget (`350 KB`)
`/org/[orgSlug]/[user]/embed`	`226.14 KB`	382.25 KB	109.22%

deploysentinel · 2023-10-25T04:17:57Z

Current Playwright Test Results Summary

✅ 208 Passing - ⚠️ 2 Flaky

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

(Last updated on 10/26/2023 03:55:37am UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 96f6b88

Started: 10/26/2023 03:52:23am UTC

⚠️ Flakes

📄 packages/embeds/embed-core/playwright/tests/action-based.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
Popup Tests should open embed iframe on click - Configured with light theme Retry 1 • Initial Attempt	0.69% (2) 2 / 291 runs failed over last 7 days	46.39% (135) 135 / 291 runs flaked over last 7 days
Popup Tests should be able to reschedule Retry 1 • Initial Attempt	8.62% (25) 25 / 290 runs failed over last 7 days	88.62% (257) 257 / 290 runs flaked over last 7 days

View Detailed Build Results

hariombalhara · 2023-10-25T08:35:15Z

apps/web/lib/getTemporaryOrgRedirect.ts

    return {
      redirect: {
        permanent: false,
-        destination: eventTypeSlug ? `${redirect.toUrl}/${eventTypeSlug}` : redirect.toUrl,
+        destination: `${newDestination}${currentQueryString ? `?${currentQueryString}` : ""}`,


Current query params aren't automatically forwarded, so this does that.

ThyMinimalDev

LGTM

…edirection for migrated user in embed (#12071)

…edirection for migrated user in embed (calcom#12071)

vercel bot had a problem deploying to Preview – ai October 25, 2023 02:56 Failure

zomars added the core area: core, team members only label Oct 25, 2023

hariombalhara commented Oct 25, 2023

View reviewed changes

apps/web/pages/org/[orgSlug]/[user]/embed.tsx Outdated

Copy link

Member Author

hariombalhara Oct 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This caused an org member profile page to give 404 in embed.

vercel bot had a problem deploying to Preview – dev October 25, 2023 03:04 Failure

hariombalhara changed the title ~~Add missing embed routes and fix infinite redirect for redirected links~~ fix: Embed Plus Org - Adds missing embed route, also fixes infinite redirection Oct 25, 2023

hariombalhara changed the title ~~fix: Embed Plus Org - Adds missing embed route, also fixes infinite redirection~~ fix: Embed Plus Org - Adds missing embed route, also fixes infinite redirection for migrated user in embed Oct 25, 2023

hariombalhara force-pushed the fix/embed-orgs branch from a47cc7f to d57938e Compare October 25, 2023 04:10

vercel bot had a problem deploying to Preview – ai October 25, 2023 04:10 Failure

hariombalhara commented Oct 25, 2023

View reviewed changes

hariombalhara added High priority Created by Linear-GitHub Sync organizations area: organizations, orgs labels Oct 25, 2023

hariombalhara self-assigned this Oct 25, 2023

hariombalhara marked this pull request as ready for review October 25, 2023 04:15

vercel bot deployed to Preview – dev October 25, 2023 04:19 View deployment

hariombalhara force-pushed the fix/embed-orgs branch from d57938e to c0d01c9 Compare October 25, 2023 07:52

vercel bot had a problem deploying to Preview – ai October 25, 2023 07:53 Failure

vercel bot deployed to Preview – dev October 25, 2023 07:59 View deployment

hariombalhara force-pushed the fix/embed-orgs branch from c0d01c9 to 4d3044a Compare October 25, 2023 08:29

vercel bot had a problem deploying to Preview – ai October 25, 2023 08:29 Failure

Add missing embed routes and fix infinite redirect for redirected links

dfbf1fe

hariombalhara commented Oct 25, 2023

View reviewed changes

vercel bot deployed to Preview – dev October 25, 2023 08:36 View deployment

hariombalhara force-pushed the fix/embed-orgs branch from 4d3044a to dfbf1fe Compare October 25, 2023 08:38

vercel bot had a problem deploying to Preview – ai October 25, 2023 08:39 Failure

vercel bot deployed to Preview – dev October 25, 2023 08:45 View deployment

Add unit tests

3c2f016

vercel bot had a problem deploying to Preview – ai October 25, 2023 11:25 Failure

vercel bot deployed to Preview – dev October 25, 2023 11:31 View deployment

hariombalhara force-pushed the fix/embed-orgs branch from 6e59fc9 to 8ba8781 Compare October 25, 2023 11:31

vercel bot had a problem deploying to Preview – ai October 25, 2023 11:31 Failure

vercel bot deployed to Preview – dev October 25, 2023 11:37 View deployment

Add withEmbedSsr.test

60af584

hariombalhara force-pushed the fix/embed-orgs branch from 8ba8781 to 60af584 Compare October 25, 2023 13:03

vercel bot had a problem deploying to Preview – ai October 25, 2023 13:03 Failure

vercel bot deployed to Preview – dev October 25, 2023 13:09 View deployment

Merge remote-tracking branch 'origin/main' into fix/embed-orgs

46574f9

vercel bot had a problem deploying to Preview – ai October 26, 2023 02:55 Failure

vercel bot deployed to Preview – dev October 26, 2023 02:59 View deployment

Fix flaky seated test

96f6b88

vercel bot had a problem deploying to Preview – ai October 26, 2023 03:49 Failure

vercel bot deployed to Preview – dev October 26, 2023 03:53 View deployment

ThyMinimalDev approved these changes Oct 26, 2023

View reviewed changes

hariombalhara merged commit bf8580f into main Oct 26, 2023
36 of 37 checks passed

hariombalhara deleted the fix/embed-orgs branch October 26, 2023 08:12

hariombalhara added a commit that referenced this pull request Oct 27, 2023

fix: Embed Plus Org - Adds missing embed route, also fixes infinite r…

425aca6

…edirection for migrated user in embed (#12071)

hariombalhara added a commit that referenced this pull request Oct 27, 2023

fix: Embed Plus Org - Adds missing embed route, also fixes infinite r…

32ce34a

…edirection for migrated user in embed (#12071)

hariombalhara added a commit that referenced this pull request Oct 27, 2023

fix: Embed Plus Org - Adds missing embed route, also fixes infinite r…

46690d4

…edirection for migrated user in embed (#12071)

hbjORbj pushed a commit to codemod-com/cal.com-demo that referenced this pull request Nov 28, 2023

fix: Embed Plus Org - Adds missing embed route, also fixes infinite r…

05f0783

…edirection for migrated user in embed (calcom#12071)

hbjORbj pushed a commit to codemod-com/cal.com-demo that referenced this pull request Dec 21, 2023

fix: Embed Plus Org - Adds missing embed route, also fixes infinite r…

1b9aaf7

…edirection for migrated user in embed (calcom#12071)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Embed Plus Org - Adds missing embed route, also fixes infinite redirection for migrated user in embed #12071

fix: Embed Plus Org - Adds missing embed route, also fixes infinite redirection for migrated user in embed #12071

hariombalhara commented Oct 25, 2023 •

edited

vercel bot commented Oct 25, 2023 •

edited

github-actions bot commented Oct 25, 2023 •

edited

hariombalhara Oct 25, 2023 •

edited

hariombalhara Oct 25, 2023

hariombalhara Oct 25, 2023

github-actions bot commented Oct 25, 2023 •

edited

deploysentinel bot commented Oct 25, 2023 •

edited

Top 1 Common Error Messages

Test Case Results

hariombalhara Oct 25, 2023

ThyMinimalDev left a comment

fix: Embed Plus Org - Adds missing embed route, also fixes infinite redirection for migrated user in embed #12071

fix: Embed Plus Org - Adds missing embed route, also fixes infinite redirection for migrated user in embed #12071

Conversation

hariombalhara commented Oct 25, 2023 • edited

What does this PR do?

Type of change

How should this be tested?

Mandatory Tasks

Checklist

vercel bot commented Oct 25, 2023 • edited

github-actions bot commented Oct 25, 2023 • edited

hariombalhara Oct 25, 2023 • edited

Choose a reason for hiding this comment

hariombalhara Oct 25, 2023

Choose a reason for hiding this comment

hariombalhara Oct 25, 2023

Choose a reason for hiding this comment

github-actions bot commented Oct 25, 2023 • edited

📦 Next.js Bundle Analysis for @calcom/web

New Page Added

deploysentinel bot commented Oct 25, 2023 • edited

Current Playwright Test Results Summary

⚠️ Flakes

Top 1 Common Error Messages

Test Case Results

hariombalhara Oct 25, 2023

Choose a reason for hiding this comment

ThyMinimalDev left a comment

Choose a reason for hiding this comment

hariombalhara commented Oct 25, 2023 •

edited

vercel bot commented Oct 25, 2023 •

edited

github-actions bot commented Oct 25, 2023 •

edited

hariombalhara Oct 25, 2023 •

edited

github-actions bot commented Oct 25, 2023 •

edited

deploysentinel bot commented Oct 25, 2023 •

edited