Merge branch 'main' into ac/pm-33919-automatically-confirm-pending-users-on-admin-login

Author: JaredScar

bitwarden_license/src/Scim/Models/ScimUserRequestModel.cs

@@ -1,8 +1,8 @@
 // FIXME: Update this file to be null safe and then delete the line below
 #nullable disable
 
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Enums;
-using Bit.Core.AdminConsole.Models.Business;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
@@ -34,7 +34,7 @@ public OrganizationUserInvite ToOrganizationUserInvite(ScimProviderType scimProv
 
     public InviteOrganizationUsersRequest ToRequest(
         ScimProviderType scimProvider,
-        InviteOrganization inviteOrganization,
+        Organization organization,
         DateTimeOffset performedAt)
     {
         var email = EmailForInvite(scimProvider);
@@ -52,7 +52,7 @@ public InviteOrganizationUsersRequest ToRequest(
                         externalId: ExternalIdForInvite()
                     )
             ],
-            inviteOrganization: inviteOrganization,
+            organization: organization,
             performedBy: Guid.Empty, // SCIM does not have a user id
             performedAt: performedAt);
     }

bitwarden_license/src/Scim/Users/PostUserCommand.cs

@@ -2,12 +2,10 @@
 
 using Bit.Core;
 using Bit.Core.AdminConsole.Enums;
-using Bit.Core.AdminConsole.Models.Business;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Errors;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models;
 using Bit.Core.AdminConsole.Utilities.Commands;
-using Bit.Core.Billing.Pricing;
 using Bit.Core.Billing.Services;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
