Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+11 −0
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9483dfd
Add SCIM to Teams
amorask-bitwarden Oct 22, 2024
a1b8aaf
Merge branch 'main' into billing/PM-11345/add-scim-to-teams
amorask-bitwarden Oct 24, 2024
ea0c735
Merge branch 'main' into billing/PM-11345/add-scim-to-teams
amorask-bitwarden Oct 29, 2024
a30773e
Robert's feedback
amorask-bitwarden Oct 29, 2024
d56e0f8
Merge branch 'main' into billing/PM-11345/add-scim-to-teams
amorask-bitwarden Oct 30, 2024
6cb641f
Merge branch 'main' into billing/PM-11345/add-scim-to-teams
amorask-bitwarden Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Core/Billing/Models/StaticStore/Plans/TeamsPlan.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public TeamsPlan(bool isAnnual)
Has2fa = true;
HasApi = true;
UsersGetPremium = true;
HasScim = true;

UpgradeSortOrder = 3;
DisplaySortOrder = 3;
Expand Down
10 changes: 10 additions & 0 deletions util/Migrator/DbScripts/2024-10-22_00_AddSCIMToTeamsPlan.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
SET DEADLOCK_PRIORITY HIGH;
UPDATE
[dbo].[Organization]
SET
[UseScim] = 1
Copy link
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)
);

WHERE
[PlanType] IN (
17, -- Teams (Monthly)
18 -- Teams (Annually)
);
Loading