From 26fe4c671bc54e81e182be2b5b69eb48d4af4d11 Mon Sep 17 00:00:00 2001 From: Jared Date: Mon, 4 Jan 2021 18:11:59 -0800 Subject: [PATCH] Fix viewport width. Derive outdated versions from max agent version. --- Server/API/AgentUpdateController.cs | 28 +------------------ .../Account/Manage/ServerConfig.cshtml.cs | 14 +++++----- Server/Pages/Shared/_Layout.cshtml | 2 +- Server/wwwroot/site.js | 15 ++++++++++ Server/wwwroot/src/Main/InputEventHandlers.ts | 15 ---------- 5 files changed, 24 insertions(+), 50 deletions(-) create mode 100644 Server/wwwroot/site.js diff --git a/Server/API/AgentUpdateController.cs b/Server/API/AgentUpdateController.cs index 94cf0cc3f..ce05debb9 100644 --- a/Server/API/AgentUpdateController.cs +++ b/Server/API/AgentUpdateController.cs @@ -59,7 +59,7 @@ public async Task DownloadPackage(string platform, string download if (await CheckForDeviceBan(remoteIp)) { - return GetImmediateUninstaller(platform); + return BadRequest(); } var startWait = DateTimeOffset.Now; @@ -125,32 +125,6 @@ public async Task DownloadPackage(string platform, string download } } - private ActionResult GetImmediateUninstaller(string platform) - { - switch (platform.ToLower()) - { - case "win-x64": - case "win-x86": - { - var fileContents = "sc delete Remotely_Service & taskkill /im Remotely_Agent.exe /f"; - return File(Encoding.UTF8.GetBytes(fileContents), "application/octet-stream"); - } - case "linux": - { - var fileContents = "systemctl stop remotely-agent; rm -f /etc/systemd/system/remotely-agent.service;"; - return File(Encoding.UTF8.GetBytes(fileContents), "application/octet-stream"); - } - break; - default: - DataService.WriteEvent($"Unknown platform requested in {nameof(AgentUpdateController)}. " + - $"Platform: {platform}. " + - $"IP: {Request?.HttpContext?.Connection?.RemoteIpAddress}.", - EventType.Warning, - null); - return BadRequest(); - } - } - private async Task CheckForDeviceBan(string deviceIp) { if (string.IsNullOrWhiteSpace(deviceIp)) diff --git a/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml.cs b/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml.cs index 6d1ffcedc..dfe7fba93 100644 --- a/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml.cs +++ b/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml.cs @@ -8,6 +8,7 @@ using Remotely.Server.Services; using Remotely.Shared.Enums; using Remotely.Shared.Models; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; @@ -70,13 +71,12 @@ public async Task OnGet() { return Unauthorized(); } - if (System.IO.File.Exists("Remotely_Server.dll")) - { - var serverVersion = System.Diagnostics.FileVersionInfo.GetVersionInfo("Remotely_Server.dll").FileVersion.ToString(); - OutdatedDevices = AgentHub.ServiceConnections.Values - .Where(x => x.AgentVersion != serverVersion) - .Select(x => x.ID); - } + + var highestVersion = AgentHub.ServiceConnections.Values.Max(x => Version.TryParse(x.AgentVersion, out var result) ? result : default); + OutdatedDevices = AgentHub.ServiceConnections.Values + .Where(x => x.AgentVersion != highestVersion.ToString()) + .Select(x => x.ID); + Environment = HostEnv.EnvironmentName; Configuration.Bind("ApplicationOptions", AppSettingsInput); diff --git a/Server/Pages/Shared/_Layout.cshtml b/Server/Pages/Shared/_Layout.cshtml index 89cf7cdf7..5b54610be 100644 --- a/Server/Pages/Shared/_Layout.cshtml +++ b/Server/Pages/Shared/_Layout.cshtml @@ -132,7 +132,7 @@ - + @RenderSection("Scripts", required: false) diff --git a/Server/wwwroot/site.js b/Server/wwwroot/site.js new file mode 100644 index 000000000..2f0bd3733 --- /dev/null +++ b/Server/wwwroot/site.js @@ -0,0 +1,15 @@ +function setViewportWidth() { + if (window.screen?.orientation?.type?.includes("portrait")) { + var desiredWidth = Math.max(550, window.screen.width); + document.querySelector('meta[name="viewport"').setAttribute("content", `width=${desiredWidth}, user-scalable=no`); + } + else { + var desiredHeight = Math.max(700, window.screen.height); + document.querySelector('meta[name="viewport"').setAttribute("content", `width=device-width, height=${desiredHeight}, user-scalable=no`); + } +} + +window.addEventListener("load", () => { + setViewportWidth(); + window.addEventListener("orientationchange", setViewportWidth); +}); \ No newline at end of file diff --git a/Server/wwwroot/src/Main/InputEventHandlers.ts b/Server/wwwroot/src/Main/InputEventHandlers.ts index c3c8e95c8..f7032048b 100644 --- a/Server/wwwroot/src/Main/InputEventHandlers.ts +++ b/Server/wwwroot/src/Main/InputEventHandlers.ts @@ -23,9 +23,6 @@ export function ApplyInputEventHandlers() { window.addEventListener("resize", ev => { PositionCommandCompletionWindow(); }); - - setViewportWidth(); - window.addEventListener("orientationchange", setViewportWidth); } function addGridPaginationHandlers() { @@ -262,15 +259,3 @@ function keyDownOnWindow() { } }); } - -function setViewportWidth() { - if (window.screen?.orientation?.type?.includes("portrait")) { - var desiredWidth = Math.max(550, window.screen.width); - document.querySelector('meta[name="viewport"').setAttribute("content", `width=${desiredWidth}, user-scalable=no`); - } - else { - var desiredHeight = Math.max(700, window.screen.height); - document.querySelector('meta[name="viewport"').setAttribute("content", `width=device-width, height=${desiredHeight}, user-scalable=no`); - } - console.log(window.screen); -} \ No newline at end of file