From 3360d40592e84458cc7b1026280273598936e70d Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Fri, 17 Jun 2022 06:30:50 +1000 Subject: [PATCH] [EC-243] Grant premium status when member accepts org invite (#2043) --- src/Api/Controllers/AccountsController.cs | 6 +-- src/Api/Controllers/SyncController.cs | 3 +- .../Models/Response/ProfileResponseModel.cs | 5 ++- src/Api/Models/Response/SyncResponseModel.cs | 3 +- src/Core/Services/IUserService.cs | 1 + .../Services/Implementations/UserService.cs | 30 ++++++++++---- test/Core.Test/Services/UserServiceTests.cs | 39 +++++++++++++++++++ 7 files changed, 73 insertions(+), 14 deletions(-) diff --git a/src/Api/Controllers/AccountsController.cs b/src/Api/Controllers/AccountsController.cs index 1aa5275bf3..80cb145e0a 100644 --- a/src/Api/Controllers/AccountsController.cs +++ b/src/Api/Controllers/AccountsController.cs @@ -441,7 +441,7 @@ namespace Bit.Api.Controllers await _providerUserRepository.GetManyOrganizationDetailsByUserAsync(user.Id, ProviderUserStatusType.Confirmed); var response = new ProfileResponseModel(user, organizationUserDetails, providerUserDetails, - providerUserOrganizationDetails, await _userService.TwoFactorIsEnabledAsync(user)); + providerUserOrganizationDetails, await _userService.TwoFactorIsEnabledAsync(user), await _userService.HasPremiumFromOrganization(user)); return response; } @@ -466,7 +466,7 @@ namespace Bit.Api.Controllers } await _userService.SaveUserAsync(model.ToUser(user)); - var response = new ProfileResponseModel(user, null, null, null, await _userService.TwoFactorIsEnabledAsync(user)); + var response = new ProfileResponseModel(user, null, null, null, await _userService.TwoFactorIsEnabledAsync(user), await _userService.HasPremiumFromOrganization(user)); return response; } @@ -617,7 +617,7 @@ namespace Bit.Api.Controllers BillingAddressCountry = model.Country, BillingAddressPostalCode = model.PostalCode, }); - var profile = new ProfileResponseModel(user, null, null, null, await _userService.TwoFactorIsEnabledAsync(user)); + var profile = new ProfileResponseModel(user, null, null, null, await _userService.TwoFactorIsEnabledAsync(user), await _userService.HasPremiumFromOrganization(user)); return new PaymentResponseModel { UserProfile = profile, diff --git a/src/Api/Controllers/SyncController.cs b/src/Api/Controllers/SyncController.cs index ce64ad65ec..d42b67d2d5 100644 --- a/src/Api/Controllers/SyncController.cs +++ b/src/Api/Controllers/SyncController.cs @@ -88,7 +88,8 @@ namespace Bit.Api.Controllers } var userTwoFactorEnabled = await _userService.TwoFactorIsEnabledAsync(user); - var response = new SyncResponseModel(_globalSettings, user, userTwoFactorEnabled, organizationUserDetails, + var userHasPremiumFromOrganization = await _userService.HasPremiumFromOrganization(user); + var response = new SyncResponseModel(_globalSettings, user, userTwoFactorEnabled, userHasPremiumFromOrganization, organizationUserDetails, providerUserDetails, providerUserOrganizationDetails, folders, collections, ciphers, collectionCiphersGroupDict, excludeDomains, policies, sends); return response; diff --git a/src/Api/Models/Response/ProfileResponseModel.cs b/src/Api/Models/Response/ProfileResponseModel.cs index 59864dc878..0f13173dc0 100644 --- a/src/Api/Models/Response/ProfileResponseModel.cs +++ b/src/Api/Models/Response/ProfileResponseModel.cs @@ -15,7 +15,8 @@ namespace Bit.Api.Models.Response IEnumerable organizationsUserDetails, IEnumerable providerUserDetails, IEnumerable providerUserOrganizationDetails, - bool twoFactorEnabled) : base("profile") + bool twoFactorEnabled, + bool premiumFromOrganization) : base("profile") { if (user == null) { @@ -27,6 +28,7 @@ namespace Bit.Api.Models.Response Email = user.Email; EmailVerified = user.EmailVerified; Premium = user.Premium; + PremiumFromOrganization = premiumFromOrganization; MasterPasswordHint = string.IsNullOrWhiteSpace(user.MasterPasswordHint) ? null : user.MasterPasswordHint; Culture = user.Culture; TwoFactorEnabled = twoFactorEnabled; @@ -46,6 +48,7 @@ namespace Bit.Api.Models.Response public string Email { get; set; } public bool EmailVerified { get; set; } public bool Premium { get; set; } + public bool PremiumFromOrganization { get; set; } public string MasterPasswordHint { get; set; } public string Culture { get; set; } public bool TwoFactorEnabled { get; set; } diff --git a/src/Api/Models/Response/SyncResponseModel.cs b/src/Api/Models/Response/SyncResponseModel.cs index a2aba04289..8f09bfba6d 100644 --- a/src/Api/Models/Response/SyncResponseModel.cs +++ b/src/Api/Models/Response/SyncResponseModel.cs @@ -16,6 +16,7 @@ namespace Bit.Api.Models.Response GlobalSettings globalSettings, User user, bool userTwoFactorEnabled, + bool userHasPremiumFromOrganization, IEnumerable organizationUserDetails, IEnumerable providerUserDetails, IEnumerable providerUserOrganizationDetails, @@ -29,7 +30,7 @@ namespace Bit.Api.Models.Response : base("sync") { Profile = new ProfileResponseModel(user, organizationUserDetails, providerUserDetails, - providerUserOrganizationDetails, userTwoFactorEnabled); + providerUserOrganizationDetails, userTwoFactorEnabled, userHasPremiumFromOrganization); Folders = folders.Select(f => new FolderResponseModel(f)); Ciphers = ciphers.Select(c => new CipherDetailsResponseModel(c, globalSettings, collectionCiphersDict)); Collections = collections?.Select( diff --git a/src/Core/Services/IUserService.cs b/src/Core/Services/IUserService.cs index da316fb7ad..716a981d0f 100644 --- a/src/Core/Services/IUserService.cs +++ b/src/Core/Services/IUserService.cs @@ -70,6 +70,7 @@ namespace Bit.Core.Services int? version = null); Task CheckPasswordAsync(User user, string password); Task CanAccessPremium(ITwoFactorProvidersUser user); + Task HasPremiumFromOrganization(ITwoFactorProvidersUser user); Task TwoFactorIsEnabledAsync(ITwoFactorProvidersUser user); Task TwoFactorProviderIsEnabledAsync(TwoFactorProviderType provider, ITwoFactorProvidersUser user); Task GenerateSignInTokenAsync(User user, string purpose); diff --git a/src/Core/Services/Implementations/UserService.cs b/src/Core/Services/Implementations/UserService.cs index 2e53755160..ced91ce6b6 100644 --- a/src/Core/Services/Implementations/UserService.cs +++ b/src/Core/Services/Implementations/UserService.cs @@ -1263,18 +1263,32 @@ namespace Bit.Core.Services { return false; } - if (user.GetPremium()) - { - return true; - } - var orgs = await _currentContext.OrganizationMembershipAsync(_organizationUserRepository, userId.Value); - if (!orgs.Any()) + + return user.GetPremium() || await this.HasPremiumFromOrganization(user); + } + + public async Task HasPremiumFromOrganization(ITwoFactorProvidersUser user) + { + var userId = user.GetUserId(); + if (!userId.HasValue) { return false; } + + // orgUsers in the Invited status are not associated with a userId yet, so this will get + // orgUsers in Accepted and Confirmed states only + var orgUsers = await _organizationUserRepository.GetManyByUserAsync(userId.Value); + + if (!orgUsers.Any()) + { + return false; + } + var orgAbilities = await _applicationCacheService.GetOrganizationAbilitiesAsync(); - return orgs.Any(o => orgAbilities.ContainsKey(o.Id) && - orgAbilities[o.Id].UsersGetPremium && orgAbilities[o.Id].Enabled); + return orgUsers.Any(ou => + orgAbilities.TryGetValue(ou.OrganizationId, out var orgAbility) && + orgAbility.UsersGetPremium && + orgAbility.Enabled); } public async Task TwoFactorIsEnabledAsync(ITwoFactorProvidersUser user) diff --git a/test/Core.Test/Services/UserServiceTests.cs b/test/Core.Test/Services/UserServiceTests.cs index 655af0d16b..6e4c33b3fe 100644 --- a/test/Core.Test/Services/UserServiceTests.cs +++ b/test/Core.Test/Services/UserServiceTests.cs @@ -7,6 +7,7 @@ using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Models; using Bit.Core.Models.Business; +using Bit.Core.Models.Data.Organizations; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Test.Common.AutoFixture; @@ -350,5 +351,43 @@ namespace Bit.Core.Test.Services Assert.False(sutProvider.Sut.CanEditDeviceVerificationSettings(user)); } + + [Theory, CustomAutoData(typeof(SutProviderCustomization))] + public async void HasPremiumFromOrganization_Returns_False_If_No_Orgs(SutProvider sutProvider, User user) + { + sutProvider.GetDependency().GetManyByUserAsync(user.Id).Returns(new List()); + Assert.False(await sutProvider.Sut.HasPremiumFromOrganization(user)); + + } + + [Theory] + [InlineCustomAutoData(new[] { typeof(SutProviderCustomization) }, false, true)] + [InlineCustomAutoData(new[] { typeof(SutProviderCustomization) }, true, false)] + public async void HasPremiumFromOrganization_Returns_False_If_Org_Not_Eligible(bool orgEnabled, bool orgUsersGetPremium, SutProvider sutProvider, User user, OrganizationUser orgUser, Organization organization) + { + orgUser.OrganizationId = organization.Id; + organization.Enabled = orgEnabled; + organization.UsersGetPremium = orgUsersGetPremium; + var orgAbilities = new Dictionary() { { organization.Id, new OrganizationAbility(organization) } }; + + sutProvider.GetDependency().GetManyByUserAsync(user.Id).Returns(new List() { orgUser }); + sutProvider.GetDependency().GetOrganizationAbilitiesAsync().Returns(orgAbilities); + + Assert.False(await sutProvider.Sut.HasPremiumFromOrganization(user)); + } + + [Theory, CustomAutoData(typeof(SutProviderCustomization))] + public async void HasPremiumFromOrganization_Returns_True_If_Org_Eligible(SutProvider sutProvider, User user, OrganizationUser orgUser, Organization organization) + { + orgUser.OrganizationId = organization.Id; + organization.Enabled = true; + organization.UsersGetPremium = true; + var orgAbilities = new Dictionary() { { organization.Id, new OrganizationAbility(organization) } }; + + sutProvider.GetDependency().GetManyByUserAsync(user.Id).Returns(new List() { orgUser }); + sutProvider.GetDependency().GetOrganizationAbilitiesAsync().Returns(orgAbilities); + + Assert.True(await sutProvider.Sut.HasPremiumFromOrganization(user)); + } } }