-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
[AC-108] Enterprise policies are not removed when downgraded to teams #3014
[AC-108] Enterprise policies are not removed when downgraded to teams #3014
Conversation
…licyDetailsAsync to only output policies for Organizations that have UsePolicies = true
…SubscriptionItem (#3037) * [AC-1423] Add AddonProduct and BitwardenProduct properties to BillingSubscriptionItem - Add a helper method to determine the appropriate addon type based on the subscription items StripeId * [AC-1423] Add helper to StaticStore.cs to find a Plan by StripePlanId * [AC-1423] Use the helper method to set SubscriptionInfo.BitwardenProduct
* Adding the Secret manager to the Plan List * Adding the unit test for the StaticStoreTests class * Fix whitespace formatting * Fix whitespace formatting * Price update * Resolving the PR comments * Resolving PR comments * Fixing the whitespace * only password manager plans are return for now * format whitespace * Resolve the test issue * Fixing the failing test * Refactoring the Plan separation * add a unit test for SingleOrDefault * Fix the whitespace format * Separate the PM and SM plans * Fixing the whitespace * Remove unnecessary directive * Fix imports ordering * Fix imports ordering * Resolve imports ordering * Fixing imports ordering * Fix response model, add MaxProjects * Fix filename * Fix format * Fix: seat price should match annual/monthly * Fix service account annual pricing * Changes for secret manager signup and upgradeplan * Changes for secrets manager signup and upgrade * refactoring the code * Format whitespace * remove unnecessary using directive * Resolve the PR comment on Subscription creation * Resolve PR comment * Add password manager to the error message * Add UseSecretsManager to the event log * Resolve PR comment on plan validation * Resolving pr comments for service account count * Resolving pr comments for service account count * Resolve the pr comments * Remove the store procedure that is no-longer needed * Rename a property properly * Resolving the PR comment * Resolve PR comments * Resolving PR comments * Resolving the Pr comments * Resolving some PR comments * Resolving the PR comments * Resolving the build identity build * Add additional Validation * Resolve the Lint issues * remove unnecessary using directive * Remove the white spaces * Adding unit test for the stripe payment * Remove the incomplete test * Fixing the failing test * Fix the failing test * Fix the fail test on organization service * Fix the failing unit test * Fix the whitespace format * Fix the failing test * Fix the whitespace format * resolve pr comments * Fix the lint message * Resolve the PR comments * resolve pr comments * Resolve pr comments * Resolve the pr comments * remove unused code * Added for sm validation test * Fix the whitespace format issues --------- Co-authored-by: Thomas Rittson <[email protected]> Co-authored-by: Thomas Rittson <[email protected]>
* change the stripeseat id * change service accountId to align with new product * make all the Id name for consistent
…anizationSubscriptionResponseModel. Use sp_refreshview instead of sp_refreshsqlmodule in the migration script.
…3036) * Create UpgradeSecretsManagerSubscription command --------- Co-authored-by: Thomas Rittson <[email protected]>
* This is a pure lift & shift with no refactors * Only register subscription commands in Api --------- Co-authored-by: cyprain-okeke <[email protected]>
* Fix SM parameters not being passed to Stripe * Fix flaky test * Fix error message
* [AC-1575] Don't overwrite existing org information when changing plans * [AC-1577] Prefill SM configuration section when starting trial
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few notes, I'll review the rest once you've merged in master
to clean up the diff.
…when-downgraded-to-teams # Conflicts: # src/Infrastructure.EntityFramework/Repositories/OrganizationUserRepository.cs # src/Sql/dbo/Stored Procedures/OrganizationUser_ReadByUserIdWithPolicyDetails.sql # util/Migrator/DbScripts/2023-07-18_00_OrganizationUserReadByUserIdWithPolicyDetails.sql
@eliykat I experimented with using
This worked perfectly until I also ran the Admin Panel alongside it and changed the |
New Issues
|
…-enterprise-polices-are-not-removed-when-downgraded-to-teams # Conflicts: # src/Admin/Views/Organizations/Edit.cshtml # src/Admin/Views/Shared/_OrganizationFormScripts.cshtml
If the org abilities cache is in memory only, it wouldn't be shared between the projects. Did you find out whether it's in memory in prod, or is it hosted on a service like redis etc? (Or otherwise shared between the projects somehow?) |
@eliykat I've created another PR with the changes above implemented and tested it by using a service bus resource on Azure. It worked great! |
@r-tome just a reminder to close this one if it's no longer needed. |
Type of change
Objective
If an organization has
UsePolicies = false
then any of its members should not be affected by any previously configured policy.Code changes
Part of the solution was implemented on #2917 to select organization features for te selected plan. I've built further on that by setting the features for the Free and Families plans.
trial = true
when clicking trial buttonstrial
to set value forSalesAssistedTrialStarted
. Added plans 'free' and 'families' to switch to toggle featuresUsePolicies = true
UsePolicies = true
Before you submit
dotnet format --verify-no-changes
) (required)