Update FlowSynx.Client and adapt new changes regarding that

#94

Author: ziagham

src/FlowCtl.Core/Services/Authentication/IAuthenticationManager.cs

@@ -6,7 +6,6 @@ public interface IAuthenticationManager
     bool IsBasicAuthenticationUsed { get; }
     AuthenticationData LoginBasic(string username, string password);
     AuthenticationData LoginBearer(string token);
-    Task<AuthenticationData> LoginOAuthAsync(string authority, string clientId, string? scope);
     AuthenticationData? GetData();
     void Logout();
 }

src/FlowCtl.Infrastructure/FlowCtl.Infrastructure.csproj

@@ -17,7 +17,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Duende.IdentityModel.OidcClient" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.3" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Octokit" Version="14.0.0" />

src/FlowCtl.Infrastructure/Services/Authentication/AuthenticationManager.cs

@@ -1,5 +1,4 @@
-using Duende.IdentityModel.OidcClient;
-using FlowCtl.Core.Serialization;
+using FlowCtl.Core.Serialization;
 using FlowCtl.Core.Services.Authentication;
 
 namespace FlowCtl.Infrastructure.Services.Authentication;
@@ -47,34 +46,6 @@ public AuthenticationData LoginBearer(string token)
         return data;
     }
 
-    public async Task<AuthenticationData> LoginOAuthAsync(string authority, string clientId, string? scope)
-    {
-        var options = new OidcClientOptions
-        {
-            Authority = authority,
-            ClientId = clientId,
-            Scope = scope,
-            RedirectUri = "http://localhost:7890/",
-            Browser = new SystemBrowser(7890)
-        };
-
-        var client = new OidcClient(options);
-        var result = await client.LoginAsync(new LoginRequest());
-
-        if (result.IsError)
-            throw new Exception(string.Format(Resources.AuthenticationManager_LoginOAuthAsync, result.Error));
-
-        var data = new AuthenticationData
-        {
-            Type = AuthenticationType.Bearer,
-            AccessToken = result.AccessToken,
-            Expiry = DateTime.UtcNow.AddSeconds(result.AccessTokenExpiration.Second)
-        };
-
-        Save(data);
-        return data;
-    }
-
     public AuthenticationData? GetData()
     {
         return Load();

src/FlowCtl.Infrastructure/Services/Authentication/SystemBrowser.cs

@@ -3,7 +3,7 @@
 using FlowCtl.Core.Services.Logger;
 using FlowCtl.Extensions;
 using FlowSynx.Client;
-using FlowSynx.Client.Requests.PluginConfig;
+using FlowSynx.Client.Messages.Requests.PluginConfig;
 
 namespace FlowCtl.Commands.Config.Add;
 
@@ -41,7 +41,10 @@ private async Task Execute(AddConfigCommandOptions options, CancellationToken ca
             _authenticationManager.AuthenticateClient(_flowSynxClient);
 
             if (!string.IsNullOrEmpty(options.Address))
-                _flowSynxClient.ChangeConnection(options.Address);
+            {
+                var connection = new FlowSynxClientConnection(options.Address);
+                _flowSynxClient.SetConnection(connection);
+            }
 
             string? jsonData;
             if (!string.IsNullOrEmpty(options.DataFile))
@@ -57,7 +60,7 @@ private async Task Execute(AddConfigCommandOptions options, CancellationToken ca
             }
 
             var request = AddConfigData(jsonData);
-            var result = await _flowSynxClient.AddPluginConfig(request, cancellationToken);
+            var result = await _flowSynxClient.PluginConfig.AddAsync(request, cancellationToken);
 
             if (result.StatusCode != 200)
                 throw new Exception(Resources.Commands_Error_DuringProcessingRequest);

src/FlowCtl/Commands/Config/Add/AddConfigCommandOptionsHandler.cs

@@ -35,9 +35,12 @@ private async Task Execute(ConfigCommandOptions options, CancellationToken cance
             _authenticationManager.AuthenticateClient(_flowSynxClient);
 
             if (!string.IsNullOrEmpty(options.Address))
-                _flowSynxClient.ChangeConnection(options.Address);
+            {
+                var connection = new FlowSynxClientConnection(options.Address);
+                _flowSynxClient.SetConnection(connection);
+            }
 
-            var result = await _flowSynxClient.PluginConfigList(cancellationToken);
+            var result = await _flowSynxClient.PluginConfig.ListAsync(cancellationToken);
 
             if (result.StatusCode != 200)
                 throw new Exception(Resources.Commands_Error_DuringProcessingRequest);

src/FlowCtl/Commands/Config/ConfigCommandOptionsHandler.cs

@@ -1,6 +1,4 @@
-using FlowSynx.Client.Requests;
-
-namespace FlowCtl.Commands.Config.Delete;
+namespace FlowCtl.Commands.Config.Delete;
 
 internal class DeleteConfigCommandOptions : ICommandOptions
 {

src/FlowCtl/Commands/Config/Delete/DeleteConfigCommandOptions.cs

@@ -2,7 +2,7 @@
 using FlowCtl.Core.Services.Logger;
 using FlowCtl.Extensions;
 using FlowSynx.Client;
-using FlowSynx.Client.Requests.PluginConfig;
+using FlowSynx.Client.Messages.Requests.PluginConfig;
 
 namespace FlowCtl.Commands.Config.Delete;
 
@@ -36,10 +36,13 @@ private async Task Execute(DeleteConfigCommandOptions options, CancellationToken
             _authenticationManager.AuthenticateClient(_flowSynxClient);
 
             if (!string.IsNullOrEmpty(options.Address))
-                _flowSynxClient.ChangeConnection(options.Address);
+            {
+                var connection = new FlowSynxClientConnection(options.Address);
+                _flowSynxClient.SetConnection(connection);
+            }
 
             var request = new DeletePluginConfigRequest { Id = Guid.Parse(options.Id) };
-            var result = await _flowSynxClient.DeletePluginConfig(request, cancellationToken);
+            var result = await _flowSynxClient.PluginConfig.DeleteAsync(request, cancellationToken);
 
             if (result.StatusCode != 200)
                 throw new Exception(Resources.Commands_Error_DuringProcessingRequest);

src/FlowCtl/Commands/Config/Delete/DeleteConfigCommandOptionsHandler.cs

@@ -2,7 +2,7 @@
 using FlowCtl.Core.Services.Logger;
 using FlowCtl.Extensions;
 using FlowSynx.Client;
-using FlowSynx.Client.Requests.PluginConfig;
+using FlowSynx.Client.Messages.Requests.PluginConfig;
 
 namespace FlowCtl.Commands.Config.Details;
 
@@ -36,10 +36,13 @@ private async Task Execute(DetailsConfigCommandOptions options, CancellationToke
             _authenticationManager.AuthenticateClient(_flowSynxClient);
 
             if (!string.IsNullOrEmpty(options.Address))
-                _flowSynxClient.ChangeConnection(options.Address);
+            {
+                var connection = new FlowSynxClientConnection(options.Address);
+                _flowSynxClient.SetConnection(connection);
+            }
 
             var request = new PluginConfigDetailsRequest { Id = Guid.Parse(options.Id) };
-            var result = await _flowSynxClient.PluginConfigDetails(request, cancellationToken);
+            var result = await _flowSynxClient.PluginConfig.DetailsAsync(request, cancellationToken);
 
             if (result.StatusCode != 200)
                 throw new Exception(Resources.Commands_Error_DuringProcessingRequest);

src/FlowCtl/Commands/Config/Details/DetailsConfigCommandOptionsHandler.cs

@@ -26,9 +26,12 @@ private async Task Execute(HealthCommandOptions options, CancellationToken cance
         try
         {
             if (!string.IsNullOrEmpty(options.Address))
-                _flowSynxClient.ChangeConnection(options.Address);
+            {
+                var connection = new FlowSynxClientConnection(options.Address);
+                _flowSynxClient.SetConnection(connection);
+            }
 
-            var result = await _flowSynxClient.Health(cancellationToken);
+            var result = await _flowSynxClient.HealthCheck.Check(cancellationToken);
 
             if (result.StatusCode != 200)
                 throw new Exception(Resources.Commands_Error_DuringProcessingRequest);