Skip to content

[PM-11345] Add SCIM to Teams Plan#4924

Merged
amorask-bitwarden merged 9 commits intomainfrom
billing/PM-11345/add-scim-to-teams
Nov 5, 2024
Merged

[PM-11345] Add SCIM to Teams Plan#4924
amorask-bitwarden merged 9 commits intomainfrom
billing/PM-11345/add-scim-to-teams

Conversation

@amorask-bitwarden
Copy link
Copy Markdown
Contributor

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-11345

📔 Objective

  1. Add SCIM to the Teams Plan for new customers
  2. Update existing Teams Organizations by giving them access to SCIM

📸 Screenshots

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

@amorask-bitwarden amorask-bitwarden requested review from a team as code owners October 22, 2024 13:58
@codecov
Copy link
Copy Markdown

codecov Bot commented Oct 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (main@cb7eecc). Learn more about missing BASE report.
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4924   +/-   ##
=======================================
  Coverage        ?   42.54%           
=======================================
  Files           ?     1389           
  Lines           ?    64745           
  Branches        ?     5943           
=======================================
  Hits            ?    27548           
  Misses          ?    35975           
  Partials        ?     1222           

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

Copy link
Copy Markdown
Contributor

@cturnbull-bitwarden cturnbull-bitwarden left a comment

Choose a reason for hiding this comment

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

👨‍🍳

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Oct 22, 2024

Logo
Checkmarx One – Scan Summary & Detailse70d36e6-52e1-4929-9077-3c1304f0a7de

New Issues

Severity Issue Source File / Package Checkmarx Insight
MEDIUM CSRF /src/Api/AdminConsole/Controllers/OrganizationsController.cs: 240 Attack Vector
MEDIUM CSRF /src/Api/Auth/Controllers/TwoFactorController.cs: 438 Attack Vector
LOW Log_Forging /src/Api/Billing/Controllers/ProviderClientsController.cs: 29 Attack Vector
LOW Log_Forging /src/Api/Billing/Controllers/ProviderClientsController.cs: 29 Attack Vector

Fixed Issues

Severity Issue Source File / Package
MEDIUM CSRF /src/Api/AdminConsole/Controllers/PoliciesController.cs: 59
MEDIUM CSRF /src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 105
MEDIUM CSRF /src/Api/AdminConsole/Public/Controllers/MembersController.cs: 95
MEDIUM CSRF /src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 237
MEDIUM CSRF /src/Api/AdminConsole/Controllers/PoliciesController.cs: 75
MEDIUM CSRF /src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 361
MEDIUM CSRF /src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 344
MEDIUM CSRF /src/Api/Controllers/DevicesController.cs: 73
MEDIUM CSRF /src/Api/Controllers/DevicesController.cs: 60
MEDIUM CSRF /src/Api/AdminConsole/Controllers/OrganizationUsersController.cs: 263
MEDIUM CSRF /src/Api/Vault/Controllers/CiphersController.cs: 217
MEDIUM Privacy_Violation /src/Core/Auth/Services/Implementations/AuthRequestService.cs: 208
MEDIUM Privacy_Violation /src/Core/Auth/Services/Implementations/AuthRequestService.cs: 217

@amorask-bitwarden
Copy link
Copy Markdown
Contributor Author

@rkac-bw @withinfocus Mind if I ask for a review on this from you two for dbops?

UPDATE
[dbo].[Organization]
SET
[UseScim] = 1
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Only updates about 5k records, but I would like to set it's deadlock priority because prod is busy on organization table:

SET DEADLOCK_PRIORITY HIGH;
UPDATE
[dbo].[Organization]
SET
[UseScim] = 1
WHERE
[PlanType] IN (
17, -- Teams (Monthly)
18 -- Teams (Annually)
);

@amorask-bitwarden
Copy link
Copy Markdown
Contributor Author

@cturnbull-bitwarden @rkac-bw Can I get another look at this after implementing Robert's suggestion?

Copy link
Copy Markdown
Contributor

@rkac-bw rkac-bw left a comment

Choose a reason for hiding this comment

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

LGTM

@amorask-bitwarden amorask-bitwarden merged commit e6c24c3 into main Nov 5, 2024
@amorask-bitwarden amorask-bitwarden deleted the billing/PM-11345/add-scim-to-teams branch November 5, 2024 13:54
cyprain-okeke pushed a commit that referenced this pull request Nov 12, 2024
* Add SCIM to Teams

* Robert's feedback

* Feedback
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants