Implemented Custom role and permissions (#1057)

* Implemented Custom role and permissions * Converted permissions columns to a json blob * Code review fixes for Permissions * sql build fix * Update Permissions.cs * formatting * Update IOrganizationService.cs * reworked a conditional * built out tests for relevant organization service methods * removed unused usings * fixed a broken test and a bad empty string init * removed 'Attribute' from some attribute instances
2026-01-06 02:23:51 +00:00 · 2021-01-12 11:02:39 -05:00
parent 99b95b5330
commit 63fcdc1418
39 changed files with 1116 additions and 149 deletions
--- a/test/Core.Test/AutoFixture/OrganizationFixtures.cs
+++ b/test/Core.Test/AutoFixture/OrganizationFixtures.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using AutoFixture;
+using Bit.Core.Enums;
+using Bit.Core.Models.Business;
+using Bit.Core.Models.Data;
+using Bit.Core.Models.Table;
+using Bit.Core.Test.AutoFixture.Attributes;
+using Bit.Core.Utilities;
+
+namespace Bit.Core.Test.AutoFixture.OrganizationFixtures
+{
+    internal class PaidOrganization : ICustomization
+    {
+        public PlanType CheckedPlanType { get; set; }
+        public void Customize(IFixture fixture)
+        {
+            var validUpgradePlans = StaticStore.Plans.Where(p => p.Type != Enums.PlanType.Free && !p.Disabled).Select(p => p.Type).ToList();
+            var lowestActivePaidPlan = validUpgradePlans.First();
+            CheckedPlanType = CheckedPlanType.Equals(Enums.PlanType.Free) ? lowestActivePaidPlan : CheckedPlanType;
+            validUpgradePlans.Remove(lowestActivePaidPlan);
+            fixture.Customize<Organization>(composer => composer
+                .With(o => o.PlanType, CheckedPlanType));
+            fixture.Customize<OrganizationUpgrade>(composer => composer
+                .With(ou => ou.Plan, validUpgradePlans.First()));
+        }
+    }
+
+    internal class FreeOrganizationUpgrade : ICustomization
+    {
+        public void Customize(IFixture fixture)
+        {
+            fixture.Customize<Organization>(composer => composer
+                .With(o => o.PlanType, PlanType.Free));
+
+            var plansToIgnore = new List<PlanType> { PlanType.Free, PlanType.Custom };
+            var validPlans = StaticStore.Plans.Where(p => !plansToIgnore.Contains(p.Type) && !p.Disabled).Select(p => p.Type).ToList();
+            fixture.Customize<OrganizationUpgrade>(composer => composer
+                .With(ou => ou.Plan, validPlans.Last()));
+            fixture.Customize<Organization>(composer => composer
+                .Without(o => o.GatewaySubscriptionId));
+        }
+    }
+    internal class OrganizationInvite : ICustomization
+    {
+        public OrganizationUserType InviteeUserType { get; set; }
+        public OrganizationUserType InvitorUserType { get; set; }
+        public string PermissionsBlob { get; set; }
+        public void Customize(IFixture fixture)
+        {
+            var organizationId = new Guid();
+            PermissionsBlob = PermissionsBlob ?? JsonSerializer.Serialize(new Permissions(), new JsonSerializerOptions
+            {
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+            });
+            fixture.Customize<Organization>(composer => composer
+                .With(o => o.Id, organizationId));
+            fixture.Customize<OrganizationUser>(composer => composer
+                .With(ou => ou.OrganizationId, organizationId)
+                .With(ou => ou.Type, InvitorUserType)
+                .With(ou => ou.Permissions, PermissionsBlob));
+            fixture.Customize<OrganizationUserInvite>(composer => composer
+                .With(oi => oi.Type, InviteeUserType));
+        }
+    }
+
+    internal class PaidOrganizationAutoDataAttribute : CustomAutoDataAttribute
+    {
+        public PaidOrganizationAutoDataAttribute(int planType = 0) : base(new SutProviderCustomization(),
+            new PaidOrganization { CheckedPlanType = (PlanType)planType })
+        { }
+    }
+
+    internal class InlinePaidOrganizationAutoDataAttribute : InlineCustomAutoDataAttribute
+    {
+        public InlinePaidOrganizationAutoDataAttribute(params object[] values) : base(new[] { typeof(SutProviderCustomization),
+            typeof(PaidOrganization) }, values)
+        { }
+    }
+
+    internal class FreeOrganizationUpgradeAutoDataAttribute : CustomAutoDataAttribute
+    {
+        public FreeOrganizationUpgradeAutoDataAttribute() : base(new SutProviderCustomization(), new FreeOrganizationUpgrade())
+        { }
+    }
+
+    internal class InlineFreeOrganizationUpgradeAutoDataAttribute : InlineCustomAutoDataAttribute
+    {
+        public InlineFreeOrganizationUpgradeAutoDataAttribute(params object[] values) : base(new[] { typeof(SutProviderCustomization),
+            typeof(FreeOrganizationUpgrade) }, values)
+        { }
+    }
+
+    internal class OrganizationInviteAutoDataAttribute : CustomAutoDataAttribute
+    {
+        public OrganizationInviteAutoDataAttribute(int inviteeUserType = 0, int invitorUserType = 0, string permissionsBlob = null) : base(new SutProviderCustomization(),
+            new OrganizationInvite 
+            { 
+                InviteeUserType = (OrganizationUserType)inviteeUserType, 
+                InvitorUserType = (OrganizationUserType)invitorUserType, 
+                PermissionsBlob = permissionsBlob,
+            })
+        { }
+    }
+
+    internal class InlineOrganizationInviteAutoDataAttribute : InlineCustomAutoDataAttribute
+    {
+        public InlineOrganizationInviteAutoDataAttribute(params object[] values) : base(new[] { typeof(SutProviderCustomization),
+            typeof(OrganizationInvite) }, values)
+        { }
+    }
+}