fix: Use Memberships with OWNER role for platform owner lookup #22475

sahitya-chandra · 2025-07-14T11:49:44Z

What does this PR do?

Replaced the logic for identifying the platform owner from the Profiles table (ordered by createdAt) with a direct lookup in the Memberships table using the 'OWNER' role. This prevents managed users from being mistakenly treated as platform owners if the original owner is deleted.

Fixes refactor: v2 get platform owner id #22466
Fixes CAL-6090 (Linear issue number - should be visible at the bottom of the GitHub issue description)

Visual Demo (For contributors especially)

A visual demonstration is strongly recommended, for both the original and new change (video / image - any one).

Video Demo (if applicable):

Show screen recordings of the issue or feature.
Demonstrate how to reproduce the issue, the behavior before and after the change.

Image Demo (if applicable):

Add side-by-side screenshots of the original and updated change.
Highlight any significant change(s).

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Are there environment variables that should be set?
What are the minimal test data to have?
What is expected (happy path) to have (input and output)?
Any other important info that could help to test that PR

Checklist

I haven't read the contributing guide
My code doesn't follow the style guidelines of this project
I haven't commented my code, particularly in hard-to-understand areas
I haven't checked if my changes generate no new warnings

Summary by cubic

Changed platform owner lookup to use the Memberships table with the OWNER role instead of Profiles, ensuring only valid owners are identified.

Bug Fixes
- Prevents managed users from being set as platform owners if the original owner is deleted.

vercel · 2025-07-14T11:49:51Z

@sahitya-chandra is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

CLAassistant · 2025-07-14T11:49:51Z

All committers have signed the CLA.

graphite-app · 2025-07-14T11:50:11Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (07/14/25)

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

"Add community label" took an action on this PR • (07/14/25)

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

cubic-dev-ai

cubic reviewed 2 files and found no issues. Review PR in cubic.dev.

apps/api/v2/src/modules/auth/strategies/api-auth/api-auth.strategy.ts

apps/api/v2/src/modules/memberships/memberships.repository.ts

coderabbitai · 2025-07-15T13:43:29Z

Walkthrough

ApiAuthStrategy now injects MembershipsRepository and calls membershipsRepository.findPlatformOwnerUserId(client.organizationId) in oAuthClientStrategy instead of profilesRepository.getPlatformOwnerUserId(...). A new MembershipsRepository.findPlatformOwnerUserId(organizationId) method was added; it queries memberships for teamId = organizationId, role = "OWNER", accepted = true and returns the owner userId or null. No other logic or error handling changes were made.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Assessment against linked issues

