remove shell and admin host to keep only one of them

Dative-GPI · Aug 24, 2023 · 2ea5e2e · 2ea5e2e
1 parent f22eb38
commit 2ea5e2e
Show file tree

Hide file tree

Showing 22 changed files with 31 additions and 49 deletions.
diff --git a/Foundation.Clients/Abstractions/IFoundationClient.cs b/Foundation.Clients/Abstractions/IFoundationClient.cs
@@ -2,7 +2,7 @@ namespace Foundation.Clients.Abstractions
 {
     public interface IFoundationClient
     {
-        void Init(string adminHost, string shellHost, string languageCode, string jwt = null);
+        void Init(string host, string languageCode, string jwt = null);
         IAdminFoundationClient Admin { get; }
         ICoreFoundationClient Core { get; }
         IGatewayFoundationClient Gateway { get; }

diff --git a/Foundation.Clients/Services/Admin/AdminDeviceFoundationClient.cs b/Foundation.Clients/Services/Admin/AdminDeviceFoundationClient.cs
@@ -17,7 +17,7 @@ public class AdminDeviceFoundationClient : IAdminDeviceFoundationClient
     {
         private FoundationClient _root;
 
-        private HttpClient _client => _root.AdminClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
         public void Init(IFoundationClient root)
         {

diff --git a/Foundation.Clients/Services/Admin/AdminDeviceOrganisationFoundationClient.cs b/Foundation.Clients/Services/Admin/AdminDeviceOrganisationFoundationClient.cs
@@ -18,7 +18,7 @@ public class AdminDeviceOrganisationFoundationClient : IAdminDeviceOrganisationF
     {
         private FoundationClient _root;
 
-        private HttpClient _client => _root.AdminClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
 
         public void Init(IFoundationClient root)

diff --git a/Foundation.Clients/Services/Admin/AdminDeviceSourceFoundationClient.cs b/Foundation.Clients/Services/Admin/AdminDeviceSourceFoundationClient.cs
@@ -17,7 +17,7 @@ public class AdminDeviceSourceFoundationClient : IAdminDeviceSourceFoundationCli
     {
         private FoundationClient _root;
 
-        private HttpClient _client => _root.AdminClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
 
         public void Init(IFoundationClient root)

diff --git a/Foundation.Clients/Services/Admin/AdminDeviceTwinFoundationClient.cs b/Foundation.Clients/Services/Admin/AdminDeviceTwinFoundationClient.cs
@@ -20,7 +20,7 @@ public class AdminDeviceTwinFoundationClient : IAdminDeviceTwinFoundationClient
     {
         private FoundationClient _root;
 
-        private HttpClient _client => _root.AdminClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
 
         public async Task<DeviceTwinViewModel> Get(Guid deviceId)

diff --git a/Foundation.Clients/Services/Admin/AdminOrganisationFoundationClient.cs b/Foundation.Clients/Services/Admin/AdminOrganisationFoundationClient.cs
@@ -17,7 +17,7 @@ public class AdminOrganisationFoundationClient : IAdminOrganisationFoundationCli
     {
         private FoundationClient _root;
 
-        private HttpClient _client => _root.AdminClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
         public void Init(IFoundationClient root)
         {

diff --git a/Foundation.Clients/Services/Admin/AdminOrganisationTypeFoundationClient.cs b/Foundation.Clients/Services/Admin/AdminOrganisationTypeFoundationClient.cs
@@ -18,7 +18,7 @@ public class AdminOrganisationTypeFoundationClient : IAdminOrganisationTypeFound
     {
         private FoundationClient _root;
 
-        private HttpClient _client => _root.AdminClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
         public void Init(IFoundationClient root)
         {

diff --git a/Foundation.Clients/Services/Admin/AdminPermissionFoundationClient.cs b/Foundation.Clients/Services/Admin/AdminPermissionFoundationClient.cs
@@ -18,7 +18,7 @@ public class AdminPermissionFoundationClient : IAdminPermissionFoundationClient
     {
         private FoundationClient _root;
 
-        private HttpClient _client => _root.AdminClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
 
         public void Init(IFoundationClient root)

diff --git a/Foundation.Clients/Services/Admin/AdminRoutineExecutionFoundationClient.cs b/Foundation.Clients/Services/Admin/AdminRoutineExecutionFoundationClient.cs
@@ -18,7 +18,7 @@ public class AdminRoutineExecutionFoundationClient : IAdminRoutineExecutionFound
     {
         private FoundationClient _root;
 
-        private HttpClient _client => _root.AdminClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
 
         public void Init(IFoundationClient root)

diff --git a/Foundation.Clients/Services/Admin/AdminRoutineFoundationClient.cs b/Foundation.Clients/Services/Admin/AdminRoutineFoundationClient.cs
@@ -18,7 +18,7 @@ public class AdminRoutineFoundationClient : IAdminRoutineFoundationClient
     {
         private FoundationClient _root;
 
-        private HttpClient _client => _root.AdminClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
 
         public void Init(IFoundationClient root)

diff --git a/Foundation.Clients/Services/Admin/AdminSourceFoundationClient.cs b/Foundation.Clients/Services/Admin/AdminSourceFoundationClient.cs
@@ -18,7 +18,7 @@ public class AdminSourceFoundationClient : IAdminSourceFoundationClient
     {
         private FoundationClient _root;
 
-        private HttpClient _client => _root.AdminClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
 
         public void Init(IFoundationClient root)

diff --git a/Foundation.Clients/Services/Admin/AdminUserApplicationFoundationClient.cs b/Foundation.Clients/Services/Admin/AdminUserApplicationFoundationClient.cs
@@ -18,7 +18,7 @@ public class AdminUserApplicationFoundationClient : IAdminUserApplicationFoundat
     {
         private FoundationClient _root;
 
-        private HttpClient _client => _root.AdminClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
 
         public void Init(IFoundationClient root)

diff --git a/Foundation.Clients/Services/Core/CoreDeviceFoundationClient.cs b/Foundation.Clients/Services/Core/CoreDeviceFoundationClient.cs
@@ -23,7 +23,7 @@ public class CoreDeviceFoundationClient : ICoreDeviceFoundationClient
         private FoundationClient _root;
         private ILogger<CoreDeviceFoundationClient> _logger;
 
-        private HttpClient _client => _root.CoreClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
         public CoreDeviceFoundationClient(ILogger<CoreDeviceFoundationClient> logger)
         {

diff --git a/Foundation.Clients/Services/Core/CoreModelFoundationClient.cs b/Foundation.Clients/Services/Core/CoreModelFoundationClient.cs
@@ -21,7 +21,7 @@ public class CoreModelFoundationClient : ICoreModelFoundationClient
         private FoundationClient _root;
         private ILogger<CoreModelFoundationClient> _logger;
 
-        private HttpClient _client => _root.CoreClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
         public CoreModelFoundationClient(ILogger<CoreModelFoundationClient> logger)
         {

diff --git a/Foundation.Clients/Services/Core/CoreOrganisationFoundationClient.cs b/Foundation.Clients/Services/Core/CoreOrganisationFoundationClient.cs
@@ -22,7 +22,7 @@ public class CoreOrganisationFoundationClient : ICoreOrganisationFoundationClien
         private FoundationClient _root;
         private ILogger<CoreOrganisationFoundationClient> _logger;
 
-        private HttpClient _client => _root.CoreClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
         public CoreOrganisationFoundationClient(ILogger<CoreOrganisationFoundationClient> logger)
         {

diff --git a/Foundation.Clients/Services/Core/CorePermissionFoundationClient.cs b/Foundation.Clients/Services/Core/CorePermissionFoundationClient.cs
@@ -22,7 +22,7 @@ public class CorePermissionFoundationClient : ICorePermissionFoundationClient
         private FoundationClient _root;
         private ILogger<CorePermissionFoundationClient> _logger;
 
-        private HttpClient _client => _root.CoreClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
         public CorePermissionFoundationClient(ILogger<CorePermissionFoundationClient> logger)
         {

diff --git a/Foundation.Clients/Services/Core/CoreUserOrganisationFoundationClient.cs b/Foundation.Clients/Services/Core/CoreUserOrganisationFoundationClient.cs
@@ -22,7 +22,7 @@ public class CoreUserOrganisationFoundationClient : ICoreUserOrganisationFoundat
         private FoundationClient _root;
         private ILogger<CoreUserOrganisationFoundationClient> _logger;
 
-        private HttpClient _client => _root.CoreClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
         public CoreUserOrganisationFoundationClient(ILogger<CoreUserOrganisationFoundationClient> logger)
         {

diff --git a/Foundation.Clients/Services/Dispatcher/DispatcherRoutineFoundationClient.cs b/Foundation.Clients/Services/Dispatcher/DispatcherRoutineFoundationClient.cs
@@ -18,7 +18,7 @@ public class DispatcherRoutineFoundationClient : IDispatcherRoutineFoundationCli
     {
         private FoundationClient _root;
 
-        private HttpClient _client => _root.DispatcherClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
 
         public void Init(IFoundationClient root)

diff --git a/Foundation.Clients/Services/FoundationClient.cs b/Foundation.Clients/Services/FoundationClient.cs
@@ -7,59 +7,41 @@ namespace Foundation.Clients.Services
 {
     public class FoundationClient : IFoundationClient
     {
-        public HttpClient AdminClient { get; }
-        public HttpClient CoreClient { get; }
-        public HttpClient GatewayClient { get; }
-        public HttpClient DispatcherClient { get; }
+        public HttpClient FoundationHttpClient { get; }
 
         public IAdminFoundationClient Admin { get; }
         public ICoreFoundationClient Core { get; }
         public IGatewayFoundationClient Gateway { get; }
         public IDispatcherFoundationClient Dispatcher { get; }
 
         public FoundationClient(
-            HttpClient adminClient,
-            HttpClient shellClient,
-            HttpClient gatewayClient,
-            HttpClient dispatcherClient,
+            HttpClient httpClient,
             IAdminFoundationClient adminFoundationClient,
-            ICoreFoundationClient shellFoundationClient,
+            ICoreFoundationClient coreFoundationClient,
             IGatewayFoundationClient gatewayFoundationClient,
             IDispatcherFoundationClient dispatcherFoundationClient
         )
         {
-            AdminClient = adminClient;
-            CoreClient = shellClient;
-            GatewayClient = gatewayClient;
-            DispatcherClient = dispatcherClient;
+            FoundationHttpClient = httpClient;
 
             Admin = adminFoundationClient;
-            Core = shellFoundationClient;
+            Core = coreFoundationClient;
             Gateway = gatewayFoundationClient;
             Dispatcher = dispatcherFoundationClient;
         }
 
-        public void Init(string adminHost, string shellHost, string languageCode, string jwt = null)
+        public void Init(string host, string languageCode, string jwt = null)
         {
-            AdminClient.BaseAddress = new Uri($"https://{adminHost}");
-            CoreClient.BaseAddress = new Uri($"https://{shellHost}");
-            GatewayClient.BaseAddress = new Uri($"https://{shellHost}");
-            DispatcherClient.BaseAddress = new Uri($"https://{adminHost}");
-
+            FoundationHttpClient.BaseAddress = new Uri($"https://{host}");
+
             if (!String.IsNullOrWhiteSpace(jwt))
             {
-                CoreClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {jwt}");
-                GatewayClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {jwt}");
-                AdminClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {jwt}");
-                DispatcherClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {jwt}");
+                FoundationHttpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {jwt}");
             }
 
             if (!String.IsNullOrEmpty(languageCode))
             {
-                AdminClient.DefaultRequestHeaders.Add("Accept-Language", languageCode);
-                CoreClient.DefaultRequestHeaders.Add("Accept-Language", languageCode);
-                GatewayClient.DefaultRequestHeaders.Add("Accept-Language", languageCode);
-                DispatcherClient.DefaultRequestHeaders.Add("Accept-Language", languageCode);
+                FoundationHttpClient.DefaultRequestHeaders.Add("Accept-Language", languageCode);
             }
 
             Admin.Init(this);

diff --git a/Foundation.Clients/Services/Gateway/GatewayAccountFoundationClient.cs b/Foundation.Clients/Services/Gateway/GatewayAccountFoundationClient.cs
@@ -21,7 +21,7 @@ public class GatewayAccountFoundationClient : IGatewayAccountFoundationClient
         private FoundationClient _root;
         private ILogger<GatewayAccountFoundationClient> _logger;
 
-        private HttpClient _client => _root.GatewayClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
         public GatewayAccountFoundationClient(ILogger<GatewayAccountFoundationClient> logger)
         {

diff --git a/Foundation.Clients/Services/Gateway/GatewayTranslationFoundationClient.cs b/Foundation.Clients/Services/Gateway/GatewayTranslationFoundationClient.cs
@@ -21,7 +21,7 @@ public class GatewayTranslationFoundationClient : IGatewayTranslationFoundationC
         private FoundationClient _root;
         private ILogger<GatewayTranslationFoundationClient> _logger;
 
-        private HttpClient _client => _root.GatewayClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
         public GatewayTranslationFoundationClient(ILogger<GatewayTranslationFoundationClient> logger)
         {

diff --git a/Foundation.Clients/Services/Gateway/GatewayUserFoundationClient.cs b/Foundation.Clients/Services/Gateway/GatewayUserFoundationClient.cs
@@ -21,7 +21,7 @@ public class GatewayUserFoundationClient : IGatewayUserFoundationClient
         private FoundationClient _root;
         private ILogger<GatewayUserFoundationClient> _logger;
 
-        private HttpClient _client => _root.GatewayClient;
+        private HttpClient _client => _root.FoundationHttpClient;
 
         public GatewayUserFoundationClient(ILogger<GatewayUserFoundationClient> logger)
         {