Merge pull request #587 from PinguApps/586-config-overwritten

586 Ensured that config is only ever accessed as a keyed service to prevent it being overwritten
PinguApps · Dec 21, 2024 · 3c91798 · 3c91798
2 parents f30511c + 7718df1
commit 3c91798
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 18 deletions.
diff --git a/src/PinguApps.Appwrite.Client/Clients/AccountClient.cs b/src/PinguApps.Appwrite.Client/Clients/AccountClient.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using PinguApps.Appwrite.Client.Clients;
 using PinguApps.Appwrite.Client.Internals;
 using PinguApps.Appwrite.Client.Utils;
@@ -16,7 +17,7 @@ public class AccountClient : SessionAwareClientBase, IAccountClient
     private readonly IAccountApi _accountApi;
     private readonly Config _config;
 
-    internal AccountClient(IAccountApi accountApi, Config config)
+    internal AccountClient(IAccountApi accountApi, [FromKeyedServices("Client")] Config config)
     {
         _accountApi = accountApi;
         _config = config;

diff --git a/src/PinguApps.Appwrite.Client/Clients/TeamsClient.cs b/src/PinguApps.Appwrite.Client/Clients/TeamsClient.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using PinguApps.Appwrite.Client.Internals;
 using PinguApps.Appwrite.Client.Utils;
 using PinguApps.Appwrite.Shared;
@@ -16,7 +17,7 @@ public class TeamsClient : SessionAwareClientBase, ITeamsClient
     private readonly ITeamsApi _teamsApi;
     private readonly Config _config;
 
-    internal TeamsClient(ITeamsApi teamsApi, Config config)
+    internal TeamsClient(ITeamsApi teamsApi, [FromKeyedServices("Client")] Config config)
     {
         _teamsApi = teamsApi;
         _config = config;

diff --git a/src/PinguApps.Appwrite.Client/Handlers/HeaderHandler.cs b/src/PinguApps.Appwrite.Client/Handlers/HeaderHandler.cs
@@ -1,14 +1,15 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using PinguApps.Appwrite.Shared;
 
 namespace PinguApps.Appwrite.Client.Handlers;
 internal class HeaderHandler : DelegatingHandler
 {
     private readonly string _projectId;
 
-    public HeaderHandler(Config config)
+    public HeaderHandler([FromKeyedServices("Client")] Config config)
     {
         _projectId = config.ProjectId;
     }

diff --git a/src/PinguApps.Appwrite.Client/ServiceCollectionExtensions.cs b/src/PinguApps.Appwrite.Client/ServiceCollectionExtensions.cs
@@ -30,7 +30,7 @@ public static IServiceCollection AddAppwriteClient(this IServiceCollection servi
     {
         var customRefitSettings = AddSerializationConfigToRefitSettings(refitSettings);
 
-        services.AddSingleton(new Config(endpoint, projectId));
+        services.AddKeyedSingleton("Client", new Config(endpoint, projectId));
         services.AddTransient<HeaderHandler>();
         services.AddTransient<ClientCookieSessionHandler>();
 
@@ -52,13 +52,13 @@ public static IServiceCollection AddAppwriteClient(this IServiceCollection servi
         services.AddSingleton<IAccountClient>(sp =>
         {
             var api = sp.GetRequiredService<IAccountApi>();
-            var config = sp.GetRequiredService<Config>();
+            var config = sp.GetRequiredKeyedService<Config>("Client");
             return new AccountClient(api, config);
         });
         services.AddSingleton<ITeamsClient>(sp =>
         {
             var api = sp.GetRequiredService<ITeamsApi>();
-            var config = sp.GetRequiredService<Config>();
+            var config = sp.GetRequiredKeyedService<Config>("Client");
             return new TeamsClient(api, config);
         });
         services.AddSingleton<IDatabasesClient>(sp =>
@@ -84,7 +84,7 @@ public static IServiceCollection AddAppwriteClientForServer(this IServiceCollect
     {
         var customRefitSettings = AddSerializationConfigToRefitSettings(refitSettings);
 
-        services.AddSingleton(new Config(endpoint, projectId));
+        services.AddKeyedSingleton("Client", new Config(endpoint, projectId));
         services.AddTransient<HeaderHandler>();
 
         services.AddRefitClient<IAccountApi>(customRefitSettings)
@@ -105,13 +105,13 @@ public static IServiceCollection AddAppwriteClientForServer(this IServiceCollect
         services.AddSingleton<IAccountClient>(sp =>
         {
             var api = sp.GetRequiredService<IAccountApi>();
-            var config = sp.GetRequiredService<Config>();
+            var config = sp.GetRequiredKeyedService<Config>("Client");
             return new AccountClient(api, config);
         });
         services.AddSingleton<ITeamsClient>(sp =>
         {
             var api = sp.GetRequiredService<ITeamsApi>();
-            var config = sp.GetRequiredService<Config>();
+            var config = sp.GetRequiredKeyedService<Config>("Client");
             return new TeamsClient(api, config);
         });
         services.AddSingleton<IDatabasesClient>(sp =>

diff --git a/src/PinguApps.Appwrite.Server/Clients/AccountClient.cs b/src/PinguApps.Appwrite.Server/Clients/AccountClient.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using PinguApps.Appwrite.Server.Internals;
 using PinguApps.Appwrite.Server.Utils;
 using PinguApps.Appwrite.Shared;
@@ -15,7 +16,7 @@ public class AccountClient : IAccountClient
 
     private readonly Config _config;
 
-    internal AccountClient(IAccountApi accountApi, Config config)
+    internal AccountClient(IAccountApi accountApi, [FromKeyedServices("Server")] Config config)
     {
         _accountApi = accountApi;
         _config = config;

diff --git a/src/PinguApps.Appwrite.Server/Clients/TeamsClient.cs b/src/PinguApps.Appwrite.Server/Clients/TeamsClient.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using PinguApps.Appwrite.Server.Internals;
 using PinguApps.Appwrite.Server.Utils;
 using PinguApps.Appwrite.Shared;
@@ -16,7 +17,7 @@ public class TeamsClient : ITeamsClient
     private readonly ITeamsApi _teamsApi;
     private readonly Config _config;
 
-    internal TeamsClient(ITeamsApi teamsApi, Config config)
+    internal TeamsClient(ITeamsApi teamsApi, [FromKeyedServices("Server")] Config config)
     {
         _teamsApi = teamsApi;
         _config = config;

diff --git a/src/PinguApps.Appwrite.Server/Clients/UsersClient.cs b/src/PinguApps.Appwrite.Server/Clients/UsersClient.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using PinguApps.Appwrite.Server.Internals;
 using PinguApps.Appwrite.Server.Utils;
 using PinguApps.Appwrite.Shared;
@@ -15,7 +16,7 @@ public class UsersClient : IUsersClient
     private readonly IUsersApi _usersApi;
     private readonly Config _config;
 
-    internal UsersClient(IUsersApi usersApi, Config config)
+    internal UsersClient(IUsersApi usersApi, [FromKeyedServices("Server")] Config config)
     {
         _usersApi = usersApi;
         _config = config;

diff --git a/src/PinguApps.Appwrite.Server/Handlers/HeaderHandler.cs b/src/PinguApps.Appwrite.Server/Handlers/HeaderHandler.cs
@@ -2,6 +2,7 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using PinguApps.Appwrite.Shared;
 
 namespace PinguApps.Appwrite.Server.Handlers;
@@ -10,7 +11,7 @@ internal class HeaderHandler : DelegatingHandler
     private readonly string _projectId;
     private readonly string _apiKey;
 
-    public HeaderHandler(Config config)
+    public HeaderHandler([FromKeyedServices("Server")] Config config)
     {
         if (config.ApiKey is null)
             throw new ArgumentNullException("config.ApiKey");

diff --git a/src/PinguApps.Appwrite.Server/ServiceCollectionExtensions.cs b/src/PinguApps.Appwrite.Server/ServiceCollectionExtensions.cs
@@ -31,7 +31,7 @@ public static IServiceCollection AddAppwriteServer(this IServiceCollection servi
     {
         var customRefitSettings = AddSerializationConfigToRefitSettings(refitSettings);
 
-        services.AddSingleton(new Config(endpoint, projectId, apiKey));
+        services.AddKeyedSingleton("Server", new Config(endpoint, projectId, apiKey));
         services.AddTransient<HeaderHandler>();
 
         services.AddRefitClient<IAccountApi>(customRefitSettings)
@@ -57,19 +57,19 @@ public static IServiceCollection AddAppwriteServer(this IServiceCollection servi
         services.AddSingleton<IAccountClient>(sp =>
         {
             var api = sp.GetRequiredService<IAccountApi>();
-            var config = sp.GetRequiredService<Config>();
+            var config = sp.GetRequiredKeyedService<Config>("Server");
             return new AccountClient(api, config);
         });
         services.AddSingleton<IUsersClient>(sp =>
         {
             var api = sp.GetRequiredService<IUsersApi>();
-            var config = sp.GetRequiredService<Config>();
+            var config = sp.GetRequiredKeyedService<Config>("Server");
             return new UsersClient(api, config);
         });
         services.AddSingleton<ITeamsClient>(sp =>
         {
             var api = sp.GetRequiredService<ITeamsApi>();
-            var config = sp.GetRequiredService<Config>();
+            var config = sp.GetRequiredKeyedService<Config>("Server");
             return new TeamsClient(api, config);
         });
         services.AddSingleton<IDatabasesClient>(sp =>

diff --git a/src/PinguApps.Appwrite.Shared/Constants.cs b/src/PinguApps.Appwrite.Shared/Constants.cs
@@ -1,5 +1,5 @@
 namespace PinguApps.Appwrite.Shared;
 public static class Constants
 {
-    public const string Version = "0.4.5";
+    public const string Version = "0.4.6";
 }