Objective	Addressed	Explanation
Replace profilesRepository.getPlatformOwnerUserId usage in oAuthClientStrategy to avoid returning managed users (#22466, CAL-6090)	✅
Add repository method to find platform owner by role+membership status (MembershipsRepository.findPlatformOwnerUserId) (#22466, CAL-6090)	✅

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 5af69cc and bfdcd45.

📒 Files selected for processing (1)

apps/api/v2/src/modules/auth/strategies/api-auth/api-auth.strategy.ts (3 hunks)

🚧 Files skipped from review as they are similar to previous changes (1)

apps/api/v2/src/modules/auth/strategies/api-auth/api-auth.strategy.ts

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)

GitHub Check: Install dependencies / Yarn install & cache

✨ Finishing Touches

📝 Generate Docstrings

🧪 Generate unit tests

Create PR with unit tests
Post copyable unit tests in a comment

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Explain this complex logic.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai explain this code block.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and explain its main purpose.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR.
@coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
@coderabbitai generate unit tests to generate unit tests for this PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

coderabbitai

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 8ee7b12 and 764ab75.

📒 Files selected for processing (2)

apps/api/v2/src/modules/auth/strategies/api-auth/api-auth.strategy.ts (3 hunks)
apps/api/v2/src/modules/memberships/memberships.repository.ts (1 hunks)

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (2)

GitHub Check: Install dependencies / Yarn install & cache
GitHub Check: Security Check

🔇 Additional comments (3)

apps/api/v2/src/modules/memberships/memberships.repository.ts (1)

23-36: LGTM! The method correctly implements platform owner lookup.

The implementation properly queries the membership table with the correct filters (teamId, role, accepted) and handles the null case appropriately. This addresses the issue where the previous approach could incorrectly identify managed users as platform owners.

apps/api/v2/src/modules/auth/strategies/api-auth/api-auth.strategy.ts (2)

7-7: LGTM! Dependency injection implemented correctly.

The MembershipsRepository is properly imported and injected following the established patterns in the codebase.

Also applies to: 62-62

188-188: LGTM! Method call change correctly implements the fix.

The change from profilesRepository.getPlatformOwnerUserId to membershipsRepository.findPlatformOwnerUserId properly addresses the issue where managed users could be incorrectly identified as platform owners. The new approach correctly validates actual ownership through membership roles.

apps/api/v2/src/modules/memberships/memberships.repository.ts

Devanshusharma2005

hey @sahitya-chandra thanks for the pr, can you please address the unit test failing. Also it will be good to add a loom.

sahitya-chandra · 2025-07-21T13:27:14Z

@Devanshusharma2005 unit tests have been passed, and the changes are also not complex.

sahitya-chandra · 2025-07-28T12:07:52Z

@anikdhabal can you review this sir...

kart1ka · 2025-07-28T12:30:11Z

@sahitya-chandra We will review it. Can you pls add a loom video?

sahitya-chandra · 2025-08-11T17:32:02Z

@kart1ka sir, I am unable to create a loom video of this fix because locally running the api needs x_cal_secret which I don't have...

fix platform owner identification to use Memberships with OWNER role

dcc56da

sahitya-chandra requested review from a team as code owners July 14, 2025 11:49

graphite-app bot added the community Created by Linear-GitHub Sync label Jul 14, 2025

graphite-app bot requested a review from a team July 14, 2025 11:49

github-actions bot added api area: API, enterprise API, access token, OAuth platform Anything related to our platform plan 💻 refactor labels Jul 14, 2025

cubic-dev-ai bot previously approved these changes Jul 14, 2025

View reviewed changes

sahitya-chandra changed the title ~~refactor: Fix platform owner lookup to use Memberships with OWNER role~~ fix: Use Memberships with OWNER role for platform owner lookup Jul 14, 2025

Devanshusharma2005 reviewed Jul 14, 2025

View reviewed changes

apps/api/v2/src/modules/auth/strategies/api-auth/api-auth.strategy.ts Show resolved Hide resolved

apps/api/v2/src/modules/memberships/memberships.repository.ts Show resolved Hide resolved

sahitya-chandra requested a review from Devanshusharma2005 July 15, 2025 04:52

Merge branch 'main' into platform-ownerid-patch

764ab75

coderabbitai bot reviewed Jul 15, 2025

View reviewed changes

apps/api/v2/src/modules/memberships/memberships.repository.ts Show resolved Hide resolved

sahitya-chandra added 2 commits July 15, 2025 23:03

Merge branch 'calcom:main' into platform-ownerid-patch

b0db774

replaced the hardcoded OWNER string with the enum value

705d13a

sahitya-chandra dismissed cubic-dev-ai[bot]’s stale review via 705d13a July 15, 2025 17:36

sahitya-chandra added 3 commits July 16, 2025 00:34

Merge branch 'main' into platform-ownerid-patch

466df88

Merge branch 'calcom:main' into platform-ownerid-patch

dd8a8f3

Merge branch 'main' into platform-ownerid-patch

77d7a8d

anikdhabal added the Medium priority Created by Linear-GitHub Sync label Jul 16, 2025

This was referenced Jul 16, 2025

refactor: filter out managed users when resolving platform owner #22476

Closed

refactor: select only userId in getPlatformOwnerUserId (#22466) #22470

Closed

sahitya-chandra and others added 2 commits July 17, 2025 13:42

Merge branch 'main' into platform-ownerid-patch

36177cb

Merge branch 'main' into platform-ownerid-patch

1431fa8

Devanshusharma2005 requested changes Jul 18, 2025

View reviewed changes

replaced enum with hard coded OWNER value for safty

6813b17

sahitya-chandra requested a review from Devanshusharma2005 July 23, 2025 17:53

sahitya-chandra and others added 2 commits July 29, 2025 17:21

Merge branch 'main' into platform-ownerid-patch

5af69cc

Merge branch 'main' into platform-ownerid-patch

bfdcd45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: Use Memberships with OWNER role for platform owner lookup #22475

fix: Use Memberships with OWNER role for platform owner lookup #22475

sahitya-chandra commented Jul 14, 2025 •

edited

Loading

Uh oh!

vercel bot commented Jul 14, 2025

Uh oh!

CLAassistant commented Jul 14, 2025 •

edited

Loading

Uh oh!

graphite-app bot commented Jul 14, 2025

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

Uh oh!

Uh oh!

coderabbitai bot commented Jul 15, 2025 •

edited

Loading

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

coderabbitai bot left a comment

Uh oh!

Uh oh!

Devanshusharma2005 left a comment

Uh oh!

sahitya-chandra commented Jul 21, 2025

Uh oh!

sahitya-chandra commented Jul 28, 2025

Uh oh!

kart1ka commented Jul 28, 2025

Uh oh!

sahitya-chandra commented Aug 11, 2025

Uh oh!

Uh oh!

fix: Use Memberships with OWNER role for platform owner lookup #22475

Are you sure you want to change the base?

fix: Use Memberships with OWNER role for platform owner lookup #22475

Conversation

sahitya-chandra commented Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Visual Demo (For contributors especially)

Video Demo (if applicable):

Image Demo (if applicable):

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Checklist

Summary by cubic

Uh oh!

vercel bot commented Jul 14, 2025

Uh oh!

CLAassistant commented Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

graphite-app bot commented Jul 14, 2025

Graphite Automations

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

coderabbitai bot commented Jul 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Estimated code review effort

Assessment against linked issues

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Devanshusharma2005 left a comment

Choose a reason for hiding this comment

Uh oh!

sahitya-chandra commented Jul 21, 2025

Uh oh!

sahitya-chandra commented Jul 28, 2025

Uh oh!

kart1ka commented Jul 28, 2025

Uh oh!

sahitya-chandra commented Aug 11, 2025

Uh oh!

Uh oh!

sahitya-chandra commented Jul 14, 2025 •

edited

Loading

CLAassistant commented Jul 14, 2025 •

edited

Loading

coderabbitai bot commented Jul 15, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)