Several changes

kyle079 · Feb 6, 2024 · 4911272 · 4911272
1 parent eb9c18e
commit 4911272
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 17 deletions.
diff --git a/RDSService/RDSService.csproj b/RDSService/RDSService.csproj
@@ -4,8 +4,8 @@
         <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <AssemblyVersion>1.0.0.2</AssemblyVersion>
-        <FileVersion>1.0.0.2</FileVersion>
+        <AssemblyVersion>1.0.0.3</AssemblyVersion>
+        <FileVersion>1.0.0.3</FileVersion>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 

diff --git a/RDSServiceClient/RDSServiceClient.csproj b/RDSServiceClient/RDSServiceClient.csproj
@@ -9,9 +9,9 @@
         <Description>Client for RDSService running on a remote RDS connection broker</Description>
         <PackageProjectUrl>https://github.com/kyle079/RDSService</PackageProjectUrl>
         <RepositoryUrl>https://github.com/kyle079/RDSService</RepositoryUrl>
-        <Version>1.0.5</Version>
-        <AssemblyVersion>1.0.5</AssemblyVersion>
-        <FileVersion>1.0.5</FileVersion>
+        <Version>1.0.6</Version>
+        <AssemblyVersion>1.0.6</AssemblyVersion>
+        <FileVersion>1.0.6</FileVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     </PropertyGroup>
 

diff --git a/RDSServiceClient/RdsSessionService.cs b/RDSServiceClient/RdsSessionService.cs
@@ -1,8 +1,8 @@
 using System.Net.Http.Json;
-using Microsoft.Extensions.Options;
 using RDSServiceLibrary;
 using RDSServiceLibrary.Interfaces;
 using RDSServiceLibrary.Models;
+using System.Text.Json;
 
 namespace RDSServiceClient
 {
@@ -16,16 +16,16 @@ public RdsSessionService(HttpClient httpClient)
         }
 
         public Task<string> GetActiveManagementServer(string? connectionBroker = null) =>
-            ProcessRequest<string>("GetActiveManagementServer");
+            ProcessRequest<string>("RDS/GetActiveManagementServer");
 
         public Task<List<RdsSession>> GetSessions(string? connectionBroker = null) =>
-            ProcessRequest<List<RdsSession>>("GetSessions");
+            ProcessRequest<List<RdsSession>>("RDS/GetSessions");
 
         public Task<bool> DisconnectSession(SessionInfo sessionInfo, string? connectionBroker = null) =>
-            ProcessPostRequest("DisconnectSession", sessionInfo);
+            ProcessPostRequest("RDS/DisconnectSession", sessionInfo);
 
         public Task<bool> LogOffSession(SessionInfo sessionInfo, string? connectionBroker = null) =>
-            ProcessPostRequest("LogOffSession", sessionInfo);
+            ProcessPostRequest("RDS/LogOffSession", sessionInfo);
 
         private async Task<T> ProcessRequest<T>(string url)
         {
@@ -46,9 +46,12 @@ private static async Task HandleError(HttpResponseMessage response)
         {
             if (!response.IsSuccessStatusCode)
             {
-                var result = await response.Content.ReadFromJsonAsync<RdsServiceException>();
+                var content = await response.Content.ReadAsStringAsync();
+                if (!content.TrimStart().StartsWith("{"))
+                    throw new RdsServiceException($"An error occurred calling the RDS service, {response.StatusCode}, {response.Content.ReadAsStringAsync()}");
+                var result = JsonSerializer.Deserialize<RdsServiceException>(content);
                 if (result != null) throw result;
-                throw new RdsServiceException("An error occurred calling the RDS service");
+                throw new RdsServiceException($"An error occurred calling the RDS service, {response.StatusCode}, {response.Content.ReadAsStringAsync()}");
             }
         }
     }

diff --git a/RDSServiceLibrary/Models/RdsSession.cs b/RDSServiceLibrary/Models/RdsSession.cs
@@ -5,6 +5,8 @@ namespace RDSServiceLibrary.Models;
 
 public class RdsSession
 {
+    public RdsSession() { }
+
     public RdsSession(PSObject psObject)
     {
         CollectionName = psObject.Properties["CollectionName"].Value.ToString() ?? string.Empty;

diff --git a/RDSServiceLibrary/RDSServiceLibrary.csproj b/RDSServiceLibrary/RDSServiceLibrary.csproj
@@ -5,9 +5,9 @@
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
         <TargetFramework>net7.0</TargetFramework>
-        <Version>1.0.3</Version>
-        <AssemblyVersion>1.0.3</AssemblyVersion>
-        <FileVersion>1.0.3</FileVersion>
+        <Version>1.0.6</Version>
+        <AssemblyVersion>1.0.6</AssemblyVersion>
+        <FileVersion>1.0.6</FileVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     </PropertyGroup>
 

diff --git a/RDSServiceTester/RDSServiceTester.csproj b/RDSServiceTester/RDSServiceTester.csproj
@@ -27,6 +27,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\RDSServiceClient\RDSServiceClient.csproj" />
       <ProjectReference Include="..\RDSService\RDSService.csproj" />
     </ItemGroup>
 

diff --git a/RDSServiceTester/RdsServiceClientTest.cs b/RDSServiceTester/RdsServiceClientTest.cs
@@ -0,0 +1,26 @@
+using System.Text.Json;
+using RDSServiceClient;
+using Xunit.Abstractions;
+
+namespace RDSServiceTester;
+
+public class RdsServiceClientTest
+{
+    private readonly ITestOutputHelper _testOutputHelper;
+
+    private readonly RdsSessionService _rdsSessionService =
+        new(new HttpClient { BaseAddress = new Uri("http://rdscb01.royal.corp:5555") });
+
+    public RdsServiceClientTest(ITestOutputHelper testOutputHelper)
+    {
+        _testOutputHelper = testOutputHelper;
+    }
+
+    [Fact]
+    public async Task GetSessions_ReturnsResults()
+    {
+        var result = await _rdsSessionService.GetSessions("rdscb01.royal.corp");
+        _testOutputHelper.WriteLine(JsonSerializer.Serialize(result));
+        Assert.NotNull(result);
+    }
+}
diff --git a/RDSServiceTester/RdsServiceTest.cs b/RDSServiceTester/RdsServiceTest.cs
@@ -1,6 +1,5 @@
-using System.Text.Json;
+using System.Text.Json;
 using RDSService.Services;
-using RDSServiceLibrary.Models;
 using Xunit.Abstractions;
 
 namespace RDSServiceTester;