stub out use2fa and twofactorproviders on orgs

src/Core/Models/Business/OrganizationLicense.cs

@@ -19,7 +19,7 @@ namespace Bit.Core.Models.Business
         public OrganizationLicense(Organization org, BillingInfo billingInfo, Guid installationId,
             ILicensingService licenseService)
         {
-            Version = 3;
+            Version = 4;
             LicenseKey = org.LicenseKey;
             InstallationId = installationId;
             Id = org.Id;
@@ -35,6 +35,7 @@ namespace Bit.Core.Models.Business
             UseEvents = org.UseEvents;
             UseDirectory = org.UseDirectory;
             UseTotp = org.UseTotp;
+            Use2fa = org.Use2fa;
             MaxStorageGb = org.MaxStorageGb;
             SelfHost = org.SelfHost;
             UsersGetPremium = org.UsersGetPremium;
@@ -100,6 +101,7 @@ namespace Bit.Core.Models.Business
         public bool UseEvents { get; set; }
         public bool UseDirectory { get; set; }
         public bool UseTotp { get; set; }
+        public bool Use2fa { get; set; }
         public short? MaxStorageGb { get; set; }
         public bool SelfHost { get; set; }
         public bool UsersGetPremium { get; set; }
@@ -116,7 +118,7 @@ namespace Bit.Core.Models.Business
         public byte[] GetDataBytes(bool forHash = false)
         {
             string data = null;
-            if(Version >= 1 && Version <= 3)
+            if(Version >= 1 && Version <= 4)
             {
                 var props = typeof(OrganizationLicense)
                     .GetProperties(BindingFlags.Public | BindingFlags.Instance)
@@ -127,6 +129,8 @@ namespace Bit.Core.Models.Business
                         (Version >= 2 || !p.Name.Equals(nameof(UsersGetPremium))) &&
                         // UseEvents was added in Version 3
                         (Version >= 3 || !p.Name.Equals(nameof(UseEvents))) &&
+                        // Use2fa was added in Version 4
+                        (Version >= 4 || !p.Name.Equals(nameof(Use2fa))) &&
                         (
                             !forHash ||
                             (
@@ -163,7 +167,7 @@ namespace Bit.Core.Models.Business
                 return false;
             }
 
-            if(Version >= 1 && Version <= 3)
+            if(Version >= 1 && Version <= 4)
             {
                 return InstallationId == globalSettings.Installation.Id && SelfHost;
             }
@@ -180,7 +184,7 @@ namespace Bit.Core.Models.Business
                 return false;
             }
 
-            if(Version >= 1 && Version <= 3)
+            if(Version >= 1 && Version <= 4)
             {
                 var valid =
                     globalSettings.Installation.Id == InstallationId &&
@@ -205,6 +209,11 @@ namespace Bit.Core.Models.Business
                     valid = organization.UseEvents == UseEvents;
                 }
 
+                if(valid && Version >= 4)
+                {
+                    valid = organization.Use2fa == Use2fa;
+                }
+
                 return valid;
             }
             else

src/Core/Models/Data/OrganizationAbility.cs

@@ -11,11 +11,13 @@ namespace Bit.Core.Models.Data
         {
             Id = organization.Id;
             UseEvents = organization.UseEvents;
+            Use2fa = organization.Use2fa;
             Enabled = organization.Enabled;
         }
 
         public Guid Id { get; set; }
         public bool UseEvents { get; set; }
+        public bool Use2fa { get; set; }
         public bool Enabled { get; set; }
     }
 }

src/Core/Models/StaticStore/Plan.cs

@@ -16,6 +16,7 @@ namespace Bit.Core.Models.StaticStore
         public bool UseDirectory { get; set; }
         public bool UseEvents { get; set; }
         public bool UseTotp { get; set; }
+        public bool Use2fa { get; set; }
         public short? MaxStorageGb { get; set; }
         public decimal BasePrice { get; set; }
         public decimal SeatPrice { get; set; }

src/Core/Models/Table/Organization.cs

