From fbc189544b40a86c389f218d2d77d0b88f61cfcd Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 7 Jul 2017 14:08:30 -0400 Subject: [PATCH] org totp and storage flags --- src/Api/Controllers/LoginsController.cs | 13 ++++++----- .../Api/Response/CipherResponseModel.cs | 2 ++ .../Models/Api/Response/LoginResponseModel.cs | 6 +++-- .../ProfileOrganizationResponseModel.cs | 4 ++++ src/Core/Models/Data/CipherDetails.cs | 1 + .../OrganizationUserOrganizationDetails.cs | 2 ++ src/Core/Models/StaticStore/Plan.cs | 2 ++ src/Core/Models/Table/Organization.cs | 1 + .../Services/Implementations/CipherService.cs | 6 +++++ .../Implementations/OrganizationService.cs | 2 ++ src/Core/Utilities/StaticStore.cs | 21 ++++++++++++----- src/Sql/dbo/Functions/UserCipherDetails.sql | 6 ++++- .../CipherDetails_Create.sql | 3 ++- .../CipherDetails_Update.sql | 3 ++- .../Stored Procedures/Organization_Create.sql | 3 +++ .../Stored Procedures/Organization_Update.sql | 2 ++ src/Sql/dbo/Tables/Organization.sql | 1 + ...rganizationUserOrganizationDetailsView.sql | 2 ++ util/SqlUpdate/2017-06-30_00_UserPremium.sql | 11 +++++++++ util/SqlUpdate/2017-07-07_00_OrgFields.sql | 23 +++++++++++++++++++ 20 files changed, 97 insertions(+), 17 deletions(-) create mode 100644 util/SqlUpdate/2017-07-07_00_OrgFields.sql diff --git a/src/Api/Controllers/LoginsController.cs b/src/Api/Controllers/LoginsController.cs index 2c513a34c6..f50013a923 100644 --- a/src/Api/Controllers/LoginsController.cs +++ b/src/Api/Controllers/LoginsController.cs @@ -54,14 +54,15 @@ namespace Bit.Api.Controllers [HttpGet("{id}/admin")] public async Task GetAdmin(string id) { - var login = await _cipherRepository.GetByIdAsync(new Guid(id)); + var userId = _userService.GetProperUserId(User).Value; + var login = await _cipherRepository.GetByIdAsync(new Guid(id), userId); if(login == null || !login.OrganizationId.HasValue || !_currentContext.OrganizationAdmin(login.OrganizationId.Value)) { throw new NotFoundException(); } - var response = new LoginResponseModel(login, _globalSettings); + var response = new LoginResponseModel(login, _globalSettings, login.OrganizationUseTotp); return response; } @@ -97,7 +98,7 @@ namespace Bit.Api.Controllers var userId = _userService.GetProperUserId(User).Value; await _cipherService.SaveAsync(login, userId, true); - var response = new LoginResponseModel(login, _globalSettings); + var response = new LoginResponseModel(login, _globalSettings, false); return response; } @@ -129,17 +130,17 @@ namespace Bit.Api.Controllers [HttpPost("{id}/admin")] public async Task PutAdmin(string id, [FromBody]LoginRequestModel model) { - var login = await _cipherRepository.GetByIdAsync(new Guid(id)); + var userId = _userService.GetProperUserId(User).Value; + var login = await _cipherRepository.GetByIdAsync(new Guid(id), userId); if(login == null || !login.OrganizationId.HasValue || !_currentContext.OrganizationAdmin(login.OrganizationId.Value)) { throw new NotFoundException(); } - var userId = _userService.GetProperUserId(User).Value; await _cipherService.SaveAsync(model.ToCipher(login), userId, true); - var response = new LoginResponseModel(login, _globalSettings); + var response = new LoginResponseModel(login, _globalSettings, login.OrganizationUseTotp); return response; } diff --git a/src/Core/Models/Api/Response/CipherResponseModel.cs b/src/Core/Models/Api/Response/CipherResponseModel.cs index 32cd1f7502..ddd2868883 100644 --- a/src/Core/Models/Api/Response/CipherResponseModel.cs +++ b/src/Core/Models/Api/Response/CipherResponseModel.cs @@ -48,11 +48,13 @@ namespace Bit.Core.Models.Api FolderId = cipher.FolderId?.ToString(); Favorite = cipher.Favorite; Edit = cipher.Edit; + OrganizationUseTotp = cipher.OrganizationUseTotp; } public string FolderId { get; set; } public bool Favorite { get; set; } public bool Edit { get; set; } + public bool OrganizationUseTotp { get; set; } } public class CipherDetailsResponseModel : CipherResponseModel diff --git a/src/Core/Models/Api/Response/LoginResponseModel.cs b/src/Core/Models/Api/Response/LoginResponseModel.cs index 0e9dab0fbb..5bfe27327a 100644 --- a/src/Core/Models/Api/Response/LoginResponseModel.cs +++ b/src/Core/Models/Api/Response/LoginResponseModel.cs @@ -7,7 +7,7 @@ namespace Bit.Core.Models.Api { public class LoginResponseModel : ResponseModel { - public LoginResponseModel(Cipher cipher, GlobalSettings globalSettings, string obj = "login") + public LoginResponseModel(Cipher cipher, GlobalSettings globalSettings, bool orgUseTotp, string obj = "login") : base(obj) { if(cipher == null) @@ -32,11 +32,12 @@ namespace Bit.Core.Models.Api Totp = data.Totp; RevisionDate = cipher.RevisionDate; Edit = true; + OrganizationUseTotp = orgUseTotp; Attachments = AttachmentResponseModel.FromCipher(cipher, globalSettings); } public LoginResponseModel(CipherDetails cipher, GlobalSettings globalSettings, string obj = "login") - : this(cipher as Cipher, globalSettings, obj) + : this(cipher as Cipher, globalSettings, cipher.OrganizationUseTotp, obj) { FolderId = cipher.FolderId?.ToString(); Favorite = cipher.Favorite; @@ -48,6 +49,7 @@ namespace Bit.Core.Models.Api public string FolderId { get; set; } public bool Favorite { get; set; } public bool Edit { get; set; } + public bool OrganizationUseTotp { get; set; } public string Name { get; set; } public string Uri { get; set; } public string Username { get; set; } diff --git a/src/Core/Models/Api/Response/ProfileOrganizationResponseModel.cs b/src/Core/Models/Api/Response/ProfileOrganizationResponseModel.cs index b86e9ce69c..15b3cb95e4 100644 --- a/src/Core/Models/Api/Response/ProfileOrganizationResponseModel.cs +++ b/src/Core/Models/Api/Response/ProfileOrganizationResponseModel.cs @@ -12,8 +12,10 @@ namespace Bit.Core.Models.Api Name = organization.Name; UseGroups = organization.UseGroups; UseDirectory = organization.UseDirectory; + UseTotp = organization.UseTotp; Seats = organization.Seats; MaxCollections = organization.MaxCollections; + MaxStorageGb = organization.MaxStorageGb; Key = organization.Key; Status = organization.Status; Type = organization.Type; @@ -24,8 +26,10 @@ namespace Bit.Core.Models.Api public string Name { get; set; } public bool UseGroups { get; set; } public bool UseDirectory { get; set; } + public bool UseTotp { get; set; } public int Seats { get; set; } public int MaxCollections { get; set; } + public short? MaxStorageGb { get; set; } public string Key { get; set; } public OrganizationUserStatusType Status { get; set; } public OrganizationUserType Type { get; set; } diff --git a/src/Core/Models/Data/CipherDetails.cs b/src/Core/Models/Data/CipherDetails.cs index cb1bb58527..acf55ba49d 100644 --- a/src/Core/Models/Data/CipherDetails.cs +++ b/src/Core/Models/Data/CipherDetails.cs @@ -8,5 +8,6 @@ namespace Core.Models.Data public Guid? FolderId { get; set; } public bool Favorite { get; set; } public bool Edit { get; set; } + public bool OrganizationUseTotp { get; set; } } } diff --git a/src/Core/Models/Data/OrganizationUserOrganizationDetails.cs b/src/Core/Models/Data/OrganizationUserOrganizationDetails.cs index c2651477c2..4a90f588db 100644 --- a/src/Core/Models/Data/OrganizationUserOrganizationDetails.cs +++ b/src/Core/Models/Data/OrganizationUserOrganizationDetails.cs @@ -9,8 +9,10 @@ namespace Bit.Core.Models.Data public string Name { get; set; } public bool UseGroups { get; set; } public bool UseDirectory { get; set; } + public bool UseTotp { get; set; } public int Seats { get; set; } public int MaxCollections { get; set; } + public short? MaxStorageGb { get; set; } public string Key { get; set; } public Enums.OrganizationUserStatusType Status { get; set; } public Enums.OrganizationUserType Type { get; set; } diff --git a/src/Core/Models/StaticStore/Plan.cs b/src/Core/Models/StaticStore/Plan.cs index 0a1f79708f..93d94bdbfd 100644 --- a/src/Core/Models/StaticStore/Plan.cs +++ b/src/Core/Models/StaticStore/Plan.cs @@ -13,6 +13,8 @@ namespace Bit.Core.Models.StaticStore public short? MaxAdditionalSeats { get; set; } public bool UseGroups { get; set; } public bool UseDirectory { get; set; } + public bool UseTotp { get; set; } + public short? MaxStorageGb { get; set; } public decimal BasePrice { get; set; } public decimal SeatPrice { get; set; } public short? MaxCollections { get; set; } diff --git a/src/Core/Models/Table/Organization.cs b/src/Core/Models/Table/Organization.cs index f352259b48..d25ddb51ca 100644 --- a/src/Core/Models/Table/Organization.cs +++ b/src/Core/Models/Table/Organization.cs @@ -16,6 +16,7 @@ namespace Bit.Core.Models.Table public short? MaxCollections { get; set; } public bool UseGroups { get; set; } public bool UseDirectory { get; set; } + public bool UseTotp { get; set; } public long? Storage { get; set; } public short? MaxStorageGb { get; set; } public string StripeCustomerId { get; set; } diff --git a/src/Core/Services/Implementations/CipherService.cs b/src/Core/Services/Implementations/CipherService.cs index 064c17462e..4b8bc6235f 100644 --- a/src/Core/Services/Implementations/CipherService.cs +++ b/src/Core/Services/Implementations/CipherService.cs @@ -79,6 +79,12 @@ namespace Bit.Core.Services { await _cipherRepository.CreateAsync(cipher); + if(cipher.OrganizationId.HasValue) + { + var org = await _organizationRepository.GetByIdAsync(cipher.OrganizationId.Value); + cipher.OrganizationUseTotp = org.UseTotp; + } + // push await _pushService.PushSyncCipherCreateAsync(cipher); } diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs index 5f8c75c62f..9909f9dea6 100644 --- a/src/Core/Services/Implementations/OrganizationService.cs +++ b/src/Core/Services/Implementations/OrganizationService.cs @@ -423,8 +423,10 @@ namespace Bit.Core.Services PlanType = plan.Type, Seats = (short)(plan.BaseSeats + signup.AdditionalSeats), MaxCollections = plan.MaxCollections, + MaxStorageGb = plan.MaxStorageGb, UseGroups = plan.UseGroups, UseDirectory = plan.UseDirectory, + UseTotp = plan.UseTotp, Plan = plan.Name, StripeCustomerId = customer?.Id, StripeSubscriptionId = subscription?.Id, diff --git a/src/Core/Utilities/StaticStore.cs b/src/Core/Utilities/StaticStore.cs index 1487e2c103..83b8e3a445 100644 --- a/src/Core/Utilities/StaticStore.cs +++ b/src/Core/Utilities/StaticStore.cs @@ -1,6 +1,5 @@ using Bit.Core.Enums; using Bit.Core.Models.StaticStore; -using System; using System.Collections.Generic; namespace Bit.Core.Utilities @@ -112,7 +111,9 @@ namespace Bit.Core.Utilities StripePlanId = "personal-org-annually", StripeSeatPlanId = "personal-org-seat-annually", UpgradeSortOrder = 1, - TrialPeriodDays = 7 + TrialPeriodDays = 7, + UseTotp = true, + MaxStorageGb = 1 }, new Plan { @@ -125,7 +126,9 @@ namespace Bit.Core.Utilities StripePlanId = "teams-org-monthly", StripeSeatPlanId = "teams-org-seat-monthly", UpgradeSortOrder = 2, - TrialPeriodDays = 7 + TrialPeriodDays = 7, + UseTotp = true, + MaxStorageGb = 1 }, new Plan { @@ -138,7 +141,9 @@ namespace Bit.Core.Utilities StripePlanId = "teams-org-annually", StripeSeatPlanId = "teams-org-seat-annually", UpgradeSortOrder = 2, - TrialPeriodDays = 7 + TrialPeriodDays = 7, + UseTotp = true, + MaxStorageGb = 1 }, new Plan { @@ -153,7 +158,9 @@ namespace Bit.Core.Utilities UpgradeSortOrder = 3, TrialPeriodDays = 7, UseGroups = true, - UseDirectory = true + UseDirectory = true, + UseTotp = true, + MaxStorageGb = 1 }, new Plan { @@ -168,7 +175,9 @@ namespace Bit.Core.Utilities UpgradeSortOrder = 3, TrialPeriodDays = 7, UseGroups = true, - UseDirectory = true + UseDirectory = true, + UseTotp = true, + MaxStorageGb = 1 } }; diff --git a/src/Sql/dbo/Functions/UserCipherDetails.sql b/src/Sql/dbo/Functions/UserCipherDetails.sql index 73a24d8349..1cf038e15f 100644 --- a/src/Sql/dbo/Functions/UserCipherDetails.sql +++ b/src/Sql/dbo/Functions/UserCipherDetails.sql @@ -6,7 +6,11 @@ SELECT CASE WHEN C.[UserId] IS NOT NULL OR OU.[AccessAll] = 1 OR CU.[ReadOnly] = 0 OR G.[AccessAll] = 1 OR CG.[ReadOnly] = 0 THEN 1 ELSE 0 - END [Edit] + END [Edit], + CASE + WHEN C.[UserId] IS NULL AND O.[UseTotp] = 1 THEN 1 + ELSE 0 + END [OrganizationUseTotp] FROM [dbo].[CipherDetails](@UserId) C LEFT JOIN diff --git a/src/Sql/dbo/Stored Procedures/CipherDetails_Create.sql b/src/Sql/dbo/Stored Procedures/CipherDetails_Create.sql index 747453032f..8b10900101 100644 --- a/src/Sql/dbo/Stored Procedures/CipherDetails_Create.sql +++ b/src/Sql/dbo/Stored Procedures/CipherDetails_Create.sql @@ -11,7 +11,8 @@ @RevisionDate DATETIME2(7), @FolderId UNIQUEIDENTIFIER, @Favorite BIT, - @Edit BIT -- not used + @Edit BIT, -- not used + @OrganizationUseTotp BIT -- not used AS BEGIN SET NOCOUNT ON diff --git a/src/Sql/dbo/Stored Procedures/CipherDetails_Update.sql b/src/Sql/dbo/Stored Procedures/CipherDetails_Update.sql index b0c09bc13e..951cb4bfe3 100644 --- a/src/Sql/dbo/Stored Procedures/CipherDetails_Update.sql +++ b/src/Sql/dbo/Stored Procedures/CipherDetails_Update.sql @@ -11,7 +11,8 @@ @RevisionDate DATETIME2(7), @FolderId UNIQUEIDENTIFIER, @Favorite BIT, - @Edit BIT -- not used + @Edit BIT, -- not used + @OrganizationUseTotp BIT -- not used AS BEGIN SET NOCOUNT ON diff --git a/src/Sql/dbo/Stored Procedures/Organization_Create.sql b/src/Sql/dbo/Stored Procedures/Organization_Create.sql index f2b0c8f246..555d3fbb61 100644 --- a/src/Sql/dbo/Stored Procedures/Organization_Create.sql +++ b/src/Sql/dbo/Stored Procedures/Organization_Create.sql @@ -9,6 +9,7 @@ @MaxCollections SMALLINT, @UseGroups BIT, @UseDirectory BIT, + @UseTotp BIT, @Storage BIGINT, @MaxStorageGb SMALLINT, @StripeCustomerId VARCHAR(50), @@ -32,6 +33,7 @@ BEGIN [MaxCollections], [UseGroups], [UseDirectory], + [UseTotp], [Storage], [MaxStorageGb], [StripeCustomerId], @@ -52,6 +54,7 @@ BEGIN @MaxCollections, @UseGroups, @UseDirectory, + @UseTotp, @Storage, @MaxStorageGb, @StripeCustomerId, diff --git a/src/Sql/dbo/Stored Procedures/Organization_Update.sql b/src/Sql/dbo/Stored Procedures/Organization_Update.sql index 131e4ee3d1..3f3160d1db 100644 --- a/src/Sql/dbo/Stored Procedures/Organization_Update.sql +++ b/src/Sql/dbo/Stored Procedures/Organization_Update.sql @@ -9,6 +9,7 @@ @MaxCollections SMALLINT, @UseGroups BIT, @UseDirectory BIT, + @UseTotp BIT, @Storage BIGINT, @MaxStorageGb SMALLINT, @StripeCustomerId VARCHAR(50), @@ -33,6 +34,7 @@ BEGIN [MaxCollections] = @MaxCollections, [UseGroups] = @UseGroups, [UseDirectory] = @UseDirectory, + [UseTotp] = @UseTotp, [Storage] = @Storage, [MaxStorageGb] = @MaxStorageGb, [StripeCustomerId] = @StripeCustomerId, diff --git a/src/Sql/dbo/Tables/Organization.sql b/src/Sql/dbo/Tables/Organization.sql index 088fc64f5b..6ac0e32fac 100644 --- a/src/Sql/dbo/Tables/Organization.sql +++ b/src/Sql/dbo/Tables/Organization.sql @@ -9,6 +9,7 @@ [MaxCollections] SMALLINT NULL, [UseGroups] BIT NOT NULL, [UseDirectory] BIT NOT NULL, + [UseTotp] BIT NOT NULL, [Storage] BIGINT NULL, [MaxStorageGb] SMALLINT NULL, [StripeCustomerId] VARCHAR (50) NULL, diff --git a/src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql b/src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql index e304244c11..6a54786893 100644 --- a/src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql +++ b/src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql @@ -7,8 +7,10 @@ SELECT O.[Enabled], O.[UseGroups], O.[UseDirectory], + O.[UseTotp], O.[Seats], O.[MaxCollections], + O.[MaxStorageGb], OU.[Key], OU.[Status], OU.[Type] diff --git a/util/SqlUpdate/2017-06-30_00_UserPremium.sql b/util/SqlUpdate/2017-06-30_00_UserPremium.sql index 506e49c7d2..29004a0adb 100644 --- a/util/SqlUpdate/2017-06-30_00_UserPremium.sql +++ b/util/SqlUpdate/2017-06-30_00_UserPremium.sql @@ -6,3 +6,14 @@ go alter table [user] alter column [premium] BIT NOT NULL go + +drop view [dbo].[UserView] +go + +CREATE VIEW [dbo].[UserView] +AS +SELECT + * +FROM + [dbo].[User] +GO diff --git a/util/SqlUpdate/2017-07-07_00_OrgFields.sql b/util/SqlUpdate/2017-07-07_00_OrgFields.sql new file mode 100644 index 0000000000..4a89083a29 --- /dev/null +++ b/util/SqlUpdate/2017-07-07_00_OrgFields.sql @@ -0,0 +1,23 @@ +alter table [organization] add [UseTotp] BIT NULL +go + +-- all but free plans +update [organization] +set +[UseTotp] = CASE WHEN [organization].[plantype] != 0 THEN 1 ELSE 0 END, +[MaxStorageGb] = CASE WHEN [organization].[plantype] != 0 THEN 1 ELSE NULL END +go + +alter table [organization] alter column [UseTotp] BIT NOT NULL +go + +drop view [dbo].[OrganizationView] +go + +CREATE VIEW [dbo].[OrganizationView] +AS +SELECT + * +FROM + [dbo].[Organization] +GO