fix: remove fallback permssions on organization Id. #22769

sean-brydon · 2025-07-28T09:42:41Z

What We Did

I provided a comprehensive PR Summary for implementing PBAC
(Permission-Based Access Control) "manage" permissions in the
Cal.com codebase. This was a detailed documentation of a
completed feature implementation.

Key Implementation Details Covered

Database & Schema Changes

• Migration file:
packages/prisma/migrations/20250728091301_add_manage_permissions_to_default_roles/migration.
sql
• Added 4 new "manage" permissions to admin roles for: roles,
event types, teams, and bookings

Core Logic Files Modified

• Permission Registry:
packages/features/pbac/domain/types/permission-registry.ts
• Added Manage = "manage" to CrudAction enum
• Defined organization-scoped manage permissions
• Permission Service:
packages/features/pbac/services/permission-check.service.ts
• Enhanced 3 key methods: getResourcePermissions(),
hasPermission(), hasPermissions()
• Implemented automatic permission expansion and hierarchical
fallback logic

Testing & Localization

• Test file:
packages/features/pbac/services/tests/permission-check.
service.test.ts (6 new test cases, 30 total passing)
• i18n file: apps/web/public/static/locales/en/common.json (79
PBAC strings added)

Current Status

• Complete feature implementation with manage permissions
allowing organization administrators to have hierarchical
control over all actions within specific resources
• All tests passing, migration applied, comprehensive
documentation provided

What We're Working On

This appears to be a completed feature summary/documentation
rather than active development work.

coderabbitai · 2025-07-28T09:42:49Z

Walkthrough

This change introduces a new "manage" permission action across the application’s permission system. The CrudAction enum is extended to include "Manage," and the permission registry is updated to define "manage" permissions for roles, event types, teams, and bookings, scoped at the organization level. The English localization strings are updated to clarify that these permissions apply "across organization teams." The PermissionCheckService logic is updated so that holding a "manage" permission for a resource implicitly grants all subordinate permissions for that resource, both at the team and organization levels. Comprehensive tests are added to verify this expanded permission logic. A database migration script adds the new "manage" permissions to the admin role for the relevant resources.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~15–20 minutes

Complexity: Moderate. The changes span backend logic, permission registry, localization, tests, and a migration script, but are conceptually unified and do not introduce new APIs or complex algorithms.
Review scope: Requires careful review of permission expansion logic, test coverage for new behaviors, and correctness of migration data. The changes are isolated and well-structured, with no modifications to public interfaces.

Possibly related PRs

fix: (pbac) edit sheet readonly to all to readonly #22672: Modifies the getResourcePermissionLevel function to handle the global wildcard "*.*" permission, while this PR adds explicit handling for the "manage" permission in the same function; both affect permission level determination logic.

Note

⚡️ Unit Test Generation is now available in beta!

Learn more here, or try it out under "Finishing Touches" below.

📜 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 50da7d7 and 7055b10.

📒 Files selected for processing (2)

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/__tests__/usePermissions.test.ts (1 hunks)
apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/usePermissions.ts (1 hunks)

🧰 Additional context used

📓 Path-based instructions (1)

