bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-13 14:53:34 +00:00
Code Issues Releases Wiki Activity

Revert changes to ReferenceEvent code (#3091)

Browse Source 
* Revert changes to ReferenceEvent code

This will be done in AC-1481
This commit is contained in:
Thomas Rittson
2023-07-13 09:27:54 +10:00
committed by GitHub
parent 38ff56917b
commit e1bede1108
4 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs
View File

@@ -284,9 +284,7 @@ public class UpgradeOrganizationPlanCommand : IUpgradeOrganizationPlanCommand
OldPlanType = existingPasswordManagerPlan.Type, OldPlanType = existingPasswordManagerPlan.Type,
Seats = organization.Seats, Seats = organization.Seats,
Storage = organization.MaxStorageGb, Storage = organization.MaxStorageGb,
SmSeats = organization.SmSeats, // TODO: add reference events for SmSeats and Service Accounts - see AC-1481
ServiceAccounts = organization.SmServiceAccounts,
UseSecretsManager = organization.UseSecretsManager
}); });
} }

4
src/Core/Services/Implementations/OrganizationService.cs
View File

@@ -481,9 +481,7 @@ public class OrganizationService : IOrganizationService
PlanType = passwordManagerPlan.Type, PlanType = passwordManagerPlan.Type,
Seats = returnValue.Item1.Seats, Seats = returnValue.Item1.Seats,
Storage = returnValue.Item1.MaxStorageGb, Storage = returnValue.Item1.MaxStorageGb,
SmSeats = returnValue.Item1.SmSeats, // TODO: add reference events for SmSeats and Service Accounts - see AC-1481
ServiceAccounts = returnValue.Item1.SmServiceAccounts,
UseSecretsManager = returnValue.Item1.UseSecretsManager
}); });
return returnValue; return returnValue;
} }

4
src/Core/Tools/Models/Business/ReferenceEvent.cs
View File

@@ -52,7 +52,6 @@ public class ReferenceEvent
public int? Seats { get; set; } public int? Seats { get; set; }
public int? PreviousSeats { get; set; } public int? PreviousSeats { get; set; }
public int? PreviousServiceAccounts { get; set; }
public short? Storage { get; set; } public short? Storage { get; set; }
@@ -71,7 +70,4 @@ public class ReferenceEvent
public string ClientId { get; set; } public string ClientId { get; set; }
public Version ClientVersion { get; set; } public Version ClientVersion { get; set; }
public int? SmSeats { get; set; }
public int? ServiceAccounts { get; set; }
public bool UseSecretsManager { get; set; }
} }

4
test/Core.Test/Services/OrganizationServiceTests.cs
View File

@@ -183,10 +183,8 @@ public class OrganizationServiceTests
referenceEvent.PlanName == purchaseOrganizationPlan[0].Name && referenceEvent.PlanName == purchaseOrganizationPlan[0].Name &&
referenceEvent.PlanType == purchaseOrganizationPlan[0].Type && referenceEvent.PlanType == purchaseOrganizationPlan[0].Type &&
referenceEvent.Seats == result.Item1.Seats && referenceEvent.Seats == result.Item1.Seats &&
referenceEvent.SmSeats == result.Item1.SmSeats &&
referenceEvent.ServiceAccounts == result.Item1.SmServiceAccounts &&
referenceEvent.UseSecretsManager == result.Item1.UseSecretsManager &&
referenceEvent.Storage == result.Item1.MaxStorageGb)); referenceEvent.Storage == result.Item1.MaxStorageGb));
// TODO: add reference events for SmSeats and Service Accounts - see AC-1481
Assert.NotNull(result); Assert.NotNull(result);
Assert.NotNull(result.Item1); Assert.NotNull(result.Item1);