Merge in abstractions in Desktop projects.

immense · Jul 16, 2024 · 49e910d · 49e910d
1 parent 9e055af
commit 49e910d
Show file tree

Hide file tree

Showing 29 changed files with 79 additions and 143 deletions.
diff --git a/Desktop.Linux/Program.cs b/Desktop.Linux/Program.cs
@@ -44,12 +44,7 @@ public static async Task Main(string[] args)
 
         services.AddSingleton<IOrganizationIdProvider, OrganizationIdProvider>();
         services.AddSingleton<IEmbeddedServerDataProvider, EmbeddedServerDataProvider>();
-
-        services.AddRemoteControlLinux(
-            config =>
-            {
-                config.AddBrandingProvider<BrandingProvider>();
-            });
+        services.AddRemoteControlLinux();
 
         services.AddLogging(builder =>
         {

diff --git a/Desktop.Linux/Services/AppStartup.cs b/Desktop.Linux/Services/AppStartup.cs
@@ -4,6 +4,7 @@
 using Remotely.Desktop.UI.Services;
 using Remotely.Shared.Models;
 using Microsoft.Extensions.Logging;
+using Desktop.Shared.Services;
 
 namespace Remotely.Desktop.Linux.Services;
 

diff --git a/Desktop.Linux/Startup/IServiceCollectionExtensions.cs b/Desktop.Linux/Startup/IServiceCollectionExtensions.cs
@@ -17,11 +17,9 @@ public static class IServiceCollectionExtensions
     /// </summary>
     /// <param name="services"></param>
     /// <param name="clientConfig"></param>
-    public static void AddRemoteControlLinux(
-        this IServiceCollection services,
-        Action<IRemoteControlClientBuilder> clientConfig)
+    public static void AddRemoteControlLinux(this IServiceCollection services)
     {
-        services.AddRemoteControlXplat(clientConfig);
+        services.AddRemoteControlXplat();
         services.AddRemoteControlUi();
 
         services.AddSingleton<IAppStartup, AppStartup>();

diff --git a/Desktop.Shared/Abstractions/IBrandingProvider.cs b/Desktop.Shared/Abstractions/IBrandingProvider.cs
diff --git a/Desktop.Shared/Services/BrandingProvider.cs b/Desktop.Shared/Services/BrandingProvider.cs
@@ -10,6 +10,13 @@
 
 namespace Desktop.Shared.Services;
 
+public interface IBrandingProvider
+{
+    BrandingInfo CurrentBranding { get; }
+    Task Initialize();
+    void SetBrandingInfo(BrandingInfo brandingInfo);
+}
+
 public class BrandingProvider : IBrandingProvider
 {
     private readonly IAppState _appState;
@@ -56,9 +63,9 @@ public async Task Initialize()
             };
         }
 
-        if (_brandingInfo.Icon?.Any() != true)
+        if (_brandingInfo.Icon is not { Length: > 0 })
         {
-            using var mrs = typeof(BrandingProvider).Assembly.GetManifestResourceStream("Desktop.Shared.Assets.Remotely_Icon.png");
+            using var mrs = typeof(BrandingProvider).Assembly.GetManifestResourceStream("Remotely.Desktop.Shared.Assets.Remotely_Icon.png");
             using var ms = new MemoryStream();
             mrs!.CopyTo(ms);
 
@@ -87,21 +94,24 @@ private async Task<Result<BrandingInfo>> TryGetBrandingInfo()
 
                 var result = _embeddedDataSearcher.TryGetEmbeddedData(filePath);
 
-                if (!result.IsSuccess)
-                {
-                    return result.HadException ?
-                        Result.Fail<BrandingInfo>(result.Exception) :
-                        Result.Fail<BrandingInfo>(result.Reason);
-                }
-
-                if (!string.IsNullOrWhiteSpace(result.Value.OrganizationId))
+                if (result.IsSuccess)
                 {
-                    _orgIdProvider.OrganizationId = result.Value.OrganizationId;
+                    if (!string.IsNullOrWhiteSpace(result.Value.OrganizationId))
+                    {
+                        _orgIdProvider.OrganizationId = result.Value.OrganizationId;
+                    }
+
+                    if (result.Value.ServerUrl is not null)
+                    {
+                        _appState.Host = result.Value.ServerUrl.AbsoluteUri;
+                    }
                 }
 
-                if (result.Value.ServerUrl is not null)
+                if (string.IsNullOrWhiteSpace(_appState.Host))
                 {
-                    _appState.Host = result.Value.ServerUrl.AbsoluteUri;
+                    return result.HadException ?
+                        Result.Fail<BrandingInfo>(result.Exception) :
+                        Result.Fail<BrandingInfo>(result.Reason);
                 }
             }
 

diff --git a/Desktop.Shared/Startup/IServiceCollectionExtensions.cs b/Desktop.Shared/Startup/IServiceCollectionExtensions.cs
@@ -5,19 +5,15 @@
 using Microsoft.Extensions.Logging;
 using Bitbound.SimpleMessenger;
 using Desktop.Shared.Services;
+using Remotely.Desktop.Shared.Abstractions;
 
 namespace Remotely.Desktop.Shared.Startup;
 
 public static class IServiceCollectionExtensions
 {
     internal static void AddRemoteControlXplat(
-        this IServiceCollection services,
-        Action<IRemoteControlClientBuilder> clientConfig)
+        this IServiceCollection services)
     {
-        var builder = new RemoteControlClientBuilder(services);
-        clientConfig.Invoke(builder);
-        builder.Validate();
-
         services.AddLogging(builder =>
         {
             builder.AddConsole().AddDebug();
@@ -31,6 +27,7 @@ internal static void AddRemoteControlXplat(
         services.AddSingleton(s => WeakReferenceMessenger.Default);
         services.AddSingleton<IDesktopEnvironment, DesktopEnvironment>();
         services.AddSingleton<IDtoMessageHandler, DtoMessageHandler>();
+        services.AddSingleton<IBrandingProvider, BrandingProvider>();
         services.AddSingleton<IAppState, AppState>();
         services.AddSingleton<IViewerFactory, ViewerFactory>();
         services.AddTransient<IScreenCaster, ScreenCaster>();

diff --git a/Desktop.Shared/Startup/RemoteControlClientBuilder.cs b/Desktop.Shared/Startup/RemoteControlClientBuilder.cs
diff --git a/Desktop.UI/Services/ViewModelFactory.cs b/Desktop.UI/Services/ViewModelFactory.cs
@@ -3,6 +3,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System.IO;
+using Desktop.Shared.Services;
 
 namespace Remotely.Desktop.UI.Services;
 

diff --git a/Desktop.UI/ViewModels/BrandedViewModelBase.cs b/Desktop.UI/ViewModels/BrandedViewModelBase.cs
@@ -8,6 +8,7 @@
 using Remotely.Shared.Entities;
 using System.IO;
 using System.Reflection;
+using Desktop.Shared.Services;
 
 namespace Remotely.Desktop.UI.ViewModels;
 
@@ -66,7 +67,7 @@ private void ApplyBrandingImpl()
 
                 ProductName = _brandingInfo.Product;
 
-                if (_brandingInfo.Icon?.Any() == true)
+                if (_brandingInfo.Icon is { Length: > 0 })
                 {
                     using var imageStream = new MemoryStream(_brandingInfo.Icon);
                     Icon = new Bitmap(imageStream);

diff --git a/Desktop.UI/ViewModels/ChatWindowViewModel.cs b/Desktop.UI/ViewModels/ChatWindowViewModel.cs
@@ -8,6 +8,7 @@
 using Remotely.Desktop.Shared.Reactive;
 using Microsoft.Extensions.DependencyInjection;
 using Remotely.Shared.Models;
+using Desktop.Shared.Services;
 
 namespace Remotely.Desktop.UI.ViewModels;
 

diff --git a/Desktop.UI/ViewModels/FileTransferWindowViewModel.cs b/Desktop.UI/ViewModels/FileTransferWindowViewModel.cs
@@ -7,6 +7,7 @@
 using Remotely.Desktop.Shared.Abstractions;
 using Microsoft.Extensions.Logging;
 using Remotely.Desktop.Shared.Reactive;
+using Desktop.Shared.Services;
 
 namespace Remotely.Desktop.UI.ViewModels;
 

diff --git a/Desktop.UI/ViewModels/HostNamePromptViewModel.cs b/Desktop.UI/ViewModels/HostNamePromptViewModel.cs
@@ -3,6 +3,7 @@
 using Remotely.Desktop.Shared.Abstractions;
 using Microsoft.Extensions.Logging;
 using Remotely.Desktop.Shared.Reactive;
+using Desktop.Shared.Services;
 
 namespace Remotely.Desktop.UI.ViewModels;
 

diff --git a/Desktop.UI/ViewModels/MainViewViewModel.cs b/Desktop.UI/ViewModels/MainViewViewModel.cs
@@ -135,7 +135,7 @@ public async Task CopyLink()
             return;
         }
 
-        await _dispatcher.Clipboard.SetTextAsync($"{Host}/RemoteControl/Viewer?sessionId={StatusMessage.Replace(" ", "")}");
+        await _dispatcher.Clipboard.SetTextAsync($"{Host}/Viewer?sessionId={StatusMessage.Replace(" ", "")}");
 
         CopyMessageOpacity = 1;
         IsCopyMessageVisible = true;

diff --git a/Desktop.UI/ViewModels/MainWindowViewModel.cs b/Desktop.UI/ViewModels/MainWindowViewModel.cs
@@ -1,5 +1,6 @@
 using Remotely.Desktop.Shared.Abstractions;
 using Microsoft.Extensions.Logging;
+using Desktop.Shared.Services;
 
 namespace Remotely.Desktop.UI.ViewModels;
 

diff --git a/Desktop.UI/ViewModels/MessageBoxViewModel.cs b/Desktop.UI/ViewModels/MessageBoxViewModel.cs
@@ -4,6 +4,7 @@
 using Remotely.Desktop.Shared.Abstractions;
 using Microsoft.Extensions.Logging;
 using Remotely.Desktop.UI.Controls.Dialogs;
+using Desktop.Shared.Services;
 
 namespace Remotely.Desktop.UI.ViewModels;
 

diff --git a/Desktop.UI/ViewModels/PromptForAccessWindowViewModel.cs b/Desktop.UI/ViewModels/PromptForAccessWindowViewModel.cs
@@ -3,6 +3,7 @@
 using Remotely.Desktop.Shared.Reactive;
 using Microsoft.Extensions.Logging;
 using System.Windows.Input;
+using Desktop.Shared.Services;
 
 
 namespace Remotely.Desktop.UI.ViewModels;

diff --git a/Desktop.UI/ViewModels/SessionIndicatorWindowViewModel.cs b/Desktop.UI/ViewModels/SessionIndicatorWindowViewModel.cs
@@ -2,6 +2,7 @@
 using Remotely.Desktop.Shared.Abstractions;
 using Remotely.Desktop.UI.Controls.Dialogs;
 using Microsoft.Extensions.Logging;
+using Desktop.Shared.Services;
 
 namespace Remotely.Desktop.UI.ViewModels;
 

diff --git a/Desktop.Win/Program.cs b/Desktop.Win/Program.cs
@@ -11,6 +11,9 @@
 using System.Diagnostics;
 using System.Runtime.Versioning;
 using System.Threading;
+using Remotely.Desktop.Shared.Abstractions;
+using Remotely.Desktop.UI.Startup;
+using Remotely.Desktop.Win.Services;
 
 namespace Remotely.Desktop.Win;
 
@@ -45,11 +48,9 @@ public static async Task Main(string[] args)
         services.AddSingleton<IOrganizationIdProvider, OrganizationIdProvider>();
         services.AddSingleton<IEmbeddedServerDataProvider>(EmbeddedServerDataProvider.Instance);
 
-        services.AddRemoteControlWindows(
-            config =>
-            {
-                config.AddBrandingProvider<BrandingProvider>();
-            });
+        services.AddRemoteControlXplat();
+        services.AddRemoteControlUi();
+        services.AddRemoteControlWindows();
 
         services.AddLogging(builder =>
         {

diff --git a/Desktop.Win/Services/AppStartup.cs b/Desktop.Win/Services/AppStartup.cs
@@ -1,3 +1,4 @@
+using Desktop.Shared.Services;
 using Remotely.Desktop.Shared.Abstractions;
 using Remotely.Desktop.Shared.Enums;
 using Remotely.Desktop.Shared.Native.Windows;

diff --git a/Desktop.Win/Startup/IServiceCollectionExtensions.cs b/Desktop.Win/Startup/IServiceCollectionExtensions.cs
@@ -17,11 +17,9 @@ public static class IServiceCollectionExtensions
     /// <param name="services"></param>
     /// <param name="clientConfig"></param>
     [SupportedOSPlatform("windows")]
-    public static void AddRemoteControlWindows(
-        this IServiceCollection services,
-        Action<IRemoteControlClientBuilder> clientConfig)
+    public static void AddRemoteControlWindows(this IServiceCollection services)
     {
-        services.AddRemoteControlXplat(clientConfig);
+        services.AddRemoteControlXplat();
         services.AddRemoteControlUi();
 
         services.AddSingleton<ICursorIconWatcher, CursorIconWatcherWin>();

diff --git a/Server/API/RemoteControlController.cs b/Server/API/RemoteControlController.cs
@@ -173,6 +173,6 @@ await _agentHub.Clients.Client(serviceConnectionId).RemoteControl(
 
         var otp = _otpProvider.GetOtp(targetDevice.ID);
 
-        return Ok($"{HttpContext.Request.Scheme}://{Request.Host}/RemoteControl/Viewer?mode=Unattended&sessionId={sessionId}&accessKey={accessKey}&otp={otp}");
+        return Ok($"{HttpContext.Request.Scheme}://{Request.Host}/Viewer?mode=Unattended&sessionId={sessionId}&accessKey={accessKey}&otp={otp}");
     }
 }
diff --git a/Server/Components/Devices/DeviceCard.razor.cs b/Server/Components/Devices/DeviceCard.razor.cs
@@ -334,7 +334,7 @@ private async Task StartRemoteControl(bool viewOnly)
         }
 
         JsInterop.OpenWindow(
-            $"/RemoteControl/Viewer" +
+            $"/Viewer" +
                 $"?mode=Unattended&sessionId={session.UnattendedSessionId}" +
                 $"&accessKey={session.AccessKey}" +
                 $"&viewonly={viewOnly}", 

diff --git a/Server/Components/Layout/NavMenu.razor b/Server/Components/Layout/NavMenu.razor
@@ -40,7 +40,7 @@
         </li>
 
         <li class="nav-item px-3">
-            <NavLink class="nav-link" href="/RemoteControl/Viewer" target="_blank">
+            <NavLink class="nav-link" href="/Viewer" target="_blank">
                 <span class="oi oi-monitor" aria-hidden="true"></span> Remote Control
             </NavLink>
 

diff --git a/Server/Extensions/IApplicationBuilderExtensions.cs b/Server/Extensions/IApplicationBuilderExtensions.cs
@@ -8,7 +8,7 @@ public static class IApplicationBuilderExtensions
     /// <summary>
     /// <para>
     ///     Maps Razor pages and SignalR hubs.  The remote control viewer page will be mapped
-    ///     to path "/RemoteControl/Viewer", the desktop hub to "/hubs/desktop", and viewer hub
+    ///     to path "/Viewer", the desktop hub to "/hubs/desktop", and viewer hub
     ///     to "/hubs/viewer".
     /// </para>
     /// <para>
@@ -19,12 +19,7 @@ public static class IApplicationBuilderExtensions
     /// <returns></returns>
     public static IApplicationBuilder UseRemoteControlServer(this IApplicationBuilder app)
     {
-        app.UseEndpoints(config =>
-        {
-            config.MapRazorPages();
-            config.MapHub<DesktopHub>("/hubs/desktop");
-            config.MapHub<ViewerHub>("/hubs/viewer");
-        });
+
 
         return app;
     }

diff --git a/Server/Models/RemoteControlSession.cs b/Server/Models/RemoteControlSession.cs
@@ -37,7 +37,7 @@ public RemoteControlSession()
 
     public string OrganizationId { get; set; } = string.Empty;
     public string OrganizationName { get; internal set; } = string.Empty;
-    public string RelativeAccessUri => $"/RemoteControl/Viewer?mode=Unattended&sessionId={UnattendedSessionId}&accessKey={AccessKey}&viewonly=False";
+    public string RelativeAccessUri => $"/Viewer?mode=Unattended&sessionId={UnattendedSessionId}&accessKey={AccessKey}&viewonly=False";
     public string RequesterName { get; set; } = string.Empty;
     public string RequesterUserName { get; internal set; } = string.Empty;
     /// <summary>