Merge pull request #27 from masastack/feature/stack-config

♻ refactor(wasm): OpenApiService add getStackConfigAsync and getI18NC…
masastack · Dec 16, 2024 · a04b743 · a04b743
2 parents 9a9affe + 9aee590
commit a04b743
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/src/BuildingBlocks/Dcc/Masa.BuildingBlocks.StackSdks.Dcc/Service/IOpenApiService.cs b/src/BuildingBlocks/Dcc/Masa.BuildingBlocks.StackSdks.Dcc/Service/IOpenApiService.cs
@@ -2,5 +2,7 @@
 
 public interface IOpenApiService
 {
-    Task<T> GetPublicConfigAsync<T>(string configObject, string environment = "", string cluster = "") where T : class, new();
+    Task<Dictionary<string, string>> GetStackConfigAsync(string environment = "", string cluster = "");
+
+    Task<Dictionary<string, string>> GetI18NConfigAsync(string culture, string environment = "", string cluster = "");
 }
diff --git a/src/Contrib.Wasm/Masa.Contrib.StackSdks.Config.Wasm/MasaStackConfigCache.cs b/src/Contrib.Wasm/Masa.Contrib.StackSdks.Config.Wasm/MasaStackConfigCache.cs
@@ -14,7 +14,7 @@ public virtual async Task InitializeAsync()
     {
         if (_dccClient != null)
         {
-            Section = await _dccClient.OpenApiService.GetPublicConfigAsync<Dictionary<string, string>>(Configs.DEFAULT_CONFIG_NAME);
+            Section = await _dccClient.OpenApiService.GetStackConfigAsync(Configs.DEFAULT_CONFIG_NAME);
         }
     }
 }
diff --git a/src/Contrib.Wasm/Masa.Contrib.StackSdks.Config.Wasm/MasaStackConfigUtils.cs b/src/Contrib.Wasm/Masa.Contrib.StackSdks.Config.Wasm/MasaStackConfigUtils.cs
@@ -7,7 +7,7 @@ internal static class MasaStackConfigUtils
 {
     public static async Task<Dictionary<string, string>> GetDefaultPublicConfigAsync(IDccClient client, string environment)
     {
-        var publicConfig = await client.OpenApiService.GetPublicConfigAsync<Dictionary<string, string>>(Configs.DEFAULT_CONFIG_NAME, environment);
+        var publicConfig = await client.OpenApiService.GetStackConfigAsync(Configs.DEFAULT_CONFIG_NAME, environment);
         return publicConfig;
     }
 

diff --git a/src/Contrib.Wasm/Masa.Contrib.StackSdks.Dcc.Wasm/Service/OpenApiService.cs b/src/Contrib.Wasm/Masa.Contrib.StackSdks.Dcc.Wasm/Service/OpenApiService.cs
@@ -13,23 +13,49 @@ public OpenApiService(ICaller caller, IMultiEnvironmentUserContext environmentUs
         _masaStackConfig = masaStackConfig;
     }
 
-    public async Task<T> GetPublicConfigAsync<T>(string configObject, string environment, string cluster) where T : class, new()
+    public async Task<Dictionary<string, string>> GetStackConfigAsync(string environment, string cluster)
     {
         if (environment.IsNullOrEmpty())
         {
             environment = _environmentUserContext.Environment ?? string.Empty;
         }
+
+        if (environment.IsNullOrEmpty())
+        {
+            environment = _masaStackConfig.Environment;
+        }
+
+        if (cluster.IsNullOrEmpty())
+        {
+            cluster = Configs.DEFAULT_CLUSTER;
+        }
+
+        var requestUri = $"open-api/releasing/{environment}/{cluster}/stack-config";
+        var result = await _caller.GetAsync<Dictionary<string, string>>(requestUri);
+
+        return result ?? new();
+    }
+
+    public async Task<Dictionary<string, string>> GetI18NConfigAsync(string culture, string environment, string cluster)
+    {
+        if (environment.IsNullOrEmpty())
+        {
+            environment = _environmentUserContext.Environment ?? string.Empty;
+        }
+
         if (environment.IsNullOrEmpty())
         {
             environment = _masaStackConfig.Environment;
         }
+
         if (cluster.IsNullOrEmpty())
         {
             cluster = Configs.DEFAULT_CLUSTER;
         }
-        var requestUri = $"open-api/releasing/{environment}/{cluster}/publicConfig/{configObject}";
-        var result = await _caller.GetAsync<T>(requestUri);
 
-        return result ?? new T();
+        var requestUri = $"open-api/releasing/{environment}/{cluster}/i18n/{culture}";
+        var result = await _caller.GetAsync<Dictionary<string, string>>(requestUri);
+
+        return result ?? new();
     }
 }