fix: (PBAC) Add organization fallback on resources #22733

sean-brydon · 2025-07-25T08:52:41Z

Problem

The getResourcePermissions method in PermissionCheckService only
checked team-level permissions, while the checkPermission method
correctly implements a fallback hierarchy that checks both team and
organization-level permissions. This inconsistency meant that users
with organization-level permissions wouldn't see those permissions
when using getResourcePermissions, even though they would be granted
access via checkPermission.

Business Logic Alignment

This change ensures getResourcePermissions now follows the exact same
permission hierarchy as checkPermission:

// Both methods now follow this pattern:

Check team-level permissions (if customRoleId exists)
Check org-level permissions (if team.parentId exists)
Combine results (getResourcePermissions) or return true on first
match (checkPermission)

Example Usage

// Before: Only returned team-level permissions
const permissions = await service.getResourcePermissions({
  userId: 123,
  teamId: 456,
  resource: Resource.EventType
});
// Result: ["eventType.read"] (missing org-level permissions)

// After: Returns combined team + organization permissions
const permissions = await service.getResourcePermissions({
  userId: 123,
  teamId: 456,
  resource: Resource.EventType
});
// Result: ["eventType.read", "eventType.create", "eventType.update"]
(includes org permissions)

Breaking Changes

None. This is a backward-compatible enhancement that only adds
functionality.

coderabbitai · 2025-07-25T08:52:50Z

Walkthrough

A new method, getResourcePermissionsByRoleId, was introduced to the IPermissionRepository interface and implemented in the PermissionRepository class. This method retrieves permissions for a given role and resource. The getResourcePermissions logic in PermissionCheckService was refactored to use this new method, aggregating permissions from both team and organization roles while handling membership data with updated nested team parentId structure. Comprehensive tests were added to cover various scenarios for permission retrieval, including feature flag states, membership combinations, deduplication, and error handling. The test suite now mocks the new repository method and verifies correct behavior under multiple conditions.

Estimated code review effort

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

Complexity: Moderate. The changes involve interface and repository updates, a service logic refactor, and a substantial extension of the test suite. Reviewers need to verify correct interface implementation, logic correctness in permission aggregation, and thoroughness of the new tests.

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 ESLint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

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

