✨ Fixing merge issues and improving approach.

jasontaylordev · Jun 28, 2023 · eab4ce1 · eab4ce1
1 parent 3847651
commit eab4ce1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 110 deletions.
diff --git a/src/WebUI/ClientApp/src/app/web-api-client.ts b/src/WebUI/ClientApp/src/app/web-api-client.ts
@@ -1,6 +1,6 @@
 //----------------------
 // <auto-generated>
-//     Generated using the NSwag toolchain v13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
+//     Generated using the NSwag toolchain v13.19.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
 // </auto-generated>
 //----------------------
 

diff --git a/src/WebUI/ConfigureServices.cs b/src/WebUI/ConfigureServices.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.Mvc;
 using ZymLabs.NSwag.FluentValidation;
 
-namespace CleanArchitecture.WebUI;
+namespace Microsoft.Extensions.DependencyInjection;
 
 public static class ConfigureServices
 {
@@ -29,8 +29,6 @@ public static IServiceCollection AddWebUIServices(this IServiceCollection servic
             return new FluentValidationSchemaProcessor(provider, validationRules, loggerFactory);
         });
 
-        services.AddEndpointsApiExplorer();
-
         // Customise default API behaviour
         services.Configure<ApiBehaviorOptions>(options =>
             options.SuppressModelStateInvalidFilter = true);

diff --git a/src/WebUI/Infrastructure/AbstractEndpoint.cs b/src/WebUI/Infrastructure/AbstractEndpoint.cs
diff --git a/src/WebUI/OidcConfiguration/OidcConfiguration.cs b/src/WebUI/OidcConfiguration/OidcConfiguration.cs
diff --git a/src/WebUI/Program.cs b/src/WebUI/Program.cs
@@ -1,5 +1,4 @@
 using CleanArchitecture.Infrastructure.Persistence;
-using CleanArchitecture.WebUI;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -39,12 +38,6 @@
     settings.DocumentPath = "/api/specification.json";
 });
 
-app.UseRouting();
-
-app.UseAuthentication();
-app.UseIdentityServer();
-app.UseAuthorization();
-
 app.MapControllerRoute(
     name: "default",
     pattern: "{controller}/{action=Index}/{id?}");

diff --git a/src/WebUI/wwwroot/api/specification.json b/src/WebUI/wwwroot/api/specification.json
@@ -1,5 +1,5 @@
 {
-  "x-generator": "NSwag v13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v13.0.0.0))",
+  "x-generator": "NSwag v13.19.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v10.0.0.0))",
   "openapi": "3.0.0",
   "info": {
     "title": "CleanArchitecture API",
@@ -198,12 +198,7 @@
               }
             }
           }
-        },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        }
       }
     },
     "/api/TodoItems/{id}": {
@@ -302,12 +297,7 @@
           "200": {
             "description": ""
           }
-        },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        }
       }
     }
   },
@@ -352,7 +342,7 @@
           "priorityLevels": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/PriorityLevelDto"
+              "$ref": "#/components/schemas/LookupDto"
             }
           },
           "lists": {
@@ -363,15 +353,15 @@
           }
         }
       },
-      "PriorityLevelDto": {
+      "LookupDto": {
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "value": {
+          "id": {
             "type": "integer",
             "format": "int32"
           },
-          "name": {
+          "title": {
             "type": "string",
             "nullable": true
           }
@@ -513,10 +503,5 @@
         ]
       }
     }
-  },
-  "security": [
-    {
-      "JWT": []
-    }
-  ]
+  }
 }