mirror of
https://github.com/bitwarden/server
synced 2025-12-11 13:53:40 +00:00
* feat: Add stored procedure for reading organization user details with premium access by organization ID The code changes include: - Addition of a new stored procedure [dbo].[OrganizationUserUserDetailsWithPremiumAccess_ReadByOrganizationId] to read organization user details with premium access by organization ID - Modification of the IUserService interface to include an optional parameter for checking two-factor authentication with premium access - Modification of the UserService class to handle the new optional parameter in the TwoFactorIsEnabledAsync method - Addition of a new method GetManyDetailsWithPremiumAccessByOrganizationAsync in the IOrganizationUserRepository interface to retrieve organization user details with premium access by organization ID - Addition of a new view [dbo].[OrganizationUserUserDetailsWithPremiumAccessView] to retrieve organization user details with premium access * Add IUserRepository.SearchDetailsAsync that includes the field HasPremiumAccess * Check the feature flag on Admin.UsersController to see if the optimization runs * Modify PolicyService to run query optimization if the feature flag is enabled * Refactor the parameter check on UserService.TwoFactorIsEnabledAsync * Run query optimization on public MembersController if feature flag is enabled * Restore refactor * Reverted change used for development * Add unit tests for OrganizationService.RestoreUser * Separate new CheckPoliciesBeforeRestoreAsync optimization into new method * Add more unit tests * Apply refactor to bulk restore * Add GetManyDetailsAsync method to IUserRepository. Add ConfirmUsersAsync_vNext method to IOrganizationService * Add unit tests for ConfirmUser_vNext * Refactor the optimization to use the new TwoFactorIsEnabledAsync method instead of changing the existing one * Removed unused sql scripts and added migration script * Remove unnecessary view * chore: Remove unused SearchDetailsAsync method from IUserRepository and UserRepository * refactor: Use UserDetails constructor in UserRepository * Add summary to IUserRepository.GetManyDetailsAsync * Add summary descriptions to IUserService.TwoFactorIsEnabledAsync * Remove obsolete annotation from IUserRepository.UpdateUserKeyAndEncryptedDataAsync * refactor: Rename UserDetails to UserWithCalculatedPremium across the codebase * Extract IUserService.TwoFactorIsEnabledAsync into a new TwoFactorIsEnabledQuery class * Add unit tests for TwoFactorIsEnabledQuery * Update TwoFactorIsEnabledQueryTests to include additional provider types * Refactor TwoFactorIsEnabledQuery * Refactor TwoFactorIsEnabledQuery and update tests * refactor: Update TwoFactorIsEnabledQueryTests to include test for null TwoFactorProviders * refactor: Improve TwoFactorIsEnabledQuery and update tests * refactor: Improve TwoFactorIsEnabledQuery and update tests * Remove empty <returns> from summary * Update User_ReadByIdsWithCalculatedPremium stored procedure to accept JSON array of IDs
36 lines
1.7 KiB
C#
36 lines
1.7 KiB
C#
using Bit.Core.Auth.UserFeatures.UserKey;
|
|
using Bit.Core.Entities;
|
|
using Bit.Core.Models.Data;
|
|
|
|
#nullable enable
|
|
|
|
namespace Bit.Core.Repositories;
|
|
|
|
public interface IUserRepository : IRepository<User, Guid>
|
|
{
|
|
Task<User?> GetByEmailAsync(string email);
|
|
Task<IEnumerable<User>> GetManyByEmailsAsync(IEnumerable<string> emails);
|
|
Task<User?> GetBySsoUserAsync(string externalId, Guid? organizationId);
|
|
Task<UserKdfInformation?> GetKdfInformationByEmailAsync(string email);
|
|
Task<ICollection<User>> SearchAsync(string email, int skip, int take);
|
|
Task<ICollection<User>> GetManyByPremiumAsync(bool premium);
|
|
Task<string?> GetPublicKeyAsync(Guid id);
|
|
Task<DateTime> GetAccountRevisionDateAsync(Guid id);
|
|
Task UpdateStorageAsync(Guid id);
|
|
Task UpdateRenewalReminderDateAsync(Guid id, DateTime renewalReminderDate);
|
|
Task<IEnumerable<User>> GetManyAsync(IEnumerable<Guid> ids);
|
|
/// <summary>
|
|
/// Retrieves the data for the requested user IDs and includes an additional property indicating
|
|
/// whether the user has premium access directly or through an organization.
|
|
/// </summary>
|
|
Task<IEnumerable<UserWithCalculatedPremium>> GetManyWithCalculatedPremiumAsync(IEnumerable<Guid> ids);
|
|
/// <summary>
|
|
/// Sets a new user key and updates all encrypted data.
|
|
/// <para>Warning: Any user key encrypted data not included will be lost.</para>
|
|
/// </summary>
|
|
/// <param name="user">The user to update</param>
|
|
/// <param name="updateDataActions">Registered database calls to update re-encrypted data.</param>
|
|
Task UpdateUserKeyAndEncryptedDataAsync(User user,
|
|
IEnumerable<UpdateEncryptedDataForKeyRotation> updateDataActions);
|
|
}
|