@@ -3,11 +3,16 @@ using Bit.Core.Utilities;
 using Bit.Core.Enums;
 using Bit.Core.Services;
 using Bit.Core.Exceptions;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using System.Linq;
 
 namespace Bit.Core.Models.Table
 {
     public class Organization : ITableObject<Guid>, ISubscriber, IStorable, IStorableSubscriber, IRevisable
     {
+        private Dictionary<TwoFactorProviderType, TwoFactorProvider> _twoFactorProviders;
+
         public Guid Id { get; set; }
         public string Name { get; set; }
         public string BusinessName { get; set; }
@@ -25,6 +30,7 @@ namespace Bit.Core.Models.Table
         public bool UseDirectory { get; set; }
         public bool UseEvents { get; set; }
         public bool UseTotp { get; set; }
+        public bool Use2fa { get; set; }
         public bool SelfHost { get; set; }
         public bool UsersGetPremium { get; set; }
         public long? Storage { get; set; }
@@ -34,6 +40,7 @@ namespace Bit.Core.Models.Table
         public string GatewaySubscriptionId { get; set; }
         public bool Enabled { get; set; } = true;
         public string LicenseKey { get; set; }
+        public string TwoFactorProviders { get; set; }
         public DateTime? ExpirationDate { get; set; }
         public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
         public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
@@ -99,5 +106,71 @@ namespace Bit.Core.Models.Table
 
             return paymentService;
         }
+
+        public Dictionary<TwoFactorProviderType, TwoFactorProvider> GetTwoFactorProviders()
+        {
+            if(string.IsNullOrWhiteSpace(TwoFactorProviders))
+            {
+                return null;
+            }
+
+            try
+            {
+                if(_twoFactorProviders == null)
+                {
+                    _twoFactorProviders =
+                        JsonConvert.DeserializeObject<Dictionary<TwoFactorProviderType, TwoFactorProvider>>(
+                            TwoFactorProviders);
+                }
+
+                return _twoFactorProviders;
+            }
+            catch(JsonSerializationException)
+            {
+                return null;
+            }
+        }
+
+        public void SetTwoFactorProviders(Dictionary<TwoFactorProviderType, TwoFactorProvider> providers)
+        {
+            TwoFactorProviders = JsonConvert.SerializeObject(providers, new JsonSerializerSettings
+            {
+                ContractResolver = new EnumKeyResolver<byte>()
+            });
+            _twoFactorProviders = providers;
+        }
+
+        public bool TwoFactorProviderIsEnabled(TwoFactorProviderType provider)
+        {
+            var providers = GetTwoFactorProviders();
+            if(providers == null || !providers.ContainsKey(provider))
+            {
+                return false;
+            }
+
+            return providers[provider].Enabled && Use2fa;
+        }
+
+        public bool TwoFactorIsEnabled()
+        {
+            var providers = GetTwoFactorProviders();
+            if(providers == null)
+            {
+                return false;
+            }
+
+            return providers.Any(p => (p.Value?.Enabled ?? false) && Use2fa);
+        }
+
+        public TwoFactorProvider GetTwoFactorProvider(TwoFactorProviderType provider)
+        {
+            var providers = GetTwoFactorProviders();
+            if(providers == null || !providers.ContainsKey(provider))
+            {
+                return null;
+            }
+
+            return providers[provider];
+        }
     }
 }

src/Core/Models/Table/User.cs

@@ -68,7 +68,8 @@ namespace Bit.Core.Models.Table
                 if(_twoFactorProviders == null)
                 {
                     _twoFactorProviders =
-                        JsonConvert.DeserializeObject<Dictionary<TwoFactorProviderType, TwoFactorProvider>>(TwoFactorProviders);
+                        JsonConvert.DeserializeObject<Dictionary<TwoFactorProviderType, TwoFactorProvider>>(
+                            TwoFactorProviders);
                 }
 
                 return _twoFactorProviders;
@@ -107,7 +108,8 @@ namespace Bit.Core.Models.Table
                 return false;
             }
 
-            return providers.Any(p => (p.Value?.Enabled ?? false) && (Premium || !TwoFactorProvider.RequiresPremium(p.Key)));
+            return providers.Any(p => (p.Value?.Enabled ?? false) && 
+                (Premium || !TwoFactorProvider.RequiresPremium(p.Key)));
         }
 
         public TwoFactorProvider GetTwoFactorProvider(TwoFactorProviderType provider)

src/Core/Services/Implementations/OrganizationService.cs

@@ -533,6 +533,7 @@ namespace Bit.Core.Services
                 UseEvents = plan.UseEvents,
                 UseDirectory = plan.UseDirectory,
                 UseTotp = plan.UseTotp,
+                Use2fa = plan.Use2fa,
                 SelfHost = plan.SelfHost,
                 UsersGetPremium = plan.UsersGetPremium,
                 Plan = plan.Name,
@@ -588,6 +589,7 @@ namespace Bit.Core.Services
                 UseDirectory = license.UseDirectory,
                 UseEvents = license.UseEvents,
                 UseTotp = license.UseTotp,
+                Use2fa = license.Use2fa,
                 Plan = license.Plan,
                 SelfHost = license.SelfHost,
                 UsersGetPremium = license.UsersGetPremium,
