diff --git a/Server/API/FileSharingController.cs b/Server/API/FileSharingController.cs index c4289c8d..a6311a09 100644 --- a/Server/API/FileSharingController.cs +++ b/Server/API/FileSharingController.cs @@ -27,7 +27,8 @@ namespace Remotely.Server.API public ActionResult Get(string id) { var sharedFile = DataService.GetSharedFiled(id); - if (sharedFile != null) + // Shared files expire after a minute and become locked. + if (sharedFile != null && sharedFile.Timestamp.AddMinutes(1) > DateTime.Now) { return File(sharedFile.FileContents, sharedFile.ContentType, sharedFile.FileName); } diff --git a/Server/API/OrganizationManagementController.cs b/Server/API/OrganizationManagementController.cs index 21e2f4b9..409485ef 100644 --- a/Server/API/OrganizationManagementController.cs +++ b/Server/API/OrganizationManagementController.cs @@ -131,9 +131,9 @@ namespace Remotely.Server.API return Ok(deviceGroupID); } - [HttpDelete("RemoveUserFromOrganization/{userID}")] + [HttpDelete("DeleteUser/{userID}")] [ServiceFilter(typeof(ApiAuthorizationFilter))] - public IActionResult RemoveUserFromOrganization(string userID) + public async Task DeleteUser(string userID) { if (User.Identity.IsAuthenticated && !DataService.GetUserByName(User.Identity.Name).IsAdministrator) @@ -141,8 +141,14 @@ namespace Remotely.Server.API return Unauthorized(); } + if (User.Identity.IsAuthenticated && + DataService.GetUserByName(User.Identity.Name).Id == userID) + { + return BadRequest("You can't delete yourself here. You must go to the Personal Data page to delete your own account."); + } + Request.Headers.TryGetValue("OrganizationID", out var orgID); - DataService.RemoveUserFromOrganization(orgID, userID); + await DataService.RemoveUserFromOrganization(orgID, userID); return Ok("ok"); } diff --git a/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml b/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml index 93cb5e77..4061405d 100644 --- a/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml +++ b/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml @@ -79,18 +79,19 @@ @for (var i = 0; i < Model.Users.Count; i++) { - - - @if (currentUser.Id == Model.Users[i].ID) - { - @Html.CheckBoxFor(x => x.Users[i].IsAdmin, new { user = Model.Users[i].ID, @class = "user-is-admin-checkbox", disabled = "disabled" }) - } - else - { - @Html.CheckBoxFor(x => x.Users[i].IsAdmin, new { user = Model.Users[i].ID, @class = "user-is-admin-checkbox" }) - } - - + + + @if (currentUser.Id == Model.Users[i].ID) + { + @Html.CheckBoxFor(x => x.Users[i].IsAdmin, new { user = Model.Users[i].ID, @class = "user-is-admin-checkbox", disabled = "disabled" }) + + } + else + { + @Html.CheckBoxFor(x => x.Users[i].IsAdmin, new { user = Model.Users[i].ID, @class = "user-is-admin-checkbox" }) + + } + } diff --git a/Server/Pages/Index.cshtml.cs b/Server/Pages/Index.cshtml.cs index 12ab5769..281f3441 100644 --- a/Server/Pages/Index.cshtml.cs +++ b/Server/Pages/Index.cshtml.cs @@ -13,19 +13,27 @@ namespace Remotely.Server.Pages { public class IndexModel : PageModel { - private DataService DataService { get; } - public IndexModel(DataService dataService) + public IndexModel(DataService dataService, SignInManager signInManager) { DataService = dataService; + SignInManager = signInManager; } public string DefaultPrompt { get; set; } public List DeviceGroups { get; set; } = new List(); + private DataService DataService { get; } + private SignInManager SignInManager { get; } - public void OnGet() + public async Task OnGet() { if (User?.Identity?.IsAuthenticated == true) { + var user = DataService.GetUserByName(User.Identity.Name); + if (user is null) + { + await SignInManager.SignOutAsync(); + return RedirectToPage(); + } DefaultPrompt = DataService.GetDefaultPrompt(User.Identity.Name); var groups = DataService.GetDeviceGroupsForUserName(User.Identity.Name); if (groups?.Any() == true) @@ -37,6 +45,8 @@ namespace Remotely.Server.Pages { DefaultPrompt = DataService.GetDefaultPrompt(); } + + return Page(); } } } diff --git a/Server/Pages/Shared/_Layout.cshtml b/Server/Pages/Shared/_Layout.cshtml index a15176c9..2f60d502 100644 --- a/Server/Pages/Shared/_Layout.cshtml +++ b/Server/Pages/Shared/_Layout.cshtml @@ -1,4 +1,4 @@ -@inject Remotely.Server.Services.ApplicationConfig AppConfig; +@inject Remotely.Server.Services.ApplicationConfig AppConfig diff --git a/Server/Services/DataService.cs b/Server/Services/DataService.cs index ca0ab2ec..9cbac327 100644 --- a/Server/Services/DataService.cs +++ b/Server/Services/DataService.cs @@ -17,16 +17,21 @@ namespace Remotely.Server.Services { public class DataService { - public DataService(ApplicationDbContext context, ApplicationConfig appConfig, IHostEnvironment hostEnvironment) + public DataService(ApplicationDbContext context, + ApplicationConfig appConfig, + IHostEnvironment hostEnvironment, + UserManager userManager) { RemotelyContext = context; AppConfig = appConfig; HostEnvironment = hostEnvironment; + UserManager = userManager; } private ApplicationConfig AppConfig { get; } private IHostEnvironment HostEnvironment { get; } private ApplicationDbContext RemotelyContext { get; } + private UserManager UserManager { get; } public bool AddDeviceGroup(string orgID, DeviceGroup deviceGroup, out string deviceGroupID, out string errorMessage) { @@ -407,6 +412,11 @@ namespace Remotely.Server.Services { var user = RemotelyContext.Users.FirstOrDefault(x => x.UserName == username); + if (user is null) + { + return null; + } + return RemotelyContext.DeviceGroups.Where(x => x.OrganizationID == user.OrganizationID) ?? Enumerable.Empty(); } @@ -511,15 +521,23 @@ namespace Remotely.Server.Services RemotelyContext.SaveChanges(); } - public void RemoveUserFromOrganization(string orgID, string targetUserID) + public async Task RemoveUserFromOrganization(string orgID, string targetUserID) { var target = RemotelyContext.Users.FirstOrDefault(x => x.Id == targetUserID && x.OrganizationID == orgID); - var newOrganization = new Organization(); - target.Organization = newOrganization; - RemotelyContext.Organizations.Add(newOrganization); + if (GetOrganizationCount() >= AppConfig.MaxOrganizationCount) + { + await UserManager.DeleteAsync(target); + } + else + { + var newOrganization = new Organization(); + target.Organization = newOrganization; + RemotelyContext.Organizations.Add(newOrganization); + } + RemotelyContext.SaveChanges(); } diff --git a/Server/wwwroot/scripts/Pages/OrganizationManagement.js b/Server/wwwroot/scripts/Pages/OrganizationManagement.js index 349565bb..d06965d2 100644 --- a/Server/wwwroot/scripts/Pages/OrganizationManagement.js +++ b/Server/wwwroot/scripts/Pages/OrganizationManagement.js @@ -122,9 +122,9 @@ document.querySelectorAll(".user-is-admin-checkbox").forEach((checkbox) => { xhr.send(JSON.stringify(ev.currentTarget.checked)); }); }); -document.querySelectorAll(".remove-user-button").forEach((removeButton) => { +document.querySelectorAll(".delete-user-button").forEach((removeButton) => { removeButton.addEventListener("click", (ev) => { - var result = confirm("Are you sure you want to remove this user from the organization?"); + var result = confirm("Are you sure you want to delete this user?"); if (result) { var userID = removeButton.getAttribute("user"); var xhr = new XMLHttpRequest(); @@ -142,7 +142,7 @@ document.querySelectorAll(".remove-user-button").forEach((removeButton) => { xhr.onerror = () => { showError(xhr); }; - xhr.open("delete", `${location.origin}/api/OrganizationManagement/RemoveUserFromOrganization/${userID}`); + xhr.open("delete", `${location.origin}/api/OrganizationManagement/DeleteUser/${userID}`); xhr.setRequestHeader("Content-Type", "application/json"); xhr.send(); } diff --git a/Server/wwwroot/scripts/Pages/OrganizationManagement.js.map b/Server/wwwroot/scripts/Pages/OrganizationManagement.js.map index e05cecbd..2ffd0ade 100644 --- a/Server/wwwroot/scripts/Pages/OrganizationManagement.js.map +++ b/Server/wwwroot/scripts/Pages/OrganizationManagement.js.map @@ -1 +1 @@ -{"version":3,"file":"OrganizationManagement.js","sourceRoot":"","sources":["OrganizationManagement.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"OrganizationManagement.js","sourceRoot":"","sources":["OrganizationManagement.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/Pages/OrganizationManagement.ts b/Server/wwwroot/scripts/Pages/OrganizationManagement.ts index 2110197d..449421df 100644 --- a/Server/wwwroot/scripts/Pages/OrganizationManagement.ts +++ b/Server/wwwroot/scripts/Pages/OrganizationManagement.ts @@ -133,9 +133,9 @@ document.querySelectorAll(".user-is-admin-checkbox").forEach((checkbox: HTMLInpu xhr.send(JSON.stringify((ev.currentTarget as HTMLInputElement).checked)); }) }); -document.querySelectorAll(".remove-user-button").forEach((removeButton: HTMLButtonElement) => { +document.querySelectorAll(".delete-user-button").forEach((removeButton: HTMLButtonElement) => { removeButton.addEventListener("click", (ev) => { - var result = confirm("Are you sure you want to remove this user from the organization?"); + var result = confirm("Are you sure you want to delete this user?"); if (result) { var userID = removeButton.getAttribute("user"); var xhr = new XMLHttpRequest(); @@ -153,7 +153,7 @@ document.querySelectorAll(".remove-user-button").forEach((removeButton: HTMLButt xhr.onerror = () => { showError(xhr); } - xhr.open("delete", `${location.origin}/api/OrganizationManagement/RemoveUserFromOrganization/${userID}`); + xhr.open("delete", `${location.origin}/api/OrganizationManagement/DeleteUser/${userID}`); xhr.setRequestHeader("Content-Type", "application/json"); xhr.send(); }