Oops! Something went wrong! :(

ESLint: 8.57.1

ESLint couldn't find the plugin "eslint-plugin-playwright".

(The package "eslint-plugin-playwright" was not found when loaded as a Node module from the directory "".)

It's likely that the plugin isn't installed correctly. Try reinstalling by running the following:

npm install eslint-plugin-playwright@latest --save-dev

The plugin "eslint-plugin-playwright" was referenced from the config file in ".eslintrc.js".

If you still can't figure out the problem, please stop by https://eslint.org/chat/help to chat with the team.

✨ 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/getResoruces-pbac-fallback-to-org

🪧 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-25T08:55:12Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (07/25/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/25/25)

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

vercel · 2025-07-25T09:14:17Z

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 25, 2025 0:53am
cal-eu	⬜️ Ignored (Inspect)			Jul 25, 2025 0:53am

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 7b95b8c and e747c14.

📒 Files selected for processing (3)

packages/features/pbac/domain/repositories/IPermissionRepository.ts (3 hunks)
packages/features/pbac/services/__tests__/permission-check.service.test.ts (6 hunks)
packages/features/pbac/services/permission-check.service.ts (3 hunks)

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

packages/features/pbac/domain/repositories/IPermissionRepository.ts
packages/features/pbac/services/tests/permission-check.service.test.ts

🧰 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:

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

🧬 Code Graph Analysis (1)

packages/features/pbac/services/permission-check.service.ts (1)

packages/features/pbac/domain/mappers/PermissionMapper.ts (1)

PermissionMapper (7-116)

⏰ 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

🔇 Additional comments (2)

packages/features/pbac/services/permission-check.service.ts (2)

9-14: LGTM - Import changes support the new functionality.

The addition of CrudAction and CustomAction types to the import is necessary for the refactored getResourcePermissions method implementation.

246-247: LGTM - Property access updated for nested team structure.

The change from membership.team_parentId to membership.team.parentId correctly reflects the updated membership data structure with nested team objects.

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

sean-brydon · 2025-07-25T09:27:48Z

packages/features/pbac/domain/repositories/IPermissionRepository.ts

@@ -20,7 +22,9 @@ export interface IPermissionRepository {
    teamId: number;
    userId: number;
    customRoleId: string | null;
-    team_parentId?: number;


Outdated type from when this used to use ksyely

…ac-fallback-to-org' into fix/getResoruces-pbac-fallback-to-org

eunjae-lee · 2025-07-25T09:32:55Z

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

+
+      // Get team-level permissions
+      if (membership?.customRoleId) {
+        const teamActions = await this.repository.getResourcePermissionsByRoleId(


what if we turn getResourcePermissionsByRoleId to accept roleIds?

i think passing in a teamId + an optionalRoleId might be a good shout here. Let me play around with that

coderabbitai

Actionable comments posted: 0

🧹 Nitpick comments (1)

packages/features/pbac/services/__tests__/permission-check.service.test.ts (1)

388-635: Excellent comprehensive test coverage for getResourcePermissions.

The test suite thoroughly covers all major scenarios including:

Feature flag states

Team-only and org-only permissions

Combined permission aggregation

Permission deduplication

Error handling and edge cases

The test structure is well-organized and the mocking strategy is appropriate.

Minor suggestion for the hierarchy test (lines 591-634): The test name suggests "precedence" but the implementation shows additive behavior. Consider renaming to "should combine team and org permissions additively" to better reflect the actual behavior being tested.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between e54fbd6 and a34ea15.

📒 Files selected for processing (1)

packages/features/pbac/services/__tests__/permission-check.service.test.ts (6 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:

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

🔇 Additional comments (3)

packages/features/pbac/services/__tests__/permission-check.service.test.ts (3)

9-9: LGTM! Import addition supports new test functionality.

The Resource import is necessary for the new getResourcePermissions test cases.

38-38: LGTM! Mock method addition aligns with interface changes.

The getResourcePermissionsByRoleId mock properly supports the new repository method.

83-83: LGTM! Team structure updated to match new membership data model.

The changes from team_parentId to team: { parentId } properly reflect the updated membership structure.

Also applies to: 198-198, 275-275

add fallback to service

7b95b8c

graphite-app bot requested a review from a team July 25, 2025 08:52

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

dosubot bot added the 🐛 bug Something isn't working label Jul 25, 2025

fix: org memebership fallback

e747c14

vercel bot deployed to Preview – dev July 25, 2025 09:13 View deployment

coderabbitai bot reviewed Jul 25, 2025

View reviewed changes

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

sean-brydon commented Jul 25, 2025

View reviewed changes

sean-brydon added 3 commits July 25, 2025 10:28

remove log

ed92c3b

remove log

6570756

Merge remote-tracking branch 'refs/remotes/origin/fix/getResoruces-pb…

0e89b63

…ac-fallback-to-org' into fix/getResoruces-pbac-fallback-to-org

eunjae-lee reviewed Jul 25, 2025

View reviewed changes

sean-brydon added 2 commits July 25, 2025 10:51

add merge test case

e54fbd6

add test for no parentId on team for getResources

a34ea15

coderabbitai bot reviewed Jul 25, 2025

View reviewed changes

vercel bot deployed to Preview – dev July 25, 2025 10:16 View deployment

eunjae-lee approved these changes Jul 25, 2025

View reviewed changes

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

Merge branch 'main' into fix/getResoruces-pbac-fallback-to-org

c1037af

vercel bot deployed to Preview – dev July 25, 2025 12:39 View deployment

Merge branch 'main' into fix/getResoruces-pbac-fallback-to-org

f337bb6

vercel bot deployed to Preview – dev July 25, 2025 13:12 View deployment

emrysal merged commit b155d73 into main Jul 26, 2025
39 of 40 checks passed

emrysal deleted the fix/getResoruces-pbac-fallback-to-org branch July 26, 2025 00:07

coderabbitai bot mentioned this pull request Jul 28, 2025

feat: enable PBAC checking on organization settings page #22467

Merged

coderabbitai bot mentioned this pull request Aug 7, 2025

feat: add Workflow resource to PBAC system with permission enforcement #22845

Merged

5 tasks

This was referenced Aug 8, 2025

feat: api v1 admin api access for orgs #22544

Open

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

Open

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

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: (PBAC) Add organization fallback on resources #22733

fix: (PBAC) Add organization fallback on resources #22733

sean-brydon commented Jul 25, 2025

Uh oh!

coderabbitai bot commented Jul 25, 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 25, 2025 •

edited

Loading

Uh oh!

vercel bot commented Jul 25, 2025 •

edited

Loading

Uh oh!

coderabbitai bot left a comment

Uh oh!

Uh oh!

sean-brydon Jul 25, 2025

Uh oh!

eunjae-lee Jul 25, 2025

Uh oh!

sean-brydon Jul 25, 2025

Uh oh!

sean-brydon Jul 25, 2025

Uh oh!

coderabbitai bot left a comment

Uh oh!

Uh oh!

Uh oh!

fix: (PBAC) Add organization fallback on resources #22733

fix: (PBAC) Add organization fallback on resources #22733

Conversation

sean-brydon commented Jul 25, 2025

Problem

Business Logic Alignment

Example Usage

Breaking Changes

Uh oh!

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

Uh oh!

Walkthrough

Estimated code review effort

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 25, 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 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sean-brydon Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

eunjae-lee Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

sean-brydon Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

sean-brydon Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

coderabbitai bot commented Jul 25, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)

graphite-app bot commented Jul 25, 2025 •

edited

Loading

vercel bot commented Jul 25, 2025 •

edited

Loading