@@ -753,6 +755,9 @@ namespace Bit.Core.Services
             organization.UseDirectory = license.UseDirectory;
             organization.UseEvents = license.UseEvents;
             organization.UseTotp = license.UseTotp;
+            organization.Use2fa = license.Use2fa;
+            organization.SelfHost = license.SelfHost;
+            organization.UsersGetPremium = license.UsersGetPremium;
             organization.Plan = license.Plan;
             organization.Enabled = license.Enabled;
             organization.ExpirationDate = license.Expires;

src/Core/Utilities/StaticStore.cs

@@ -166,6 +166,7 @@ namespace Bit.Core.Utilities
                     UseDirectory = true,
                     UseEvents = true,
                     UseTotp = true,
+                    Use2fa = true,
                     MaxStorageGb = 1,
                     SelfHost = true,
                     UsersGetPremium = true
@@ -187,6 +188,7 @@ namespace Bit.Core.Utilities
                     UseDirectory = true,
                     UseEvents = true,
                     UseTotp = true,
+                    Use2fa = true,
                     MaxStorageGb = 1,
                     SelfHost = true,
                     UsersGetPremium = true

src/Sql/dbo/Stored Procedures/Organization_Create.sql

@@ -16,6 +16,7 @@
     @UseDirectory BIT,
     @UseEvents BIT,
     @UseTotp BIT,
+    @Use2fa BIT,
     @SelfHost BIT,
     @UsersGetPremium BIT,
     @Storage BIGINT,
@@ -25,6 +26,7 @@
     @GatewaySubscriptionId VARCHAR(50),
     @Enabled BIT,
     @LicenseKey VARCHAR(100),
+    @TwoFactorProviders NVARCHAR(MAX),
     @ExpirationDate DATETIME2(7),
     @CreationDate DATETIME2(7),
     @RevisionDate DATETIME2(7)
@@ -51,6 +53,7 @@ BEGIN
         [UseDirectory],
         [UseEvents],
         [UseTotp],
+        [Use2fa],
         [SelfHost],
         [UsersGetPremium],
         [Storage],
@@ -60,6 +63,7 @@ BEGIN
         [GatewaySubscriptionId],
         [Enabled],
         [LicenseKey],
+        [TwoFactorProviders],
         [ExpirationDate],
         [CreationDate],
         [RevisionDate]
@@ -83,6 +87,7 @@ BEGIN
         @UseDirectory,
         @UseEvents,
         @UseTotp,
+        @Use2fa,
         @SelfHost,
         @UsersGetPremium,
         @Storage,
@@ -92,6 +97,7 @@ BEGIN
         @GatewaySubscriptionId,
         @Enabled,
         @LicenseKey,
+        @TwoFactorProviders,
         @ExpirationDate,
         @CreationDate,
         @RevisionDate

src/Sql/dbo/Stored Procedures/Organization_ReadAbilities.sql

@@ -6,6 +6,7 @@ BEGIN
     SELECT
         [Id],
         [UseEvents],
+        [Use2fa],
         [Enabled]
     FROM
         [dbo].[Organization]

src/Sql/dbo/Stored Procedures/Organization_Update.sql

@@ -16,6 +16,7 @@
     @UseDirectory BIT,
     @UseEvents BIT,
     @UseTotp BIT,
+    @Use2fa BIT,
     @SelfHost BIT,
     @UsersGetPremium BIT,
     @Storage BIGINT,
@@ -25,6 +26,7 @@
     @GatewaySubscriptionId VARCHAR(50),
     @Enabled BIT,
     @LicenseKey VARCHAR(100),
+    @TwoFactorProviders NVARCHAR(MAX),
     @ExpirationDate DATETIME2(7),
     @CreationDate DATETIME2(7),
     @RevisionDate DATETIME2(7)
@@ -51,6 +53,7 @@ BEGIN
         [UseDirectory] = @UseDirectory,
         [UseEvents] = @UseEvents,
         [UseTotp] = @UseTotp,
+        [Use2fa] = @Use2fa,
         [SelfHost] = @SelfHost,
         [UsersGetPremium] = @UsersGetPremium,
         [Storage] = @Storage,
@@ -60,6 +63,7 @@ BEGIN
         [GatewaySubscriptionId] = @GatewaySubscriptionId,
         [Enabled] = @Enabled,
         [LicenseKey] = @LicenseKey,
+        [TwoFactorProviders] = @TwoFactorProviders,
         [ExpirationDate] = @ExpirationDate,
         [CreationDate] = @CreationDate,
         [RevisionDate] = @RevisionDate

src/Sql/dbo/Tables/Organization.sql