@@ -29,8 +27,7 @@ public class PostUserCommand(
     IScimContext scimContext,
     IFeatureService featureService,
     IInviteOrganizationUsersCommand inviteOrganizationUsersCommand,
-    TimeProvider timeProvider,
-    IPricingClient pricingClient)
+    TimeProvider timeProvider)
     : IPostUserCommand
 {
     public async Task<OrganizationUserUserDetails?> PostUserAsync(Guid organizationId, ScimUserRequestModel model)
@@ -55,15 +52,13 @@ public class PostUserCommand(
             throw new NotFoundException();
         }
 
-        var plan = await pricingClient.GetPlanOrThrow(organization.PlanType);
-
         var request = model.ToRequest(
             scimProvider: scimProvider,
-            inviteOrganization: new InviteOrganization(organization, plan),
+            organization: organization,
             performedAt: timeProvider.GetUtcNow());
 
         var orgUsers = await organizationUserRepository
-            .GetManyDetailsByOrganizationAsync(request.InviteOrganization.OrganizationId);
+            .GetManyDetailsByOrganizationAsync(request.Organization.Id);
 
         if (orgUsers.Any(existingUser =>
                 request.Invites.First().Email.Equals(existingUser.Email, StringComparison.OrdinalIgnoreCase) ||

src/Api/AdminConsole/Models/Response/BaseProfileOrganizationResponseModel.cs

@@ -52,6 +52,7 @@ protected BaseProfileOrganizationResponseModel(
         UseDisableSMAdsForUsers = organizationDetails.UseDisableSMAdsForUsers;
         UsePasswordManager = organizationDetails.UsePasswordManager;
         UseMyItems = organizationDetails.UseMyItems;
+        UseInviteLinks = organizationDetails.UseInviteLinks;
         SelfHost = organizationDetails.SelfHost;
         Seats = organizationDetails.Seats;
         MaxCollections = organizationDetails.MaxCollections;
@@ -106,6 +107,7 @@ protected BaseProfileOrganizationResponseModel(
     public bool UseDisableSMAdsForUsers { get; set; }
     public bool UsePhishingBlocker { get; set; }
     public bool UseMyItems { get; set; }
+    public bool UseInviteLinks { get; set; }
     public bool SelfHost { get; set; }
     public int? Seats { get; set; }
     public short? MaxCollections { get; set; }

src/Api/AdminConsole/Models/Response/Organizations/OrganizationResponseModel.cs

@@ -77,6 +77,7 @@ public OrganizationResponseModel(
         UseDisableSmAdsForUsers = organization.UseDisableSmAdsForUsers;
         UsePhishingBlocker = organization.UsePhishingBlocker;
         UseMyItems = organization.UseMyItems;
+        UseInviteLinks = organization.UseInviteLinks;
     }
 
     public Guid Id { get; set; }
@@ -129,6 +130,7 @@ public OrganizationResponseModel(
     public bool UseDisableSmAdsForUsers { get; set; }
     public bool UsePhishingBlocker { get; set; }
     public bool UseMyItems { get; set; }
+    public bool UseInviteLinks { get; set; }
 }
 
 public class OrganizationSubscriptionResponseModel : OrganizationResponseModel

src/Api/AdminConsole/Models/Response/Organizations/OrganizationUserResponseModel.cs

@@ -147,6 +147,7 @@ public OrganizationUserUserDetailsResponseModel((OrganizationUserUserDetails Org
         // Prevent reset password when using key connector.
         ResetPasswordEnrolled = ResetPasswordEnrolled && !data.OrgUser.UsesKeyConnector;
         ClaimedByOrganization = data.ClaimedByOrganization;
+        RevocationReason = data.OrgUser.RevocationReason;
     }
 
     public OrganizationUserUserDetailsResponseModel(OrganizationUserUserDetails organizationUser,
@@ -168,6 +169,7 @@ public OrganizationUserUserDetailsResponseModel(OrganizationUserUserDetails orga
         // Prevent reset password when using key connector.
         ResetPasswordEnrolled = ResetPasswordEnrolled && !organizationUser.UsesKeyConnector;
         ClaimedByOrganization = claimedByOrganization;
+        RevocationReason = organizationUser.RevocationReason;
     }
 
     public string Name { get; set; }
@@ -188,6 +190,11 @@ public bool ManagedByOrganization
     public bool ClaimedByOrganization { get; set; }
     public IEnumerable<SelectionReadOnlyResponseModel> Collections { get; set; }
     public IEnumerable<Guid> Groups { get; set; }
+    /// <summary>
+    /// The reason the user is revoked. Null if the user is not revoked, or was revoked before
+    /// revocation reasons were tracked.
+    /// </summary>
+    public RevocationReason? RevocationReason { get; set; }
 }
 
 public class OrganizationUserResetPasswordDetailsResponseModel : ResponseModel

src/Api/AdminConsole/Public/Controllers/MembersController.cs

@@ -3,7 +3,6 @@
 using Bit.Api.AdminConsole.Public.Models.Response;
 using Bit.Api.Models.Public.Response;
 using Bit.Core;
-using Bit.Core.AdminConsole.Models.Business;
 using Bit.Core.AdminConsole.Models.Data;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers;
@@ -14,7 +13,6 @@
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.AdminConsole.Utilities.Commands;
 using Bit.Core.Auth.UserFeatures.TwoFactorAuth.Interfaces;
-using Bit.Core.Billing.Pricing;
 using Bit.Core.Billing.Services;
 using Bit.Core.Context;
 using Bit.Core.Enums;
@@ -46,7 +44,6 @@ public class MembersController : Controller
     private readonly IRestoreOrganizationUserCommand _restoreOrganizationUserCommand;
     private readonly IFeatureService _featureService;
     private readonly IInviteOrganizationUsersCommand _inviteOrganizationUsersCommand;
-    private readonly IPricingClient _pricingClient;
     private readonly TimeProvider _timeProvider;
 
     public MembersController(
@@ -65,7 +62,6 @@ public MembersController(
         IRestoreOrganizationUserCommand restoreOrganizationUserCommand,
         IFeatureService featureService,
         IInviteOrganizationUsersCommand inviteOrganizationUsersCommand,
-        IPricingClient pricingClient,
         TimeProvider timeProvider)
     {
         _organizationUserRepository = organizationUserRepository;
@@ -83,7 +79,6 @@ public MembersController(
         _restoreOrganizationUserCommand = restoreOrganizationUserCommand;
         _featureService = featureService;
         _inviteOrganizationUsersCommand = inviteOrganizationUsersCommand;
-        _pricingClient = pricingClient;
         _timeProvider = timeProvider;
     }
 
@@ -194,9 +189,7 @@ private async Task<IActionResult> PostInviteUserAsync_vNext(
         Core.AdminConsole.Entities.Organization organization,
         bool hasStandaloneSecretsManager)
     {
-        var plan = await _pricingClient.GetPlanOrThrow(organization.PlanType);
-        var inviteOrganization = new InviteOrganization(organization, plan);
-        var request = model.ToInviteRequest(inviteOrganization, hasStandaloneSecretsManager, Guid.Empty, _timeProvider.GetUtcNow());
+        var request = model.ToInviteRequest(organization, hasStandaloneSecretsManager, Guid.Empty, _timeProvider.GetUtcNow());
 
         var result = await _inviteOrganizationUsersCommand.InviteImportedOrganizationUsersAsync(request);
 

src/Api/AdminConsole/Public/Models/Request/MemberCreateRequestModel.cs

@@ -2,7 +2,7 @@
 #nullable disable
 
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.AdminConsole.Models.Business;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
@@ -48,7 +48,7 @@ public OrganizationUserInvite ToOrganizationUserInvite()
     }
 
     public InviteOrganizationUsersRequest ToInviteRequest(
-        InviteOrganization inviteOrganization,
+        Organization organization,
         bool accessSecretsManager,
         Guid performedBy,
         DateTimeOffset performedAt)
@@ -70,7 +70,7 @@ public InviteOrganizationUsersRequest ToInviteRequest(
                     externalId: ExternalId,
                     accessSecretsManager: accessSecretsManager)
             ],
-            inviteOrganization: inviteOrganization,
+            organization: organization,
             performedBy: performedBy,
             performedAt: performedAt);
     }

src/Api/Auth/Controllers/WebAuthnController.cs

@@ -159,7 +159,7 @@ private async Task ValidateIfUserCanUsePasskeyLogin(Guid userId)
     public async Task UpdateCredential([FromBody] WebAuthnLoginCredentialUpdateRequestModel model)
     {
         var tokenable = _assertionOptionsDataProtector.Unprotect(model.Token);
-        if (!tokenable.TokenIsValid(WebAuthnLoginAssertionOptionsScope.UpdateKeySet))
+        if (!tokenable.TokenIsValid(WebAuthnLoginAssertionOptionsScope.UpdateKeySet) || tokenable.Options == null)
         {
             throw new BadRequestException("The token associated with your request is invalid or has expired. A valid token is required to continue.");
         }

src/Api/Models/Response/PlanResponseModel.cs

@@ -39,6 +39,7 @@ public PlanResponseModel(Plan plan, string obj = "plan")
         HasResetPassword = plan.HasResetPassword;
         UsersGetPremium = plan.UsersGetPremium;
         HasMyItems = plan.HasMyItems;
+        HasInviteLinks = plan.HasInviteLinks;
         UpgradeSortOrder = plan.UpgradeSortOrder;
         DisplaySortOrder = plan.DisplaySortOrder;
         LegacyYear = plan.LegacyYear;
@@ -80,6 +81,7 @@ public PlanResponseModel(Organization organization, string obj = "plan") : base(
     public bool HasResetPassword { get; set; }
     public bool UsersGetPremium { get; set; }
     public bool HasMyItems { get; set; }
+    public bool HasInviteLinks { get; set; }
 
     public int UpgradeSortOrder { get; set; }
     public int DisplaySortOrder { get; set; }

src/Core/AdminConsole/Entities/Organization.cs

@@ -150,6 +150,12 @@ public class Organization : ITableObject<Guid>, IStorableSubscriber, IRevisable
     /// </summary>
     public bool UseMyItems { get; set; }
 
+    /// <summary>
+    /// If set to true, the organization can generate invite links to invite users to the organization.
+    /// This is an Enterprise-only feature.
+    /// </summary>
+    public bool UseInviteLinks { get; set; }
+
     /// <summary>
     /// When set to <see langword="true"/>, the organization is excluded from automated billing
     /// lifecycle operations such as subscription cancellation and disabling for non-payment.
@@ -337,6 +343,7 @@ public void UpdateFromLicense(OrganizationLicense license, IFeatureService featu
         UseApi = license.UseApi;
         UsePolicies = license.UsePolicies;
         UseMyItems = license.UseMyItems;
+        UseInviteLinks = license.UseInviteLinks;
         UseSso = license.UseSso;
         UseKeyConnector = license.UseKeyConnector;
         UseScim = license.UseScim;