chore: redirect platform users to dashboard #15361

Ryukemeister · 2024-06-06T19:44:53Z

What does this PR do?

This PR adds a redirect for all platform clients to make sure that a platform user is not able to access any of the consumer related pages.

Mandatory Tasks (DO NOT REMOVE)

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)

How should this be tested?

Run the webapp on localhost, go to settings/platform/new and make a new platform client. Once that is done and billing is setup for platform, if we try to navigate to any of the pages such as /event-types or /availability we should automatically be redirected to /settings/platform

CLAassistant · 2024-06-06T19:45:00Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
3 out of 4 committers have signed the CLA.

✅ ThyMinimalDev
✅ keithwillcode
✅ Ryukemeister
❌ Rajiv Sahal

Rajiv Sahal seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

github-actions · 2024-06-06T19:45:04Z

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

vercel · 2024-06-06T19:47:20Z

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

Name	Status	Preview	Comments	Updated (UTC)
ai	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jun 27, 2024 9:39pm

2 Ignored Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Jun 27, 2024 9:39pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Jun 27, 2024 9:39pm

graphite-app · 2024-06-06T19:50:12Z

Graphite Automations

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

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

PeerRich · 2024-06-07T17:57:37Z

is there any way we dont add this much platfrom related code to our core code base? 🤔

PeerRich · 2024-06-13T20:39:49Z

E2E failing / flaky

hariombalhara · 2024-06-21T08:34:47Z

apps/web/components/PageWrapper.tsx