**/*.{js,jsx,ts,tsx}

📄 CodeRabbit Inference Engine (.cursor/rules/review.mdc)

Flag excessive Day.js use in performance-critical code. Functions like .add, .diff, .isBefore, and .isAfter are slow, especially in timezone mode. Prefer .utc() for better performance. Where possible, replace with native Date and direct .valueOf() comparisons for faster execution. Recommend using native methods or Day.js .utc() consistently in hot paths like loops.

Files:

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/__tests__/usePermissions.test.ts
apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/usePermissions.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: Codacy Static Code Analysis

🔇 Additional comments (3)

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/__tests__/usePermissions.test.ts (1)

48-58: LGTM! Comprehensive test coverage for "manage" permission.

The test cases properly validate the new "manage" permission behavior where having "manage" permission grants "all" access level. The tests cover both standalone "manage" permission and "manage" with other permissions present.

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/usePermissions.ts (2)

54-69: LGTM! Correct implementation of hierarchical "manage" permission.

The implementation properly handles the new "manage" permission by:

Hierarchical checking: Checks "manage" permission after global permissions but before individual CRUD permissions

Proper filtering: Excludes "manage" from individual CRUD permission checks to prevent interference

Clear logic flow: Maintains the existing permission evaluation order while integrating the new functionality

The variable naming (crudPermissions, hasAllCrudPerms) is descriptive and the filtering logic correctly handles both internal keys and the "manage" permission.

107-109: Verify "manage" permission handling in toggle functions.

The toggleResourcePermissionLevel function correctly includes "manage" permissions when toggling to "all" level since it filters only internal keys (starting with "_"). This ensures that when a user selects "all" permissions for a resource, the "manage" permission is included along with other CRUD permissions.

✨ Finishing Touches

📝 Generate Docstrings

🧪 Generate unit tests

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch fix/remove-fallback-pbac-manage

🪧 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.
- @coderabbitai modularize this function.
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.
- @coderabbitai help me debug CodeRabbit configuration file.

Support

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

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

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.

graphite-app · 2025-07-28T09:46:19Z

Graphite Automations

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

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

"Add ready-for-e2e label" took an action on this PR • (07/28/25)

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

vercel · 2025-07-28T09:46:57Z

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

2 Skipped Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)			Jul 28, 2025 10:19am
cal-eu	⬜️ Ignored (Inspect)			Jul 28, 2025 10:19am

packages/features/pbac/services/permission-check.service.ts

emrysal

Looks good, lgtm

This reverts commit 30061c0. Removes the manage permission concept and fallback logic to simplify permission checking back to direct role-based checks.

#23013) * Revert "fix: remove fallback permssions on organization Id. (#22769)" This reverts commit 30061c0. Removes the manage permission concept and fallback logic to simplify permission checking back to direct role-based checks. * remove manage from workflows * fix type error and remove manage from components

add concept of manage permissions instea of fallback

8747877

sean-brydon requested a review from a team July 28, 2025 09:42

graphite-app bot requested a review from a team July 28, 2025 09:42

github-actions bot added the ❗️ migrations contains migration files label Jul 28, 2025

keithwillcode added consumer core area: core, team members only labels Jul 28, 2025

dosubot bot added enterprise area: enterprise, audit log, organisation, SAML, SSO i18n area: i18n, translations labels Jul 28, 2025

fix common json

50da7d7

sean-brydon marked this pull request as draft July 28, 2025 09:54

sean-brydon commented Jul 28, 2025

View reviewed changes

packages/features/pbac/services/permission-check.service.ts Show resolved Hide resolved

fix usePermission hook

7055b10

vercel bot deployed to Preview – dev July 28, 2025 10:49 View deployment

sean-brydon marked this pull request as ready for review July 28, 2025 11:14

emrysal approved these changes Jul 28, 2025

View reviewed changes

graphite-app bot added the ready-for-e2e label Jul 28, 2025

emrysal enabled auto-merge (squash) July 28, 2025 11:29

emrysal merged commit 30061c0 into main Jul 28, 2025
60 of 62 checks passed

emrysal deleted the fix/remove-fallback-pbac-manage branch July 28, 2025 11:49

This was referenced Aug 11, 2025

revert: "fix: remove fallback permssions on organization Id. (#22769)" #23013

Merged

feat: event type pbac #22618

Merged

This was referenced Aug 26, 2025

feat: PBAC on team members page + org members page to use specific permissi… #23004

Merged

feat: (PBAC) Introduce depends on permission registery #23440

Merged

This was referenced Sep 3, 2025

feat: dogfood pbac internally on IS_CALCOM instances #23537

Merged

feat: add Webhook resource to PBAC system with permission enforcement #23614

Merged

coderabbitai bot mentioned this pull request Sep 9, 2025

refactor: create reusable org admin auth function #23698

Closed

7 tasks

coderabbitai bot mentioned this pull request Oct 7, 2025

fix: event-type permissions #24318

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: remove fallback permssions on organization Id. #22769

fix: remove fallback permssions on organization Id. #22769

Uh oh!

sean-brydon commented Jul 28, 2025 •

edited

Loading

Uh oh!

coderabbitai bot commented Jul 28, 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!

graphite-app bot commented Jul 28, 2025 •

edited

Loading

Uh oh!

vercel bot commented Jul 28, 2025 •

edited

Loading

Uh oh!

Uh oh!

emrysal left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

fix: remove fallback permssions on organization Id. #22769

fix: remove fallback permssions on organization Id. #22769

Uh oh!

Conversation

sean-brydon commented Jul 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What We Did

Key Implementation Details Covered

Database & Schema Changes

Core Logic Files Modified

Testing & Localization

Current Status

What We're Working On

Uh oh!

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

Uh oh!

Walkthrough

Estimated code review effort

Possibly related PRs

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

graphite-app bot commented Jul 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Graphite Automations

Uh oh!

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

Uh oh!

Uh oh!

Uh oh!

emrysal left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

sean-brydon commented Jul 28, 2025 •

edited

Loading

coderabbitai bot commented Jul 28, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)

graphite-app bot commented Jul 28, 2025 •

edited

Loading

vercel bot commented Jul 28, 2025 •

edited

Loading