diff --git a/Src/Application/Application.csproj b/Src/Application/Application.csproj index 22a6b897..6cdea371 100644 --- a/Src/Application/Application.csproj +++ b/Src/Application/Application.csproj @@ -10,11 +10,11 @@ - + - - - + + + diff --git a/Src/Domain/Domain.csproj b/Src/Domain/Domain.csproj index 0f793fd4..c017d2fb 100644 --- a/Src/Domain/Domain.csproj +++ b/Src/Domain/Domain.csproj @@ -7,7 +7,7 @@ enable - + diff --git a/Src/Infrastructure/Infrastructure.csproj b/Src/Infrastructure/Infrastructure.csproj index f69bde83..21a01c6e 100644 --- a/Src/Infrastructure/Infrastructure.csproj +++ b/Src/Infrastructure/Infrastructure.csproj @@ -9,18 +9,17 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + diff --git a/Src/WebUI/ClientApp/src/app/northwind-traders-api.ts b/Src/WebUI/ClientApp/src/app/northwind-traders-api.ts index 1520e08c..3b7471f0 100644 --- a/Src/WebUI/ClientApp/src/app/northwind-traders-api.ts +++ b/Src/WebUI/ClientApp/src/app/northwind-traders-api.ts @@ -1,6 +1,6 @@ //---------------------- // -// Generated using the NSwag toolchain v13.20.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v14.0.0.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org) // //---------------------- @@ -48,7 +48,7 @@ export class Client implements IClient { constructor(@Inject(HttpClient) http: HttpClient, @Optional() @Inject(API_BASE_URL) baseUrl?: string) { this.http = http; - this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + this.baseUrl = baseUrl ?? ""; } postRegister(registration: RegisterRequest | undefined): Observable { @@ -1918,7 +1918,6 @@ export interface ITwoFactorRequest { export class InfoResponse implements IInfoResponse { email?: string; isEmailConfirmed?: boolean; - claims?: { [key: string]: string; }; constructor(data?: IInfoResponse) { if (data) { @@ -1933,13 +1932,6 @@ export class InfoResponse implements IInfoResponse { if (_data) { this.email = _data["email"]; this.isEmailConfirmed = _data["isEmailConfirmed"]; - if (_data["claims"]) { - this.claims = {} as any; - for (let key in _data["claims"]) { - if (_data["claims"].hasOwnProperty(key)) - (this.claims)![key] = _data["claims"][key]; - } - } } } @@ -1954,13 +1946,6 @@ export class InfoResponse implements IInfoResponse { data = typeof data === 'object' ? data : {}; data["email"] = this.email; data["isEmailConfirmed"] = this.isEmailConfirmed; - if (this.claims) { - data["claims"] = {}; - for (let key in this.claims) { - if (this.claims.hasOwnProperty(key)) - (data["claims"])[key] = (this.claims)[key]; - } - } return data; } } @@ -1968,7 +1953,6 @@ export class InfoResponse implements IInfoResponse { export interface IInfoResponse { email?: string; isEmailConfirmed?: boolean; - claims?: { [key: string]: string; }; } export class InfoRequest implements IInfoRequest { diff --git a/Src/WebUI/Program.cs b/Src/WebUI/Program.cs index e68e3b19..57fcf742 100644 --- a/Src/WebUI/Program.cs +++ b/Src/WebUI/Program.cs @@ -70,7 +70,7 @@ app.UseOpenApi(); //app.UseSwaggerUi3(settings => settings.DocumentPath = "/api/specification.json"); -app.UseSwaggerUi3(settings => settings.Path = "/api"); +app.UseSwaggerUi(settings => settings.Path = "/api"); app.UseRouting(); diff --git a/Src/WebUI/WebUI.csproj b/Src/WebUI/WebUI.csproj index 2a69cc06..92560923 100644 --- a/Src/WebUI/WebUI.csproj +++ b/Src/WebUI/WebUI.csproj @@ -21,24 +21,24 @@ - + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + - + + all runtime; build; native; contentfiles; analyzers @@ -51,6 +51,9 @@ + + Always + @@ -75,15 +78,14 @@ <_ContentIncludedByDefault Remove="Pages\_ViewStart.cshtml" /> - - - - - + + + + + - - - + + @@ -99,19 +101,10 @@ - - diff --git a/Src/WebUI/nswag.json b/Src/WebUI/nswag.json index 463ccb3d..81104e21 100644 --- a/Src/WebUI/nswag.json +++ b/Src/WebUI/nswag.json @@ -1,5 +1,5 @@ { - "runtime": "Net70", + "runtime": "Net80", "defaultVariables": null, "documentGenerator": { "aspNetCoreToOpenApi": { diff --git a/Src/WebUI/wwwroot/api/specification.json b/Src/WebUI/wwwroot/api/specification.json index 4284e887..89389aa7 100644 --- a/Src/WebUI/wwwroot/api/specification.json +++ b/Src/WebUI/wwwroot/api/specification.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.20.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v13.0.0.0))", + "x-generator": "NSwag v14.0.0.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))", "openapi": "3.0.0", "info": { "title": "Northwind Traders API", @@ -11,7 +11,6 @@ "operationId": "PostRegister", "requestBody": { "x-name": "registration", - "description": "", "content": { "application/json": { "schema": { @@ -63,7 +62,6 @@ ], "requestBody": { "x-name": "login", - "description": "", "content": { "application/json": { "schema": { @@ -92,7 +90,6 @@ "operationId": "PostRefresh", "requestBody": { "x-name": "refreshRequest", - "description": "", "content": { "application/json": { "schema": { @@ -160,7 +157,6 @@ "operationId": "PostResendConfirmationEmail", "requestBody": { "x-name": "resendRequest", - "description": "", "content": { "application/json": { "schema": { @@ -182,7 +178,6 @@ "operationId": "PostForgotPassword", "requestBody": { "x-name": "resetRequest", - "description": "", "content": { "application/json": { "schema": { @@ -214,7 +209,6 @@ "operationId": "PostResetPassword", "requestBody": { "x-name": "resetRequest", - "description": "", "content": { "application/json": { "schema": { @@ -246,7 +240,6 @@ "operationId": "PostManage2fa", "requestBody": { "x-name": "tfaRequest", - "description": "", "content": { "application/json": { "schema": { @@ -316,7 +309,6 @@ "operationId": "PostManageInfo", "requestBody": { "x-name": "infoRequest", - "description": "", "content": { "application/json": { "schema": { @@ -442,7 +434,6 @@ "operationId": "CreateCustomer", "requestBody": { "x-name": "command", - "description": "", "content": { "application/json": { "schema": { @@ -548,7 +539,6 @@ ], "requestBody": { "x-name": "command", - "description": "", "content": { "application/json": { "schema": { @@ -670,7 +660,6 @@ "operationId": "CreateProduct", "requestBody": { "x-name": "command", - "description": "", "content": { "application/json": { "schema": { @@ -733,7 +722,6 @@ "operationId": "UpdateProduct", "requestBody": { "x-name": "command", - "description": "", "content": { "application/json": { "schema": { @@ -1106,12 +1094,6 @@ }, "isEmailConfirmed": { "type": "boolean" - }, - "claims": { - "type": "object", - "additionalProperties": { - "type": "string" - } } } }, diff --git a/Tests/Application.UnitTests/Application.UnitTests.csproj b/Tests/Application.UnitTests/Application.UnitTests.csproj index b19710c7..a356a92d 100644 --- a/Tests/Application.UnitTests/Application.UnitTests.csproj +++ b/Tests/Application.UnitTests/Application.UnitTests.csproj @@ -12,10 +12,10 @@ - - + + - + all runtime; build; native; contentfiles; analyzers diff --git a/Tests/Common/Common.csproj b/Tests/Common/Common.csproj index 77e7de3f..414ed8db 100644 --- a/Tests/Common/Common.csproj +++ b/Tests/Common/Common.csproj @@ -8,12 +8,11 @@ - - - + + - - + + diff --git a/Tests/Domain.UnitTests/Domain.UnitTests.csproj b/Tests/Domain.UnitTests/Domain.UnitTests.csproj index 04c0df63..605e1cf4 100644 --- a/Tests/Domain.UnitTests/Domain.UnitTests.csproj +++ b/Tests/Domain.UnitTests/Domain.UnitTests.csproj @@ -10,8 +10,8 @@ - - + + all runtime; build; native; contentfiles; analyzers diff --git a/Tests/Infrastructure.IntegrationTests/Infrastructure.IntegrationTests.csproj b/Tests/Infrastructure.IntegrationTests/Infrastructure.IntegrationTests.csproj index b8202f6e..24d4f8d5 100644 --- a/Tests/Infrastructure.IntegrationTests/Infrastructure.IntegrationTests.csproj +++ b/Tests/Infrastructure.IntegrationTests/Infrastructure.IntegrationTests.csproj @@ -13,14 +13,13 @@ - - - + + - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/WebUI.IntegrationTests/WebUI.IntegrationTests.csproj b/Tests/WebUI.IntegrationTests/WebUI.IntegrationTests.csproj index df892baf..f9b33d46 100644 --- a/Tests/WebUI.IntegrationTests/WebUI.IntegrationTests.csproj +++ b/Tests/WebUI.IntegrationTests/WebUI.IntegrationTests.csproj @@ -11,17 +11,17 @@ - - - + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - +