Remove references to Managing.Aspire.AppHost and Managing.Aspire.ServiceDefaults from solution and project files; update API project to eliminate unused references and adjust JWT token handling in Program.cs; enhance NSwag generation for Axios and Fetch clients, including new import handling.

2025-12-14 00:18:02 +07:00
parent 0126377486
commit 2157d1f2c9
5 changed files with 72 additions and 49 deletions
--- a/src/Managing.Api/Managing.Api.csproj
+++ b/src/Managing.Api/Managing.Api.csproj
@@ -39,7 +39,6 @@

    <ItemGroup>
        <ProjectReference Include="..\Managing.Bootstrap\Managing.Bootstrap.csproj"/>
-        <ProjectReference Include="..\Managing.Aspire.ServiceDefaults\Managing.Aspire.ServiceDefaults.csproj"/>
        <ProjectReference Include="..\Managing.Core\Managing.Core.csproj"/>
    </ItemGroup>

--- a/src/Managing.Api/Program.cs
+++ b/src/Managing.Api/Program.cs
@@ -70,8 +70,6 @@ SentrySdk.Init(options =>
    options.Environment = builder.Environment.EnvironmentName;
 });

-// Add Service Defaults - using extension methods directly
-builder.Services.AddServiceDiscovery();
 builder.Services.AddHealthChecks()
    .AddCheck("self", () => HealthCheckResult.Healthy(), ["api"]);

@@ -167,7 +165,9 @@ builder.Host.UseSerilog((hostBuilder, loggerConfiguration) =>
    };

    loggerConfiguration
-        .MinimumLevel.Override("Microsoft.EntityFrameworkCore.Database.Command", LogEventLevel.Warning) // Filter out EF Core SQL query logs
+        .MinimumLevel
+        .Override("Microsoft.EntityFrameworkCore.Database.Command",
+            LogEventLevel.Warning) // Filter out EF Core SQL query logs
        .WriteTo.Console()
        .WriteTo.Elasticsearch(es);
 });
--- a/src/Managing.Nswag/Program.cs
+++ b/src/Managing.Nswag/Program.cs
@@ -29,6 +29,9 @@ Directory.CreateDirectory(targetWebAppDirectory); // Ensure the directory exists
 var targetWeb3ProxyDirectory = Path.Combine(solutionDirectory, "src", "Managing.Web3Proxy", "src", "generated");
 Directory.CreateDirectory(targetWeb3ProxyDirectory);

+var targetKaigenWebDirectory = "/Users/oda/Desktop/Projects/kaigen-web/webapp/src/generated";
+Directory.CreateDirectory(targetKaigenWebDirectory);
+
 var settings = new TypeScriptClientGeneratorSettings
 {
    ClassName = "{controller}Client",
@@ -53,13 +56,38 @@ var settings = new TypeScriptClientGeneratorSettings
 var generatorApiClient = new TypeScriptClientGenerator(document, settings);
 var codeApiClient = generatorApiClient.GenerateFile();

-// Add the necessary imports after the auto-generated comment
+// Settings for Kaigen web project using Axios
+var settingsAxios = new TypeScriptClientGeneratorSettings
+{
+    ClassName = "{controller}Client",
+    ClientBaseClass = "AuthorizedApiBase",
+    ConfigurationClass = "IConfig",
+    GenerateDtoTypes = true,
+    UseTransformOptionsMethod = true,
+    TypeScriptGeneratorSettings =
+    {
+        EnumStyle = TypeScriptEnumStyle.Enum,
+        DateTimeType = TypeScriptDateTimeType.Date,
+        NullValue = TypeScriptNullValue.Null,
+        TypeStyle = TypeScriptTypeStyle.Interface,
+        GenerateDefaultValues = true,
+        MarkOptionalProperties = true,
+        TypeScriptVersion = 4.3m
+    },
+    OperationNameGenerator = new MultipleClientsFromFirstTagAndOperationIdGenerator(),
+    Template = TypeScriptTemplate.Axios,
+};
+
+var generatorApiClientAxios = new TypeScriptClientGenerator(document, settingsAxios);
+var codeApiClientAxios = generatorApiClientAxios.GenerateFile();
+
+// Add the necessary imports after the auto-generated comment for Fetch version
 var requiredImports = @"
 import AuthorizedApiBase from ""./AuthorizedApiBase"";
 import IConfig from ""./IConfig"";
 ";

-// Find the end of the auto-generated comment and insert imports
+// Find the end of the auto-generated comment and insert imports for Fetch version
 var autoGeneratedEndIndex = codeApiClient.IndexOf("//----------------------");
 if (autoGeneratedEndIndex != -1)
 {
@@ -72,7 +100,21 @@ if (autoGeneratedEndIndex != -1)
    }
 }

+// Add the necessary imports for Axios version as well
+var autoGeneratedEndIndexAxios = codeApiClientAxios.IndexOf("//----------------------");
+if (autoGeneratedEndIndexAxios != -1)
+{
+    // Find the second occurrence (end of the comment block)
+    autoGeneratedEndIndexAxios = codeApiClientAxios.IndexOf("//----------------------", autoGeneratedEndIndexAxios + 1);
+    if (autoGeneratedEndIndexAxios != -1)
+    {
+        autoGeneratedEndIndexAxios = codeApiClientAxios.IndexOf("\n", autoGeneratedEndIndexAxios) + 1;
+        codeApiClientAxios = codeApiClientAxios.Insert(autoGeneratedEndIndexAxios, requiredImports);
+    }
+}
+
 File.WriteAllText(Path.Combine(targetWebAppDirectory, "ManagingApi.ts"), codeApiClient);
+File.WriteAllText(Path.Combine(targetKaigenWebDirectory, "ManagingApi.ts"), codeApiClientAxios);

 var settingsTypes = new TypeScriptClientGeneratorSettings
 {
@@ -98,3 +140,4 @@ var codeTypes = generatorTypes.GenerateFile();

 File.WriteAllText(Path.Combine(targetWebAppDirectory, "ManagingApiTypes.ts"), codeTypes);
 File.WriteAllText(Path.Combine(targetWeb3ProxyDirectory, "ManagingApiTypes.ts"), codeTypes);
+File.WriteAllText(Path.Combine(targetKaigenWebDirectory, "ManagingApiTypes.ts"), codeTypes);
--- a/src/Managing.WebApp/src/generated/AuthorizedApiBase.ts
+++ b/src/Managing.WebApp/src/generated/AuthorizedApiBase.ts
@@ -7,6 +7,7 @@
 import {Cookies} from 'react-cookie'

 import type IConfig from './IConfig'
+
 export default class AuthorizedApiBase {
  private readonly config: IConfig

@@ -14,7 +15,7 @@ export default class AuthorizedApiBase {
    this.config = config
  }

-  transformOptions = (options: any): Promise<RequestInit> => {
+  transformOptions = (options: any): Promise<any> => {
    const cookies = new Cookies()
    const bearerToken = cookies.get('token')
    if (bearerToken) {
--- a/src/Managing.sln
+++ b/src/Managing.sln
@@ -62,10 +62,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Managing.ABI.GmxV2", "Managing.ABI.GmxV2\Managing.ABI.GmxV2.csproj", "{4521E1A9-AF81-4CA8-8B4D-30C261ECE977}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Managing.Aspire.AppHost", "Managing.Aspire.AppHost\Managing.Aspire.AppHost.csproj", "{2A7AC5A7-B4D6-4DF2-976B-6EE771BB4C31}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Managing.Aspire.ServiceDefaults", "Managing.Aspire.ServiceDefaults\Managing.Aspire.ServiceDefaults.csproj", "{F58949B8-4173-4F9E-83FF-B88FA2C5C849}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Managing.Nswag", "Managing.Nswag\Managing.Nswag.csproj", "{BE50F950-C1D4-4CE0-B32E-6AAC996770D5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Managing.Workers", "Managing.Workers\Managing.Workers.csproj", "{B7D66A73-CA3A-4DE5-8E88-59D50C4018A6}"
@@ -218,22 +214,6 @@ Global
 		{4521E1A9-AF81-4CA8-8B4D-30C261ECE977}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4521E1A9-AF81-4CA8-8B4D-30C261ECE977}.Release|x64.ActiveCfg = Release|Any CPU
 		{4521E1A9-AF81-4CA8-8B4D-30C261ECE977}.Release|x64.Build.0 = Release|Any CPU
-		{2A7AC5A7-B4D6-4DF2-976B-6EE771BB4C31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A7AC5A7-B4D6-4DF2-976B-6EE771BB4C31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A7AC5A7-B4D6-4DF2-976B-6EE771BB4C31}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2A7AC5A7-B4D6-4DF2-976B-6EE771BB4C31}.Debug|x64.Build.0 = Debug|Any CPU
-		{2A7AC5A7-B4D6-4DF2-976B-6EE771BB4C31}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2A7AC5A7-B4D6-4DF2-976B-6EE771BB4C31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2A7AC5A7-B4D6-4DF2-976B-6EE771BB4C31}.Release|x64.ActiveCfg = Release|Any CPU
-		{2A7AC5A7-B4D6-4DF2-976B-6EE771BB4C31}.Release|x64.Build.0 = Release|Any CPU
-		{F58949B8-4173-4F9E-83FF-B88FA2C5C849}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F58949B8-4173-4F9E-83FF-B88FA2C5C849}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F58949B8-4173-4F9E-83FF-B88FA2C5C849}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F58949B8-4173-4F9E-83FF-B88FA2C5C849}.Debug|x64.Build.0 = Debug|Any CPU
-		{F58949B8-4173-4F9E-83FF-B88FA2C5C849}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F58949B8-4173-4F9E-83FF-B88FA2C5C849}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F58949B8-4173-4F9E-83FF-B88FA2C5C849}.Release|x64.ActiveCfg = Release|Any CPU
-		{F58949B8-4173-4F9E-83FF-B88FA2C5C849}.Release|x64.Build.0 = Release|Any CPU
 		{BE50F950-C1D4-4CE0-B32E-6AAC996770D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BE50F950-C1D4-4CE0-B32E-6AAC996770D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BE50F950-C1D4-4CE0-B32E-6AAC996770D5}.Debug|x64.ActiveCfg = Debug|Any CPU