+
+  useEffect(() => {
+    // is platform user trying to access a non-platform page, redirect to platform dashboard
+    if (isPlatformUser && pathName && !pathName.startsWith("/settings")) {


Suggested change

if (isPlatformUser && pathName && !pathName.startsWith("/settings")) {

if (!isPlatformUser || !pathName) {

return

}

if(!pathName.startsWith("/settings")) {

https://handbook.cal.com/engineering/best-practices/prefer-early-returns

hariombalhara · 2024-06-21T08:41:29Z

apps/web/components/PageWrapper.tsx

@@ -27,6 +30,23 @@ const calFont = localFont({
  weight: "600",
 });

+const Redirects = () => {


We should either rename it to convey that it is doing redirects related to platform or we can abstract the platform related logic out of this Component.

hariombalhara · 2024-06-21T09:11:08Z

apps/web/components/PageWrapper.tsx

+  const router = useRouter();
+  const pathName = usePathname();
+  // is the connected user in a platform organization or not
+  const isPlatformUser = session?.data?.isPlatformUser ?? false;


getInitialProps doesn't run on SSG pages AFAIU, so this isn't correctly set there.

https://www.loom.com/share/21300c444d934f63915f9c57f2325d52

hariombalhara

Everything looks good, except that the redirect doesn't work on SSG pages it seems.

Note that I am test in production mode(not on dev server)
https://github.com/calcom/cal.com/pull/15361/files#r1648663192

github-actions · 2024-07-12T00:18:28Z

This PR is being marked as stale due to inactivity.

keithwillcode · 2024-07-29T04:10:58Z

Closing this PR due to staleness. Please reopen if work is to continue.

ThyMinimalDev and others added 4 commits May 30, 2024 15:26

chore: redirect platform users to dashboard

8907da1

update AppProps typing to include isPlatformUser

340d8a4

fixup

9b719d4

get isPlatformUser boolean from user and then redirect user accordingly

7894dee

keithwillcode added core area: core, team members only platform Anything related to our platform plan labels Jun 6, 2024

graphite-app bot requested a review from a team June 6, 2024 19:45

vercel bot deployed to Preview – ai June 6, 2024 19:47 View deployment

vercel bot had a problem deploying to Preview – api June 6, 2024 19:47 Failure

vercel bot deployed to Preview – dev June 6, 2024 19:56 View deployment

fix type checks

6da42d6

vercel bot deployed to Preview – ai June 6, 2024 19:59 View deployment

Merge branch 'main' into redirect-platform-users-to-dashboard

b35d6ba

vercel bot deployed to Preview – ai June 6, 2024 20:09 View deployment

vercel bot deployed to Preview – api June 6, 2024 20:13 View deployment

vercel bot deployed to Preview – dev June 6, 2024 20:24 View deployment

Rajiv Sahal and others added 2 commits June 7, 2024 03:09

minor refactor

35338cc

Merge branch 'main' into redirect-platform-users-to-dashboard

f26f9f0

vercel bot deployed to Preview – ai June 6, 2024 21:45 View deployment

vercel bot deployed to Preview – api June 6, 2024 21:51 View deployment

vercel bot deployed to Preview – dev June 6, 2024 22:04 View deployment

keithwillcode added this to the v4.2 milestone Jun 7, 2024

PeerRich added the Medium priority Created by Linear-GitHub Sync label Jun 7, 2024

Merge branch 'main' into redirect-platform-users-to-dashboard

69e4e7b

vercel bot deployed to Preview – ai June 11, 2024 17:19 View deployment

Merge branch 'main' into redirect-platform-users-to-dashboard

dc14b0b

ThyMinimalDev enabled auto-merge June 13, 2024 15:15

ThyMinimalDev added this pull request to the merge queue Jun 13, 2024

vercel bot deployed to Preview – ai June 13, 2024 15:20 View deployment

vercel bot deployed to Preview – api June 13, 2024 15:27 View deployment

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 13, 2024

vercel bot deployed to Preview – dev June 13, 2024 16:12 View deployment

PeerRich added this pull request to the merge queue Jun 13, 2024

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 13, 2024

keithwillcode modified the milestones: v4.2, v4.3 Jun 17, 2024

PeerRich added this pull request to the merge queue Jun 19, 2024

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 19, 2024

hariombalhara reviewed Jun 21, 2024

View reviewed changes

hariombalhara requested changes Jun 21, 2024

View reviewed changes

Merge branch 'main' into redirect-platform-users-to-dashboard

f796938

vercel bot deployed to Preview – ai June 27, 2024 21:39 View deployment

vercel bot deployed to Preview – api June 27, 2024 21:43 View deployment

vercel bot deployed to Preview – dev June 27, 2024 22:28 View deployment

github-actions bot added the Stale label Jul 12, 2024

keithwillcode modified the milestones: v4.3, v4.4 Jul 16, 2024

github-actions bot removed the Stale label Jul 17, 2024

keithwillcode closed this Jul 29, 2024

dosubot bot removed this from the v4.4 milestone Jul 29, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: redirect platform users to dashboard #15361

chore: redirect platform users to dashboard #15361

Ryukemeister commented Jun 6, 2024 •

edited

Loading

CLAassistant commented Jun 6, 2024 •

edited

Loading

github-actions bot commented Jun 6, 2024 •

edited

Loading

vercel bot commented Jun 6, 2024 •

edited

Loading

graphite-app bot commented Jun 6, 2024

PeerRich commented Jun 7, 2024

PeerRich commented Jun 13, 2024

hariombalhara Jun 21, 2024

hariombalhara Jun 21, 2024

hariombalhara Jun 21, 2024

hariombalhara left a comment •

edited

Loading

github-actions bot commented Jul 12, 2024

keithwillcode commented Jul 29, 2024

-    if (isPlatformUser && pathName && !pathName.startsWith("/settings")) {
+    if (!isPlatformUser || !pathName) {
+      return
+    }
+    if(!pathName.startsWith("/settings")) {

chore: redirect platform users to dashboard #15361

chore: redirect platform users to dashboard #15361

Conversation

Ryukemeister commented Jun 6, 2024 • edited Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

CLAassistant commented Jun 6, 2024 • edited Loading

github-actions bot commented Jun 6, 2024 • edited Loading

vercel bot commented Jun 6, 2024 • edited Loading

graphite-app bot commented Jun 6, 2024

Graphite Automations

PeerRich commented Jun 7, 2024

PeerRich commented Jun 13, 2024

hariombalhara Jun 21, 2024

Choose a reason for hiding this comment

hariombalhara Jun 21, 2024

Choose a reason for hiding this comment

hariombalhara Jun 21, 2024

Choose a reason for hiding this comment

hariombalhara left a comment • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Jul 12, 2024

keithwillcode commented Jul 29, 2024

Ryukemeister commented Jun 6, 2024 •

edited

Loading

CLAassistant commented Jun 6, 2024 •

edited

Loading

github-actions bot commented Jun 6, 2024 •

edited

Loading

vercel bot commented Jun 6, 2024 •

edited

Loading

hariombalhara left a comment •

edited

Loading