diff --git a/Server/API/ClientDownloadsController.cs b/Server/API/ClientDownloadsController.cs index c3ad0720..ef7a685b 100644 --- a/Server/API/ClientDownloadsController.cs +++ b/Server/API/ClientDownloadsController.cs @@ -43,7 +43,26 @@ namespace Remotely.Server.API [HttpGet("desktop/{platformID}")] public async Task GetDesktop(string platformID) { - return await GetInstallFile(null, platformID); + switch (platformID) + { + case "WindowsDesktop-x64": + { + var filePath = Path.Combine(_hostEnv.WebRootPath, "Downloads", "Win-x64", "Remotely_Desktop.exe"); + return await GetDesktopFile(filePath); + } + case "WindowsDesktop-x86": + { + var filePath = Path.Combine(_hostEnv.WebRootPath, "Downloads", "Win-x86", "Remotely_Desktop.exe"); + return await GetDesktopFile(filePath); + } + case "UbuntuDesktop": + { + var filePath = Path.Combine(_hostEnv.WebRootPath, "Downloads", "Remotely_Desktop"); + return await GetDesktopFile(filePath); + } + default: + return NotFound(); + } } [HttpGet("clickonce-setup/{architecture}/{organizationId}")] @@ -87,9 +106,16 @@ namespace Remotely.Server.API using var byteContent = new ByteArrayContent(bytes); formContent.Add(byteContent, "setup", "setup.exe"); - using var response = await client.PostAsync($"{AppConstants.ClickOnceSetupUrl}/?host={Request.Scheme}://{Request.Host}&organizationid={organizationId}&architecture={architecture}", formContent); - var responseBytes = await response.Content.ReadAsByteArrayAsync(); - return File(responseBytes, "application/octet-stream", "setup.exe"); + try + { + using var response = await client.PostAsync($"{AppConstants.ClickOnceSetupUrl}/?host={Request.Scheme}://{Request.Host}&organizationid={organizationId}&architecture={architecture}", formContent); + var responseBytes = await response.Content.ReadAsByteArrayAsync(); + return File(responseBytes, "application/octet-stream", "setup.exe"); + } + catch + { + return NotFound(); + } } @@ -163,21 +189,6 @@ namespace Remotely.Server.API { switch (platformID) { - case "WindowsDesktop-x64": - { - var filePath = Path.Combine(_hostEnv.WebRootPath, "Downloads", "Win-x64", "Remotely_Desktop.exe"); - return await GetDesktopFile(filePath); - } - case "WindowsDesktop-x86": - { - var filePath = Path.Combine(_hostEnv.WebRootPath, "Downloads", "Win-x86", "Remotely_Desktop.exe"); - return await GetDesktopFile(filePath); - } - case "UbuntuDesktop": - { - var filePath = Path.Combine(_hostEnv.WebRootPath, "Downloads", "Remotely_Desktop"); - return await GetDesktopFile(filePath); - } case "WindowsInstaller": { var filePath = Path.Combine(_hostEnv.WebRootPath, "Downloads", "Remotely_Installer.exe"); diff --git a/Server/Pages/Agents.cshtml b/Server/Pages/Agents.cshtml index b8924e37..15523dae 100644 --- a/Server/Pages/Agents.cshtml +++ b/Server/Pages/Agents.cshtml @@ -7,7 +7,8 @@ @if (User.Identity.IsAuthenticated) {
- * You are signed in. All links will be specific to your organization and, if applicable, will be branded. + + You are signed in. All links will be specific to your organization and, if applicable, will be branded. You can share these links directly with customers for download.
} @@ -109,92 +110,92 @@ } else { -
-
Windows 10 / 8.1 / 7 (64-Bit and 32-Bit)
-

- Note: GPU-accelerated screen capture and PowerShell Core is unavailable on Windows 7. -

-

- Download: -
- Windows Installer (x64/x86) -
- Windows x64 Files Only -
- Windows x86 Files Only -

+
+
Windows 10 / 8.1 / 7 (64-Bit and 32-Bit)
+

+ Note: GPU-accelerated screen capture and PowerShell Core is unavailable on Windows 7. +

+

+ Download: +
+ Windows Installer (x64/x86) +
+ Windows x64 Files Only +
+ Windows x86 Files Only +

-

- Quiet Install: -
- - Remotely_Installer.exe - -install - -quiet - -organizationid "0b3d706b-9c5d-41e6-8ae9-5720d16324e6" - -serverurl "https://remotely.mytechshop.com" - -

-

- Quiet Uninstall: -
- Remotely_Installer.exe -uninstall -quiet -

-

- Local Install: - -
- - Remotely_Installer.exe - -install - -quiet - -organizationid "0b3d706b-9c5d-41e6-8ae9-5720d16324e6" - -serverurl "https://remotely.mytechshop.com" - -path "[path]\Remotely-Win10-x64.zip" - -

-

- Override Options: -
- - Remotely_Installer.exe -install -quiet -supportshortcut - -organizationid "0b3d706b-9c5d-41e6-8ae9-5720d16324e6" - -serverurl "https://remotely.mytechshop.com" - -devicegroup "Customer Group 1" - -devicealias "Front Desk" - -deviceuuid "eebb4d87-5459-4976-989e-a7876dffc69c" - -

-
+

+ Quiet Install: +
+ + Remotely_Installer.exe + -install + -quiet + -organizationid "0b3d706b-9c5d-41e6-8ae9-5720d16324e6" + -serverurl "https://remotely.mytechshop.com" + +

+

+ Quiet Uninstall: +
+ Remotely_Installer.exe -uninstall -quiet +

+

+ Local Install: + +
+ + Remotely_Installer.exe + -install + -quiet + -organizationid "0b3d706b-9c5d-41e6-8ae9-5720d16324e6" + -serverurl "https://remotely.mytechshop.com" + -path "[path]\Remotely-Win10-x64.zip" + +

+

+ Override Options: +
+ + Remotely_Installer.exe -install -quiet -supportshortcut + -organizationid "0b3d706b-9c5d-41e6-8ae9-5720d16324e6" + -serverurl "https://remotely.mytechshop.com" + -devicegroup "Customer Group 1" + -devicealias "Front Desk" + -deviceuuid "eebb4d87-5459-4976-989e-a7876dffc69c" + +

+
-
-
Linux 64-Bit
-

- Download: -
- Ubuntu x64 Bash Installer -
- Manjaro x64 Bash Installer -
- Linux x64 Files Only -

-

- Install: -
- sudo [path]/Install-Linux-x64.sh -

-

- Local Install: - -
- sudo [path]/Install-Linux-x64.sh --path [path]/Remotely-Linux.zip -

-

- Uninstall: -
- sudo [path]/Install-Linux-x64.sh --uninstall -

-
+
+
Linux 64-Bit
+

+ Download: +
+ Ubuntu x64 Bash Installer +
+ Manjaro x64 Bash Installer +
+ Linux x64 Files Only +

+

+ Install: +
+ sudo [path]/Install-Linux-x64.sh +

+

+ Local Install: + +
+ sudo [path]/Install-Linux-x64.sh --path [path]/Remotely-Linux.zip +

+

+ Uninstall: +
+ sudo [path]/Install-Linux-x64.sh --uninstall +

+
}