nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 08:02:49 -05:00
Code Activity

Bulk re-invite of org users (#1316)

Browse Source 
* Add APIs for Bulk reinvinte

* Resolve review comments.
This commit is contained in:
Oscar Hinton
2021-05-12 11:18:25 +02:00
committed by GitHub
parent 69c2673f1f
commit e2f633dace
9 changed files with 98 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Core/Models/Api/Request/Organizations/OrganizationUserRequestModels.cs
View File

@ -1,4 +1,5 @@
using Bit.Core.Models.Data;
using System;
using Bit.Core.Models.Data;
using Bit.Core.Models.Table;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@ -89,4 +90,10 @@ namespace Bit.Core.Models.Api
{
public string ResetPasswordKey { get; set; }
}
public class OrganizationUserBulkReinviteRequestModel
{
[Required]
public IEnumerable<Guid> Ids { get; set; }
}
}

1
src/Core/Repositories/IOrganizationUserRepository.cs
View File

@ -29,6 +29,7 @@ namespace Bit.Core.Repositories
Task CreateAsync(OrganizationUser obj, IEnumerable<SelectionReadOnly> collections);
Task ReplaceAsync(OrganizationUser obj, IEnumerable<SelectionReadOnly> collections);
Task<ICollection<OrganizationUser>> GetManyByManyUsersAsync(IEnumerable<Guid> userIds);
Task<ICollection<OrganizationUser>> GetManyAsync(IEnumerable<Guid> Ids);
Task<OrganizationUser> GetByOrganizationEmailAsync(Guid organizationId, string email);
}
}

13
src/Core/Repositories/SqlServer/OrganizationUserRepository.cs
View File

@ -260,6 +260,19 @@ namespace Bit.Core.Repositories.SqlServer
}
}
public async Task<ICollection<OrganizationUser>> GetManyAsync(IEnumerable<Guid> Ids)
{
using (var connection = new SqlConnection(ConnectionString))
{
var results = await connection.QueryAsync<OrganizationUser>(
"[dbo].[OrganizationUser_ReadByIds]",
new { Ids = Ids.ToGuidIdArrayTVP() },
commandType: CommandType.StoredProcedure);
return results.ToList();
}
}
public async Task<OrganizationUser> GetByOrganizationEmailAsync(Guid organizationId, string email)
{
using (var connection = new SqlConnection(ConnectionString))

1
src/Core/Services/IOrganizationService.cs
View File

@ -33,6 +33,7 @@ namespace Bit.Core.Services
Task<OrganizationUser> InviteUserAsync(Guid organizationId, Guid? invitingUserId, string email,
OrganizationUserType type, bool accessAll, string externalId, IEnumerable<SelectionReadOnly> collections);
Task<List<OrganizationUser>> InviteUserAsync(Guid organizationId, Guid? invitingUserId, string externalId, OrganizationUserInvite orgUserInvite);
Task ResendInvitesAsync(Guid organizationId, Guid? invitingUserId, IEnumerable<Guid> organizationUsersId);
Task ResendInviteAsync(Guid organizationId, Guid? invitingUserId, Guid organizationUserId);
Task<OrganizationUser> AcceptUserAsync(Guid organizationUserId, User user, string token,
IUserService userService);

19
src/Core/Services/Implementations/OrganizationService.cs
View File

@ -1076,6 +1076,25 @@ namespace Bit.Core.Services
return orgUsers;
}
public async Task ResendInvitesAsync(Guid organizationId, Guid? invitingUserId,
IEnumerable<Guid> organizationUsersId)
{
var orgUsers = await _organizationUserRepository.GetManyAsync(organizationUsersId);
var filteredUsers = orgUsers
.Where(u => u.Status == OrganizationUserStatusType.Invited && u.OrganizationId == organizationId);
if (!filteredUsers.Any())
{
throw new BadRequestException("Users invalid.");
}
var org = await GetOrgById(organizationId);
foreach (var orgUser in filteredUsers)
{
await SendInviteAsync(orgUser, org);
}
}
public async Task ResendInviteAsync(Guid organizationId, Guid? invitingUserId, Guid organizationUserId)
{
var orgUser = await _organizationUserRepository.GetByIdAsync(organizationUserId);