mirrors/Remotely
3
0
Fork 0
mirror of https://github.com/immense/Remotely.git synced 2025-10-26 11:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change GetAllUsersInOrganization signature.

Browse Source
This commit is contained in:
Jared Goodwin 2021-04-20 07:37:34 -07:00
parent d9ed96d4fd
commit 3d49b74bf2
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Server/Pages/GetSupport.cshtml.cs
View File

@ -48,7 +48,7 @@ namespace Remotely.Server.Pages
var alertMessage = string.Join(" ", alertParts);
await _dataService.AddAlert(deviceID, orgID, alertMessage);
var orgUsers = _dataService.GetAllUsersInOrganization(orgID);
var orgUsers = await _dataService.GetAllUsersInOrganization(orgID);
var emailMessage = string.Join("<br />", alertParts);
foreach (var user in orgUsers)
{

3
Server/Pages/ManageOrganization.razor.cs
View File

@ -227,7 +227,8 @@ namespace Remotely.Server.Pages
_invites.AddRange(DataService.GetAllInviteLinks(Username).OrderBy(x => x.InvitedUser));
_deviceGroups.AddRange(DataService.GetDeviceGroups(Username).OrderBy(x => x.Name));
_orgUsers.AddRange(DataService.GetAllUsersInOrganization(Username).OrderBy(x => x.UserName));
var orgUsers = await DataService.GetAllUsersInOrganization(User.OrganizationID);
_orgUsers.AddRange(orgUsers.OrderBy(x => x.UserName));
}
private async Task ResetPassword(RemotelyUser user)
{

13
Server/Services/DataService.cs
View File

@ -106,7 +106,7 @@ namespace Remotely.Server.Services
RemotelyUser[] GetAllUsersForServer();
RemotelyUser[] GetAllUsersInOrganization(string userName);
Task<RemotelyUser[]> GetAllUsersInOrganization(string orgId);
ApiToken GetApiKey(string keyId);
@ -1093,17 +1093,20 @@ namespace Remotely.Server.Services
return dbContext.Users.ToArray();
}
public RemotelyUser[] GetAllUsersInOrganization(string userName)
public async Task<RemotelyUser[]> GetAllUsersInOrganization(string orgId)
{
if (string.IsNullOrWhiteSpace(userName))
if (string.IsNullOrWhiteSpace(orgId))
{
return Array.Empty<RemotelyUser>();
}
using var dbContext = _dbFactory.CreateDbContext();
var user = dbContext.Users.FirstOrDefault(x => x.UserName == userName);
return dbContext.Users.Where(x => x.OrganizationID == user.OrganizationID).ToArray();
var organization = await dbContext.Organizations
.Include(x => x.RemotelyUsers)
.FirstOrDefaultAsync(x => x.ID == orgId);
return organization.RemotelyUsers.ToArray();
}
public ApiToken GetApiKey(string keyId)