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

Remove now-redundant OrgIdProvider.

Browse Source
This commit is contained in:
Jared Goodwin 2024-07-16 11:28:34 -07:00
parent 49e910dc98
commit 8ddde31a76
5 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Desktop.Linux/Program.cs
View File

@ -42,7 +42,6 @@ public class Program
var services = new ServiceCollection();
services.AddSingleton<IOrganizationIdProvider, OrganizationIdProvider>();
services.AddSingleton<IEmbeddedServerDataProvider, EmbeddedServerDataProvider>();
services.AddRemoteControlLinux();
@ -58,17 +57,16 @@ public class Program
var provider = services.BuildServiceProvider();
var appState = provider.GetRequiredService<IAppState>();
var orgIdProvider = provider.GetRequiredService<IOrganizationIdProvider>();
if (getEmbeddedResult.IsSuccess)
{
orgIdProvider.OrganizationId = getEmbeddedResult.Value.OrganizationId;
appState.OrganizationId = getEmbeddedResult.Value.OrganizationId;
appState.Host = getEmbeddedResult.Value.ServerUrl.AbsoluteUri;
}
if (appState.ArgDict.TryGetValue("org-id", out var orgId))
{
orgIdProvider.OrganizationId = orgId;
appState.OrganizationId = orgId;
}
var result = await provider.UseRemoteControlClient(

6
Desktop.Shared/Services/AppState.cs
View File

@ -14,13 +14,13 @@ public interface IAppState
event EventHandler<IViewer> ViewerAdded;
event EventHandler<string> ViewerRemoved;
string AccessKey { get; }
Dictionary<string, string> ArgDict { get; }
string Host { get; set; }
bool IsElevate { get; }
bool IsRelaunch { get; }
AppMode Mode { get; set; }
string OrganizationId { get; set; }
string OrganizationName { get; }
string PipeName { get; }
string[] RelaunchViewers { get; }
@ -81,7 +81,6 @@ public class AppState : IAppState
}
}
public string Host
{
get => _host;
@ -94,9 +93,8 @@ public class AppState : IAppState
public bool IsElevate { get; private set; }
public bool IsRelaunch { get; private set; }
public AppMode Mode { get; set; }
public string OrganizationId { get; set; } = string.Empty;
public string OrganizationName { get; private set; } = string.Empty;
public string PipeName { get; private set; } = string.Empty;

9
Desktop.Shared/Services/BrandingProvider.cs
View File

@ -22,18 +22,15 @@ public class BrandingProvider : IBrandingProvider
private readonly IAppState _appState;
private readonly IEmbeddedServerDataProvider _embeddedDataSearcher;
private readonly ILogger<BrandingProvider> _logger;
private readonly IOrganizationIdProvider _orgIdProvider;
private BrandingInfo? _brandingInfo;
public BrandingProvider(
IAppState appState,
IOrganizationIdProvider orgIdProvider,
IEmbeddedServerDataProvider embeddedServerDataSearcher,
ILogger<BrandingProvider> logger)
{
_appState = appState;
_orgIdProvider = orgIdProvider;
_embeddedDataSearcher = embeddedServerDataSearcher;
_logger = logger;
}
@ -82,7 +79,7 @@ public class BrandingProvider : IBrandingProvider
{
try
{
if (string.IsNullOrWhiteSpace(_orgIdProvider.OrganizationId) ||
if (string.IsNullOrWhiteSpace(_appState.OrganizationId) ||
string.IsNullOrWhiteSpace(_appState.Host))
{
var filePath = Process.GetCurrentProcess()?.MainModule?.FileName;
@ -98,7 +95,7 @@ public class BrandingProvider : IBrandingProvider
{
if (!string.IsNullOrWhiteSpace(result.Value.OrganizationId))
{
_orgIdProvider.OrganizationId = result.Value.OrganizationId;
_appState.OrganizationId = result.Value.OrganizationId;
}
if (result.Value.ServerUrl is not null)
@ -122,7 +119,7 @@ public class BrandingProvider : IBrandingProvider
using var httpClient = new HttpClient();
var brandingUrl = $"{_appState.Host.TrimEnd('/')}/api/branding/{_orgIdProvider.OrganizationId}";
var brandingUrl = $"{_appState.Host.TrimEnd('/')}/api/branding/{_appState.OrganizationId}";
var httpResult = await httpClient.GetFromJsonAsync<BrandingInfo>(brandingUrl).ConfigureAwait(false);
if (httpResult is null)
{

10
Desktop.Shared/Services/OrganizationIdProvider.cs
View File

@ -1,10 +0,0 @@
namespace Desktop.Shared.Services;
public interface IOrganizationIdProvider
{
string OrganizationId { get; set; }
}
public class OrganizationIdProvider : IOrganizationIdProvider
{
public string OrganizationId { get; set; } = string.Empty;
}

6
Desktop.Win/Program.cs
View File

@ -45,7 +45,6 @@ public class Program
}
var services = new ServiceCollection();
services.AddSingleton<IOrganizationIdProvider, OrganizationIdProvider>();
services.AddSingleton<IEmbeddedServerDataProvider>(EmbeddedServerDataProvider.Instance);
services.AddRemoteControlXplat();
@ -64,17 +63,16 @@ public class Program
var provider = services.BuildServiceProvider();
var appState = provider.GetRequiredService<IAppState>();
var orgIdProvider = provider.GetRequiredService<IOrganizationIdProvider>();
if (getEmbeddedResult.IsSuccess)
{
orgIdProvider.OrganizationId = getEmbeddedResult.Value.OrganizationId;
appState.OrganizationId = getEmbeddedResult.Value.OrganizationId;
appState.Host = getEmbeddedResult.Value.ServerUrl.AbsoluteUri;
}
if (appState.ArgDict.TryGetValue("org-id", out var orgId))
{
orgIdProvider.OrganizationId = orgId;
appState.OrganizationId = orgId;
}
var result = await provider.UseRemoteControlClient(