@@ -16,6 +16,7 @@
     [UseDirectory]          BIT              NOT NULL,
     [UseEvents]             BIT              NOT NULL,
     [UseTotp]               BIT              NOT NULL,
+    [Use2fa]                BIT              NOT NULL,
     [SelfHost]              BIT              NOT NULL,
     [UsersGetPremium]       BIT              NOT NULL,
     [Storage]               BIGINT           NULL,
@@ -25,6 +26,7 @@
     [GatewaySubscriptionId] VARCHAR (50)     NULL,
     [Enabled]               BIT              NOT NULL,
     [LicenseKey]            VARCHAR (100)    NULL,
+    [TwoFactorProviders]    NVARCHAR (MAX)   NULL,
     [ExpirationDate]        DATETIME2 (7)    NULL,
     [CreationDate]          DATETIME2 (7)    NOT NULL,
     [RevisionDate]          DATETIME2 (7)    NOT NULL,

util/Setup/DbScripts/2018-04-02_00_Org2fa.sql

@@ -0,0 +1,243 @@
+IF COL_LENGTH('[dbo].[Organization]', 'Use2fa') IS NULL
+BEGIN
+    ALTER TABLE
+        [dbo].[Organization]
+    ADD
+        [Use2fa] BIT NULL
+END
+GO
+
+UPDATE
+    [dbo].[Organization]
+SET
+    [Use2fa] = (CASE WHEN [PlanType] = 5 OR [PlanType] = 4 THEN 1 ELSE 0 END)
+GO
+
+ALTER TABLE
+    [dbo].[Organization]
+ALTER COLUMN
+    [Use2fa] BIT NOT NULL
+GO
+
+IF COL_LENGTH('[dbo].[Organization]', 'TwoFactorProviders') IS NULL
+BEGIN
+    ALTER TABLE
+        [dbo].[Organization]
+    ADD
+        [TwoFactorProviders] NVARCHAR(MAX) NULL
+END
+GO
+
+IF OBJECT_ID('[dbo].[Organization_Create]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[Organization_Create]
+END
+GO
+
+CREATE PROCEDURE [dbo].[Organization_Create]
+    @Id UNIQUEIDENTIFIER,
+    @Name NVARCHAR(50),
+    @BusinessName NVARCHAR(50),
+    @BusinessAddress1 NVARCHAR(50),
+    @BusinessAddress2 NVARCHAR(50),
+    @BusinessAddress3 NVARCHAR(50),
+    @BusinessCountry VARCHAR(2),
+    @BusinessTaxNumber NVARCHAR(30),
+    @BillingEmail NVARCHAR(50),
+    @Plan NVARCHAR(50),
+    @PlanType TINYINT,
+    @Seats SMALLINT,
+    @MaxCollections SMALLINT,
+    @UseGroups BIT,
+    @UseDirectory BIT,
+    @UseEvents BIT,
+    @UseTotp BIT,
+    @Use2fa BIT,
+    @SelfHost BIT,
+    @UsersGetPremium BIT,
+    @Storage BIGINT,
+    @MaxStorageGb SMALLINT,
+    @Gateway TINYINT,
+    @GatewayCustomerId VARCHAR(50),
+    @GatewaySubscriptionId VARCHAR(50),
+    @Enabled BIT,
+    @LicenseKey VARCHAR(100),
+    @TwoFactorProviders NVARCHAR(MAX),
+    @ExpirationDate DATETIME2(7),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7)
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    INSERT INTO [dbo].[Organization]
+    (
+        [Id],
+        [Name],
+        [BusinessName],
+        [BusinessAddress1],
+        [BusinessAddress2],
+        [BusinessAddress3],
+        [BusinessCountry],
+        [BusinessTaxNumber],
+        [BillingEmail],
+        [Plan],
+        [PlanType],
+        [Seats],
+        [MaxCollections],
+        [UseGroups],
+        [UseDirectory],
+        [UseEvents],
+        [UseTotp],
+        [Use2fa],
+        [SelfHost],
+        [UsersGetPremium],
+        [Storage],
+        [MaxStorageGb],
+        [Gateway],
+        [GatewayCustomerId],
+        [GatewaySubscriptionId],
+        [Enabled],
+        [LicenseKey],
+        [TwoFactorProviders],
+        [ExpirationDate],
+        [CreationDate],
+        [RevisionDate]
+    )
+    VALUES
+    (
+        @Id,
+        @Name,
+        @BusinessName,
+        @BusinessAddress1,
+        @BusinessAddress2,
+        @BusinessAddress3,
+        @BusinessCountry,
+        @BusinessTaxNumber,
+        @BillingEmail,
+        @Plan,
+        @PlanType,
+        @Seats,
+        @MaxCollections,
+        @UseGroups,
+        @UseDirectory,
+        @UseEvents,
+        @UseTotp,
+        @Use2fa,
+        @SelfHost,
+        @UsersGetPremium,
+        @Storage,
+        @MaxStorageGb,
+        @Gateway,
+        @GatewayCustomerId,
+        @GatewaySubscriptionId,
+        @Enabled,
+        @LicenseKey,
+        @TwoFactorProviders,
+        @ExpirationDate,
+        @CreationDate,
+        @RevisionDate
+    )
+END
+GO
+
+IF OBJECT_ID('[dbo].[Organization_Update]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[Organization_Update]
+END
+GO
+
+CREATE PROCEDURE [dbo].[Organization_Update]
+    @Id UNIQUEIDENTIFIER,
+    @Name NVARCHAR(50),
+    @BusinessName NVARCHAR(50),
+    @BusinessAddress1 NVARCHAR(50),
+    @BusinessAddress2 NVARCHAR(50),
+    @BusinessAddress3 NVARCHAR(50),
+    @BusinessCountry VARCHAR(2),
+    @BusinessTaxNumber NVARCHAR(30),
+    @BillingEmail NVARCHAR(50),
+    @Plan NVARCHAR(50),
+    @PlanType TINYINT,
+    @Seats SMALLINT,
+    @MaxCollections SMALLINT,
+    @UseGroups BIT,
+    @UseDirectory BIT,
+    @UseEvents BIT,
+    @UseTotp BIT,
+    @Use2fa BIT,
+    @SelfHost BIT,
+    @UsersGetPremium BIT,
+    @Storage BIGINT,
+    @MaxStorageGb SMALLINT,
+    @Gateway TINYINT,
+    @GatewayCustomerId VARCHAR(50),
+    @GatewaySubscriptionId VARCHAR(50),
+    @Enabled BIT,
+    @LicenseKey VARCHAR(100),
+    @TwoFactorProviders NVARCHAR(MAX),
+    @ExpirationDate DATETIME2(7),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7)
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    UPDATE
+        [dbo].[Organization]
+    SET
+        [Name] = @Name,
+        [BusinessName] = @BusinessName,
+        [BusinessAddress1] = @BusinessAddress1,
+        [BusinessAddress2] = @BusinessAddress2,
+        [BusinessAddress3] = @BusinessAddress3,
+        [BusinessCountry] = @BusinessCountry,
+        [BusinessTaxNumber] = @BusinessTaxNumber,
+        [BillingEmail] = @BillingEmail,
+        [Plan] = @Plan,
+        [PlanType] = @PlanType,
+        [Seats] = @Seats,
+        [MaxCollections] = @MaxCollections,
+        [UseGroups] = @UseGroups,
+        [UseDirectory] = @UseDirectory,
+        [UseEvents] = @UseEvents,
+        [UseTotp] = @UseTotp,
+        [Use2fa] = @Use2fa,
+        [SelfHost] = @SelfHost,
+        [UsersGetPremium] = @UsersGetPremium,
+        [Storage] = @Storage,
+        [MaxStorageGb] = @MaxStorageGb,
+        [Gateway] = @Gateway,
+        [GatewayCustomerId] = @GatewayCustomerId,
+        [GatewaySubscriptionId] = @GatewaySubscriptionId,
+        [Enabled] = @Enabled,
+        [LicenseKey] = @LicenseKey,
+        [TwoFactorProviders] = @TwoFactorProviders,
+        [ExpirationDate] = @ExpirationDate,
+        [CreationDate] = @CreationDate,
+        [RevisionDate] = @RevisionDate
+    WHERE
+        [Id] = @Id
+END
+GO
+
+IF OBJECT_ID('[dbo].[Organization_ReadAbilities]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[Organization_ReadAbilities]
+END
+GO
+
+CREATE PROCEDURE [dbo].[Organization_ReadAbilities]
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    SELECT
+        [Id],
+        [UseEvents],
+        [Use2fa],
+        [Enabled]
+    FROM
+        [dbo].[Organization]
+END
+GO

util/Setup/Setup.csproj

@@ -8,6 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <None Remove="DbScripts\2018-04-02_00_Org2fa.sql" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="DbScripts\2018-04-02_00_Org2fa.sql" />
     <EmbeddedResource Include="DbScripts\2018-03-21_00_AdminPortal.sql" />
     <EmbeddedResource Include="DbScripts\2018-03-12_00_FixLoginUris.sql" />
     <EmbeddedResource Include="DbScripts\2018-02-28_00_LoginUris.sql" />