Skip to content

feat: enable saml for scaleup plan#7295

Merged
Zaimwa9 merged 10 commits intomainfrom
feat/enable-saml-for-scaleup-plan
Apr 21, 2026
Merged

feat: enable saml for scaleup plan#7295
Zaimwa9 merged 10 commits intomainfrom
feat/enable-saml-for-scaleup-plan

Conversation

@Zaimwa9
Copy link
Copy Markdown
Contributor

@Zaimwa9 Zaimwa9 commented Apr 20, 2026 •
edited
Loading

Thanks for submitting a PR! Please check the boxes below:

  • I have read the Contributing Guide.
  • I have added information to docs/ if required so people know about the feature.
  • I have filled in the "Changes" section below.
  • I have filled in the "How did you test this code" section below.

Changes

Closes #118

  • Added require_minimum_plan(...) DRF permission that gates by plan family (bypasses on self-hosted)
  • Applied it to `SamlConfigurationViewSet so SAML endpoints require Scale-up+ on SaaS.
  • Moved SAML to the Scale-up plan in the frontend feature mapping so the tab renders for Scale-up orgs.

How did you test this code?

  • New tests

@Zaimwa9 Zaimwa9 requested a review from gagantrivedi April 20, 2026 09:11
@Zaimwa9 Zaimwa9 requested review from a team as code owners April 20, 2026 09:11
@Zaimwa9 Zaimwa9 requested review from kyle-ssg and removed request for a team April 20, 2026 09:11
claude[bot]
claude Bot reviewed Apr 20, 2026
View reviewed changes
Copy link
Copy Markdown

@claude claude Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Code review skipped — your organization's overage spend limit has been reached.

Code review is billed via overage credits. To resume reviews, an organization admin can raise the monthly limit at claude.ai/admin-settings/claude-code.

Once credits are available, reopen this pull request to trigger a review.

@vercel
Copy link
Copy Markdown

vercel Bot commented Apr 20, 2026 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for GitHub.

3 Skipped Deployments
Project Deployment Actions Updated (UTC)
docs Ignored Ignored Preview Apr 21, 2026 9:46am
flagsmith-frontend-preview Ignored Ignored Preview Apr 21, 2026 9:46am
flagsmith-frontend-staging Ignored Ignored Preview Apr 21, 2026 9:46am

Request Review

@Zaimwa9 Zaimwa9 changed the title Feat/enable saml for scaleup plan feat: enable saml for scaleup plan Apr 20, 2026
@github-actions github-actions Bot added front-end Issue related to the React Front End Dashboard api Issue related to the REST API labels Apr 20, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 20, 2026 •
edited
Loading

Docker builds report

Image Build Status Security report
ghcr.io/flagsmith/flagsmith-e2e:pr-7295 Finished ✅ Skipped
ghcr.io/flagsmith/flagsmith-api-test:pr-7295 Finished ✅ Skipped
ghcr.io/flagsmith/flagsmith-api:pr-7295 Finished ✅ Results ✅
ghcr.io/flagsmith/flagsmith:pr-7295 Finished ✅ Results ✅
ghcr.io/flagsmith/flagsmith-private-cloud:pr-7295 Finished ✅ Results ✅
ghcr.io/flagsmith/flagsmith-frontend:pr-7295 Finished ✅ Results ✅

@github-actions github-actions Bot added the feature New feature or request label Apr 20, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 20, 2026 •
edited
Loading

Playwright Test Results (oss - depot-ubuntu-latest-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  44.2 seconds
commit  f32e798
info  🔄 Run: #16184 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  43.3 seconds
commit  33e1326
info  🔄 Run: #16185 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  47.1 seconds
commit  33e1326
info  🔄 Run: #16185 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

passed  1 passed

Details

stats  1 test across 1 suite
duration  57.9 seconds
commit  f32e798
info  🔄 Run: #16184 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  49.8 seconds
commit  f32e798
info  🔄 Run: #16184 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

passed  1 passed

Details

stats  1 test across 1 suite
duration  51.8 seconds
commit  f32e798
info  🔄 Run: #16184 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  24.4 seconds
commit  e21eb58
info  🔄 Run: #16186 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  28.9 seconds
commit  e21eb58
info  🔄 Run: #16186 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

passed  17 passed

Details

stats  17 tests across 14 suites
duration  1 minute, 1 second
commit  e21eb58
info  🔄 Run: #16186 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

passed  1 passed

Details

stats  1 test across 1 suite
duration  52.7 seconds
commit  e21eb58
info  🔄 Run: #16186 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  1.4 seconds
commit  573c09f
info  🔄 Run: #16188 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  51.7 seconds
commit  573c09f
info  🔄 Run: #16188 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

passed  2 passed

Details

stats  2 tests across 2 suites
duration  45.6 seconds
commit  573c09f
info  🔄 Run: #16188 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

passed  1 passed

Details

stats  1 test across 1 suite
duration  1 minute, 15 seconds
commit  573c09f
info  🔄 Run: #16188 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  25 seconds
commit  58b77a6
info  🔄 Run: #16210 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  24.5 seconds
commit  046bbb8
info  🔄 Run: #16211 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  52.4 seconds
commit  58b77a6
info  🔄 Run: #16210 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

passed  11 passed

Details

stats  11 tests across 8 suites
duration  52.5 seconds
commit  046bbb8
info  🔄 Run: #16211 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

passed  1 passed

Details

stats  1 test across 1 suite
duration  28.4 seconds
commit  58b77a6
info  🔄 Run: #16210 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

passed  3 passed

Details

stats  3 tests across 3 suites
duration  46 seconds
commit  58b77a6
info  🔄 Run: #16210 (attempt 1)

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 20, 2026 •
edited
Loading

Visual Regression

16 screenshots compared. See report for details.
View full report

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 20, 2026 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.37%. Comparing base (9943da9) to head (046bbb8).
⚠️ Report is 19 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #7295      +/-   ##
==========================================
+ Coverage   98.29%   98.37%   +0.08%     
==========================================
  Files        1351     1366      +15     
  Lines       50752    51215     +463     
==========================================
+ Hits        49885    50384     +499     
+ Misses        867      831      -36

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions github-actions Bot added feature New feature or request and removed feature New feature or request labels Apr 20, 2026
@Zaimwa9 Zaimwa9 requested review from talissoncosta and removed request for kyle-ssg April 20, 2026 14:23
talissoncosta
talissoncosta previously approved these changes Apr 20, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@talissoncosta talissoncosta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good on a FE perspective!

khvn26
khvn26 previously approved these changes Apr 21, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@khvn26 khvn26 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm happy to merge as is, three nitpicks notwithstanding.

Comment thread api/organisations/subscriptions/permissions.py Outdated
Comment thread api/organisations/subscriptions/permissions.py
Comment thread api/tests/unit/organisations/subscriptions/test_unit_subscriptions_permissions.py Outdated
@Zaimwa9 Zaimwa9 dismissed stale reviews from khvn26 and talissoncosta via 58b77a6 April 21, 2026 09:45
@github-actions github-actions Bot added feature New feature or request and removed feature New feature or request labels Apr 21, 2026
@Zaimwa9 Zaimwa9 merged commit 0c96217 into main Apr 21, 2026
37 of 38 checks passed
@Zaimwa9 Zaimwa9 deleted the feat/enable-saml-for-scaleup-plan branch April 21, 2026 10:14
@flagsmithdev flagsmithdev mentioned this pull request Apr 21, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@claude claude[bot] claude[bot] left review comments

@khvn26 khvn26 khvn26 approved these changes

@talissoncosta talissoncosta talissoncosta left review comments

@gagantrivedi gagantrivedi Awaiting requested review from gagantrivedi

Assignees

No one assigned

Labels

api Issue related to the REST API feature New feature or request front-end Issue related to the React Front End Dashboard

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Zaimwa9 @khvn26 @talissoncosta