fix: backport billing-only settings access to 5.0#8090
Merged
Conversation
Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: Johannes <jobenjada@users.noreply.github.com> (cherry picked from commit c0bf2ab)
|
Dhruwang
approved these changes
May 21, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.



What does this PR do?
Backports #8053 to
release/5.0.Enforces billing-role settings restrictions server-side so billing users are redirected to the billing settings page on Cloud and the enterprise settings page on self-hosted deployments. It also guards direct URL access to restricted organization/account settings pages and aligns the sidebar disabled state for Feedback Directories with other inaccessible settings entries.
Related: ENG-982
How should this be tested?
pnpm exec eslint "apps/web/app/(app)/workspaces/[workspaceId]/components/SettingsSidebarContent.tsx" "apps/web/app/(app)/workspaces/[workspaceId]/settings/account/layout.tsx" "apps/web/app/(app)/workspaces/[workspaceId]/settings/lib/redirect-billing-role.test.ts" "apps/web/app/(app)/workspaces/[workspaceId]/settings/lib/redirect-billing-role.ts" "apps/web/app/(app)/workspaces/[workspaceId]/settings/organization/api-keys/page.tsx" "apps/web/app/(app)/workspaces/[workspaceId]/settings/organization/billing/page.tsx" "apps/web/app/(app)/workspaces/[workspaceId]/settings/organization/domain/page.tsx" "apps/web/app/(app)/workspaces/[workspaceId]/settings/organization/enterprise/page.tsx" "apps/web/app/(app)/workspaces/[workspaceId]/settings/organization/feedback-directories/page.tsx" "apps/web/app/(app)/workspaces/[workspaceId]/settings/organization/general/page.tsx" "apps/web/app/(app)/workspaces/[workspaceId]/settings/organization/teams/page.tsx" "apps/web/app/(app)/workspaces/[workspaceId]/settings/page.tsx"pnpm --filter @formbricks/web exec vitest run "app/(app)/workspaces/[workspaceId]/settings/lib/redirect-billing-role.test.ts"/settings/organization/billing./settings/organization/enterprise.Checklist
Required
pnpm buildconsole.logsgit pull origin mainAppreciated