From ad455d858cdec09ca96fa6b1b382731dec2cc5f2 Mon Sep 17 00:00:00 2001
From: Jason Taylor <jasongt@outlook.com>
Date: Tue, 25 Oct 2022 21:33:35 +1000
Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8=20Switch=20to=20Minimal=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CleanArchitecture.sln                         |  21 +-
 .../app/fetch-data/fetch-data.component.ts    |  12 +-
 .../src/app/nav-menu/nav-menu.component.html  |  16 +-
 .../ClientApp/src/app/todo/todo.component.ts  |  15 +-
 src/WebUI/ClientApp/src/app/web-api-client.ts | 776 ++++++------------
 src/WebUI/ConfigureServices.cs                |   6 +-
 src/WebUI/Controllers/ApiControllerBase.cs    |  17 -
 src/WebUI/Controllers/TodoItemsController.cs  |  66 --
 src/WebUI/Controllers/TodoListsController.cs  |  57 --
 .../Controllers/WeatherForecastController.cs  |  13 -
 .../Filters/ApiExceptionFilterAttribute.cs    | 122 ---
 src/WebUI/GlobalUsings.cs                     |   2 +
 src/WebUI/Infrastructure/AbstractEndpoint.cs  |  60 ++
 .../Infrastructure/ApiExceptionFilter.cs      | 106 +++
 src/WebUI/Infrastructure/IEndpoint.cs         |   6 +
 .../RouteHandlerBuilderExtensions.cs          |  17 +
 .../WebApplicationExtensions.cs               |  27 +
 .../OidcConfiguration/OidcConfiguration.cs    |  16 +
 src/WebUI/Program.cs                          |  12 +-
 src/WebUI/Services/CurrentUser.cs             |   2 +-
 src/WebUI/TodoItems/CreateTodoItem.cs         |  12 +
 src/WebUI/TodoItems/DeleteTodoItem.cs         |  16 +
 src/WebUI/TodoItems/UpdateTodoItem.cs         |  19 +
 src/WebUI/TodoItems/UpdateTodoItemDetail.cs   |  19 +
 src/WebUI/TodoLists/CreateTodoList.cs         |  12 +
 src/WebUI/TodoLists/DeleteTodoList.cs         |  16 +
 src/WebUI/TodoLists/ExportTodos.cs            |  16 +
 src/WebUI/TodoLists/GetTodoLists.cs           |  12 +
 src/WebUI/TodoLists/UpdateTodoList.cs         |  19 +
 .../WeatherForecasts/GetWeatherForecasts.cs   |  12 +
 src/WebUI/WebUI.csproj                        |   2 +
 src/WebUI/wwwroot/api/specification.json      | 574 +++++--------
 32 files changed, 913 insertions(+), 1185 deletions(-)
 delete mode 100644 src/WebUI/Controllers/ApiControllerBase.cs
 delete mode 100644 src/WebUI/Controllers/TodoItemsController.cs
 delete mode 100644 src/WebUI/Controllers/TodoListsController.cs
 delete mode 100644 src/WebUI/Controllers/WeatherForecastController.cs
 delete mode 100644 src/WebUI/Filters/ApiExceptionFilterAttribute.cs
 create mode 100644 src/WebUI/GlobalUsings.cs
 create mode 100644 src/WebUI/Infrastructure/AbstractEndpoint.cs
 create mode 100644 src/WebUI/Infrastructure/ApiExceptionFilter.cs
 create mode 100644 src/WebUI/Infrastructure/IEndpoint.cs
 create mode 100644 src/WebUI/Infrastructure/RouteHandlerBuilderExtensions.cs
 create mode 100644 src/WebUI/Infrastructure/WebApplicationExtensions.cs
 create mode 100644 src/WebUI/OidcConfiguration/OidcConfiguration.cs
 create mode 100644 src/WebUI/TodoItems/CreateTodoItem.cs
 create mode 100644 src/WebUI/TodoItems/DeleteTodoItem.cs
 create mode 100644 src/WebUI/TodoItems/UpdateTodoItem.cs
 create mode 100644 src/WebUI/TodoItems/UpdateTodoItemDetail.cs
 create mode 100644 src/WebUI/TodoLists/CreateTodoList.cs
 create mode 100644 src/WebUI/TodoLists/DeleteTodoList.cs
 create mode 100644 src/WebUI/TodoLists/ExportTodos.cs
 create mode 100644 src/WebUI/TodoLists/GetTodoLists.cs
 create mode 100644 src/WebUI/TodoLists/UpdateTodoList.cs
 create mode 100644 src/WebUI/WeatherForecasts/GetWeatherForecasts.cs

diff --git a/CleanArchitecture.sln b/CleanArchitecture.sln
index 00afa1572..34fefbe66 100644
--- a/CleanArchitecture.sln
+++ b/CleanArchitecture.sln
@@ -19,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Domain.UnitTests", "tests\D
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application.IntegrationTests", "tests\Application.IntegrationTests\Application.IntegrationTests.csproj", "{277029AF-D9E1-4B75-9F11-48FEA7345AD7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebUI", "src\WebUI\WebUI.csproj", "{22454EE9-16B3-4B7A-8352-37E59B858155}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E2DA20AA-28D1-455C-BF50-C49A8F831633}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -28,6 +26,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		global.json = global.json
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebUI", "src\WebUI\WebUI.csproj", "{D62B82F7-3317-4BB4-85B2-3116C50C7585}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebUI.AcceptanceTests", "tests\WebUI.AcceptanceTests\WebUI.AcceptanceTests.csproj", "{006B607C-D181-47EC-82D7-06582A0F31DE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -58,10 +60,14 @@ Global
 		{277029AF-D9E1-4B75-9F11-48FEA7345AD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{277029AF-D9E1-4B75-9F11-48FEA7345AD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{277029AF-D9E1-4B75-9F11-48FEA7345AD7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{22454EE9-16B3-4B7A-8352-37E59B858155}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22454EE9-16B3-4B7A-8352-37E59B858155}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22454EE9-16B3-4B7A-8352-37E59B858155}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{22454EE9-16B3-4B7A-8352-37E59B858155}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D62B82F7-3317-4BB4-85B2-3116C50C7585}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D62B82F7-3317-4BB4-85B2-3116C50C7585}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D62B82F7-3317-4BB4-85B2-3116C50C7585}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D62B82F7-3317-4BB4-85B2-3116C50C7585}.Release|Any CPU.Build.0 = Release|Any CPU
+		{006B607C-D181-47EC-82D7-06582A0F31DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{006B607C-D181-47EC-82D7-06582A0F31DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{006B607C-D181-47EC-82D7-06582A0F31DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{006B607C-D181-47EC-82D7-06582A0F31DE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -73,7 +79,8 @@ Global
 		{DEFF4009-1FAB-4392-80B6-707E2DC5C00B} = {664D406C-2F83-48F0-BFC3-408D5CB53C65}
 		{DC37FD87-552C-4613-9F16-1537CA522898} = {664D406C-2F83-48F0-BFC3-408D5CB53C65}
 		{277029AF-D9E1-4B75-9F11-48FEA7345AD7} = {664D406C-2F83-48F0-BFC3-408D5CB53C65}
-		{22454EE9-16B3-4B7A-8352-37E59B858155} = {6ED356A7-8B47-4613-AD01-C85CF28491BD}
+		{D62B82F7-3317-4BB4-85B2-3116C50C7585} = {6ED356A7-8B47-4613-AD01-C85CF28491BD}
+		{006B607C-D181-47EC-82D7-06582A0F31DE} = {664D406C-2F83-48F0-BFC3-408D5CB53C65}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3CB609D9-5D54-4C11-A371-DAAC8B74E430}
diff --git a/src/WebUI/ClientApp/src/app/fetch-data/fetch-data.component.ts b/src/WebUI/ClientApp/src/app/fetch-data/fetch-data.component.ts
index 066f406a8..a52d02fb2 100644
--- a/src/WebUI/ClientApp/src/app/fetch-data/fetch-data.component.ts
+++ b/src/WebUI/ClientApp/src/app/fetch-data/fetch-data.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { WeatherForecastClient, WeatherForecast } from '../web-api-client';
+import { WeatherForecastsClient, WeatherForecast } from '../web-api-client';
 
 @Component({
   selector: 'app-fetch-data',
@@ -8,10 +8,10 @@ import { WeatherForecastClient, WeatherForecast } from '../web-api-client';
 export class FetchDataComponent {
   public forecasts: WeatherForecast[] = [];
 
-  constructor(private client: WeatherForecastClient) {
-    client.get().subscribe({
-      next: result => this.forecasts = result,
-      error: error => console.error(error)
-    });
+  constructor(private client: WeatherForecastsClient) {
+      client.getWeatherForecasts().subscribe({
+          next: result => this.forecasts = result,
+          error: error => console.error(error)
+      });
   }
 }
diff --git a/src/WebUI/ClientApp/src/app/nav-menu/nav-menu.component.html b/src/WebUI/ClientApp/src/app/nav-menu/nav-menu.component.html
index 157418080..351e71e19 100644
--- a/src/WebUI/ClientApp/src/app/nav-menu/nav-menu.component.html
+++ b/src/WebUI/ClientApp/src/app/nav-menu/nav-menu.component.html
@@ -1,7 +1,5 @@
 <header>
-  <nav
-    class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3"
-  >
+  <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
     <div class="container">
       <a class="navbar-brand" [routerLink]="['/']">WebUI</a>
       <button
@@ -15,16 +13,12 @@
       >
         <span class="navbar-toggler-icon"></span>
       </button>
-      <div
-        class="navbar-collapse collapse d-sm-inline-flex justify-content-end"
-        [ngClass]="{ show: isExpanded }"
-      >
+      <div class="navbar-collapse collapse d-sm-inline-flex justify-content-end"
+           [ngClass]="{ show: isExpanded }">
         <ul class="navbar-nav flex-grow">
-          <li
-              class="nav-item"
+          <li class="nav-item"
               [routerLinkActive]="['link-active']"
-              [routerLinkActiveOptions]="{ exact: true }"
-              >
+              [routerLinkActiveOptions]="{ exact: true }">
             <a class="nav-link text-dark" [routerLink]="['/']">Home</a>
           </li>
           <li class="nav-item" [routerLinkActive]="['link-active']">
diff --git a/src/WebUI/ClientApp/src/app/todo/todo.component.ts b/src/WebUI/ClientApp/src/app/todo/todo.component.ts
index 0547dc05b..db0d51e0c 100644
--- a/src/WebUI/ClientApp/src/app/todo/todo.component.ts
+++ b/src/WebUI/ClientApp/src/app/todo/todo.component.ts
@@ -32,7 +32,7 @@ export class TodoComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    this.listsClient.get().subscribe(
+    this.listsClient.getTodoLists().subscribe(
       result => {
         this.lists = result.lists;
         this.priorityLevels = result.priorityLevels;
@@ -66,7 +66,7 @@ export class TodoComponent implements OnInit {
       items: []
     } as TodoListDto;
 
-    this.listsClient.create(list as CreateTodoListCommand).subscribe(
+    this.listsClient.createTodoList(list as CreateTodoListCommand).subscribe(
       result => {
         list.id = result;
         this.lists.push(list);
@@ -97,7 +97,7 @@ export class TodoComponent implements OnInit {
 
   updateListOptions() {
     const list = this.listOptionsEditor as UpdateTodoListCommand;
-    this.listsClient.update(this.selectedList.id, list).subscribe(
+    this.listsClient.updateTodoList(this.selectedList.id, list).subscribe(
       () => {
         (this.selectedList.title = this.listOptionsEditor.title),
           this.listOptionsModalRef.hide();
@@ -113,7 +113,7 @@ export class TodoComponent implements OnInit {
   }
 
   deleteListConfirmed(): void {
-    this.listsClient.delete(this.selectedList.id).subscribe(
+    this.listsClient.deleteTodoList(this.selectedList.id).subscribe(
       () => {
         this.deleteListModalRef.hide();
         this.lists = this.lists.filter(t => t.id !== this.selectedList.id);
@@ -186,8 +186,7 @@ export class TodoComponent implements OnInit {
 
     if (item.id === 0) {
       this.itemsClient
-        .create({ title: item.title, listId: this.selectedList.id
-          } as CreateTodoItemCommand)
+          .createTodoItem({ title: item.title, listId: this.selectedList.id } as CreateTodoItemCommand)
         .subscribe(
           result => {
             item.id = result;
@@ -195,7 +194,7 @@ export class TodoComponent implements OnInit {
           error => console.error(error)
         );
     } else {
-      this.itemsClient.update(item.id, item as UpdateTodoItemCommand).subscribe(
+        this.itemsClient.updateTTodoItem(item.id, item as UpdateTodoItemCommand).subscribe(
         () => console.log('Update succeeded.'),
         error => console.error(error)
       );
@@ -217,7 +216,7 @@ export class TodoComponent implements OnInit {
       const itemIndex = this.selectedList.items.indexOf(this.selectedItem);
       this.selectedList.items.splice(itemIndex, 1);
     } else {
-      this.itemsClient.delete(item.id).subscribe(
+      this.itemsClient.deleteTodoItem(item.id).subscribe(
         () =>
           (this.selectedList.items = this.selectedList.items.filter(
             t => t.id !== item.id
diff --git a/src/WebUI/ClientApp/src/app/web-api-client.ts b/src/WebUI/ClientApp/src/app/web-api-client.ts
index f41f9c624..120c74b4d 100644
--- 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.19.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
+//     Generated using the NSwag toolchain v13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
 // </auto-generated>
 //----------------------
 
@@ -15,18 +15,14 @@ import { HttpClient, HttpHeaders, HttpResponse, HttpResponseBase } from '@angula
 
 export const API_BASE_URL = new InjectionToken<string>('API_BASE_URL');
 
-export interface ITodoItemsClient {
-    getTodoItemsWithPagination(listId: number | undefined, pageNumber: number | undefined, pageSize: number | undefined): Observable<PaginatedListOfTodoItemBriefDto>;
-    create(command: CreateTodoItemCommand): Observable<number>;
-    update(id: number, command: UpdateTodoItemCommand): Observable<void>;
-    delete(id: number): Observable<void>;
-    updateItemDetails(id: number | undefined, command: UpdateTodoItemDetailCommand): Observable<void>;
+export interface IWeatherForecastsClient {
+    getWeatherForecasts(): Observable<WeatherForecast[]>;
 }
 
 @Injectable({
     providedIn: 'root'
 })
-export class TodoItemsClient implements ITodoItemsClient {
+export class WeatherForecastsClient implements IWeatherForecastsClient {
     private http: HttpClient;
     private baseUrl: string;
     protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined;
@@ -36,20 +32,8 @@ export class TodoItemsClient implements ITodoItemsClient {
         this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : "";
     }
 
-    getTodoItemsWithPagination(listId: number | undefined, pageNumber: number | undefined, pageSize: number | undefined): Observable<PaginatedListOfTodoItemBriefDto> {
-        let url_ = this.baseUrl + "/api/TodoItems?";
-        if (listId === null)
-            throw new Error("The parameter 'listId' cannot be null.");
-        else if (listId !== undefined)
-            url_ += "ListId=" + encodeURIComponent("" + listId) + "&";
-        if (pageNumber === null)
-            throw new Error("The parameter 'pageNumber' cannot be null.");
-        else if (pageNumber !== undefined)
-            url_ += "PageNumber=" + encodeURIComponent("" + pageNumber) + "&";
-        if (pageSize === null)
-            throw new Error("The parameter 'pageSize' cannot be null.");
-        else if (pageSize !== undefined)
-            url_ += "PageSize=" + encodeURIComponent("" + pageSize) + "&";
+    getWeatherForecasts(): Observable<WeatherForecast[]> {
+        let url_ = this.baseUrl + "/api/WeatherForecasts";
         url_ = url_.replace(/[?&]$/, "");
 
         let options_ : any = {
@@ -61,20 +45,20 @@ export class TodoItemsClient implements ITodoItemsClient {
         };
 
         return this.http.request("get", url_, options_).pipe(_observableMergeMap((response_ : any) => {
-            return this.processGetTodoItemsWithPagination(response_);
+            return this.processGetWeatherForecasts(response_);
         })).pipe(_observableCatch((response_: any) => {
             if (response_ instanceof HttpResponseBase) {
                 try {
-                    return this.processGetTodoItemsWithPagination(response_ as any);
+                    return this.processGetWeatherForecasts(response_ as any);
                 } catch (e) {
-                    return _observableThrow(e) as any as Observable<PaginatedListOfTodoItemBriefDto>;
+                    return _observableThrow(e) as any as Observable<WeatherForecast[]>;
                 }
             } else
-                return _observableThrow(response_) as any as Observable<PaginatedListOfTodoItemBriefDto>;
+                return _observableThrow(response_) as any as Observable<WeatherForecast[]>;
         }));
     }
 
-    protected processGetTodoItemsWithPagination(response: HttpResponseBase): Observable<PaginatedListOfTodoItemBriefDto> {
+    protected processGetWeatherForecasts(response: HttpResponseBase): Observable<WeatherForecast[]> {
         const status = response.status;
         const responseBlob =
             response instanceof HttpResponse ? response.body :
@@ -85,7 +69,14 @@ export class TodoItemsClient implements ITodoItemsClient {
             return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
             let result200: any = null;
             let resultData200 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
-            result200 = PaginatedListOfTodoItemBriefDto.fromJS(resultData200);
+            if (Array.isArray(resultData200)) {
+                result200 = [] as any;
+                for (let item of resultData200)
+                    result200!.push(WeatherForecast.fromJS(item));
+            }
+            else {
+                result200 = <any>null;
+            }
             return _observableOf(result200);
             }));
         } else if (status !== 200 && status !== 204) {
@@ -95,9 +86,31 @@ export class TodoItemsClient implements ITodoItemsClient {
         }
         return _observableOf(null as any);
     }
+}
 
-    create(command: CreateTodoItemCommand): Observable<number> {
-        let url_ = this.baseUrl + "/api/TodoItems";
+export interface ITodoListsClient {
+    createTodoList(command: CreateTodoListCommand): Observable<number>;
+    getTodoLists(): Observable<TodosVm>;
+    deleteTodoList(id: number): Observable<void>;
+    updateTodoList(id: number, command: UpdateTodoListCommand): Observable<void>;
+    exportTodos(id: number): Observable<void>;
+}
+
+@Injectable({
+    providedIn: 'root'
+})
+export class TodoListsClient implements ITodoListsClient {
+    private http: HttpClient;
+    private baseUrl: string;
+    protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined;
+
+    constructor(@Inject(HttpClient) http: HttpClient, @Optional() @Inject(API_BASE_URL) baseUrl?: string) {
+        this.http = http;
+        this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : "";
+    }
+
+    createTodoList(command: CreateTodoListCommand): Observable<number> {
+        let url_ = this.baseUrl + "/api/TodoLists";
         url_ = url_.replace(/[?&]$/, "");
 
         const content_ = JSON.stringify(command);
@@ -113,11 +126,11 @@ export class TodoItemsClient implements ITodoItemsClient {
         };
 
         return this.http.request("post", url_, options_).pipe(_observableMergeMap((response_ : any) => {
-            return this.processCreate(response_);
+            return this.processCreateTodoList(response_);
         })).pipe(_observableCatch((response_: any) => {
             if (response_ instanceof HttpResponseBase) {
                 try {
-                    return this.processCreate(response_ as any);
+                    return this.processCreateTodoList(response_ as any);
                 } catch (e) {
                     return _observableThrow(e) as any as Observable<number>;
                 }
@@ -126,7 +139,7 @@ export class TodoItemsClient implements ITodoItemsClient {
         }));
     }
 
-    protected processCreate(response: HttpResponseBase): Observable<number> {
+    protected processCreateTodoList(response: HttpResponseBase): Observable<number> {
         const status = response.status;
         const responseBlob =
             response instanceof HttpResponse ? response.body :
@@ -149,46 +162,47 @@ export class TodoItemsClient implements ITodoItemsClient {
         return _observableOf(null as any);
     }
 
-    update(id: number, command: UpdateTodoItemCommand): Observable<void> {
-        let url_ = this.baseUrl + "/api/TodoItems/{id}";
-        if (id === undefined || id === null)
-            throw new Error("The parameter 'id' must be defined.");
-        url_ = url_.replace("{id}", encodeURIComponent("" + id));
+    getTodoLists(): Observable<TodosVm> {
+        let url_ = this.baseUrl + "/api/TodoLists";
         url_ = url_.replace(/[?&]$/, "");
 
-        const content_ = JSON.stringify(command);
-
         let options_ : any = {
-            body: content_,
             observe: "response",
             responseType: "blob",
             headers: new HttpHeaders({
-                "Content-Type": "application/json",
+                "Accept": "application/json"
             })
         };
 
-        return this.http.request("put", url_, options_).pipe(_observableMergeMap((response_ : any) => {
-            return this.processUpdate(response_);
+        return this.http.request("get", url_, options_).pipe(_observableMergeMap((response_ : any) => {
+            return this.processGetTodoLists(response_);
         })).pipe(_observableCatch((response_: any) => {
             if (response_ instanceof HttpResponseBase) {
                 try {
-                    return this.processUpdate(response_ as any);
+                    return this.processGetTodoLists(response_ as any);
                 } catch (e) {
-                    return _observableThrow(e) as any as Observable<void>;
+                    return _observableThrow(e) as any as Observable<TodosVm>;
                 }
             } else
-                return _observableThrow(response_) as any as Observable<void>;
+                return _observableThrow(response_) as any as Observable<TodosVm>;
         }));
     }
 
-    protected processUpdate(response: HttpResponseBase): Observable<void> {
+    protected processGetTodoLists(response: HttpResponseBase): Observable<TodosVm> {
         const status = response.status;
         const responseBlob =
             response instanceof HttpResponse ? response.body :
             (response as any).error instanceof Blob ? (response as any).error : undefined;
 
         let _headers: any = {}; if (response.headers) { for (let key of response.headers.keys()) { _headers[key] = response.headers.get(key); }}
-        if (status === 204) {
+        if (status === 200) {
+            return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
+            let result200: any = null;
+            let resultData200 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
+            result200 = TodosVm.fromJS(resultData200);
+            return _observableOf(result200);
+            }));
+        } else if (status !== 200 && status !== 204) {
             return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
             return _observableOf(null as any);
             }));
@@ -209,8 +223,8 @@ export class TodoItemsClient implements ITodoItemsClient {
         }
     }
 
-    delete(id: number): Observable<void> {
-        let url_ = this.baseUrl + "/api/TodoItems/{id}";
+    deleteTodoList(id: number): Observable<void> {
+        let url_ = this.baseUrl + "/api/TodoLists/{id}";
         if (id === undefined || id === null)
             throw new Error("The parameter 'id' must be defined.");
         url_ = url_.replace("{id}", encodeURIComponent("" + id));
@@ -224,11 +238,11 @@ export class TodoItemsClient implements ITodoItemsClient {
         };
 
         return this.http.request("delete", url_, options_).pipe(_observableMergeMap((response_ : any) => {
-            return this.processDelete(response_);
+            return this.processDeleteTodoList(response_);
         })).pipe(_observableCatch((response_: any) => {
             if (response_ instanceof HttpResponseBase) {
                 try {
-                    return this.processDelete(response_ as any);
+                    return this.processDeleteTodoList(response_ as any);
                 } catch (e) {
                     return _observableThrow(e) as any as Observable<void>;
                 }
@@ -237,14 +251,18 @@ export class TodoItemsClient implements ITodoItemsClient {
         }));
     }
 
-    protected processDelete(response: HttpResponseBase): Observable<void> {
+    protected processDeleteTodoList(response: HttpResponseBase): Observable<void> {
         const status = response.status;
         const responseBlob =
             response instanceof HttpResponse ? response.body :
             (response as any).error instanceof Blob ? (response as any).error : undefined;
 
         let _headers: any = {}; if (response.headers) { for (let key of response.headers.keys()) { _headers[key] = response.headers.get(key); }}
-        if (status === 204) {
+        if (status === 200) {
+            return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
+            return _observableOf(null as any);
+            }));
+        } else if (status !== 200 && status !== 204) {
             return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
             return _observableOf(null as any);
             }));
@@ -258,12 +276,11 @@ export class TodoItemsClient implements ITodoItemsClient {
         }
     }
 
-    updateItemDetails(id: number | undefined, command: UpdateTodoItemDetailCommand): Observable<void> {
-        let url_ = this.baseUrl + "/api/TodoItems/UpdateItemDetails?";
-        if (id === null)
-            throw new Error("The parameter 'id' cannot be null.");
-        else if (id !== undefined)
-            url_ += "id=" + encodeURIComponent("" + id) + "&";
+    updateTodoList(id: number, command: UpdateTodoListCommand): Observable<void> {
+        let url_ = this.baseUrl + "/api/TodoLists/{id}";
+        if (id === undefined || id === null)
+            throw new Error("The parameter 'id' must be defined.");
+        url_ = url_.replace("{id}", encodeURIComponent("" + id));
         url_ = url_.replace(/[?&]$/, "");
 
         const content_ = JSON.stringify(command);
@@ -278,11 +295,11 @@ export class TodoItemsClient implements ITodoItemsClient {
         };
 
         return this.http.request("put", url_, options_).pipe(_observableMergeMap((response_ : any) => {
-            return this.processUpdateItemDetails(response_);
+            return this.processUpdateTodoList(response_);
         })).pipe(_observableCatch((response_: any) => {
             if (response_ instanceof HttpResponseBase) {
                 try {
-                    return this.processUpdateItemDetails(response_ as any);
+                    return this.processUpdateTodoList(response_ as any);
                 } catch (e) {
                     return _observableThrow(e) as any as Observable<void>;
                 }
@@ -291,14 +308,18 @@ export class TodoItemsClient implements ITodoItemsClient {
         }));
     }
 
-    protected processUpdateItemDetails(response: HttpResponseBase): Observable<void> {
+    protected processUpdateTodoList(response: HttpResponseBase): Observable<void> {
         const status = response.status;
         const responseBlob =
             response instanceof HttpResponse ? response.body :
             (response as any).error instanceof Blob ? (response as any).error : undefined;
 
         let _headers: any = {}; if (response.headers) { for (let key of response.headers.keys()) { _headers[key] = response.headers.get(key); }}
-        if (status === 204) {
+        if (status === 200) {
+            return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
+            return _observableOf(null as any);
+            }));
+        } else if (status !== 200 && status !== 204) {
             return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
             return _observableOf(null as any);
             }));
@@ -318,56 +339,36 @@ export class TodoItemsClient implements ITodoItemsClient {
             }));
         }
     }
-}
-
-export interface ITodoListsClient {
-    get(): Observable<TodosVm>;
-    create(command: CreateTodoListCommand): Observable<number>;
-    get2(id: number): Observable<FileResponse>;
-    update(id: number, command: UpdateTodoListCommand): Observable<void>;
-    delete(id: number): Observable<void>;
-}
-
-@Injectable({
-    providedIn: 'root'
-})
-export class TodoListsClient implements ITodoListsClient {
-    private http: HttpClient;
-    private baseUrl: string;
-    protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined;
-
-    constructor(@Inject(HttpClient) http: HttpClient, @Optional() @Inject(API_BASE_URL) baseUrl?: string) {
-        this.http = http;
-        this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : "";
-    }
 
-    get(): Observable<TodosVm> {
-        let url_ = this.baseUrl + "/api/TodoLists";
+    exportTodos(id: number): Observable<void> {
+        let url_ = this.baseUrl + "/api/TodoLists/Export/{id}";
+        if (id === undefined || id === null)
+            throw new Error("The parameter 'id' must be defined.");
+        url_ = url_.replace("{id}", encodeURIComponent("" + id));
         url_ = url_.replace(/[?&]$/, "");
 
         let options_ : any = {
             observe: "response",
             responseType: "blob",
             headers: new HttpHeaders({
-                "Accept": "application/json"
             })
         };
 
         return this.http.request("get", url_, options_).pipe(_observableMergeMap((response_ : any) => {
-            return this.processGet(response_);
+            return this.processExportTodos(response_);
         })).pipe(_observableCatch((response_: any) => {
             if (response_ instanceof HttpResponseBase) {
                 try {
-                    return this.processGet(response_ as any);
+                    return this.processExportTodos(response_ as any);
                 } catch (e) {
-                    return _observableThrow(e) as any as Observable<TodosVm>;
+                    return _observableThrow(e) as any as Observable<void>;
                 }
             } else
-                return _observableThrow(response_) as any as Observable<TodosVm>;
+                return _observableThrow(response_) as any as Observable<void>;
         }));
     }
 
-    protected processGet(response: HttpResponseBase): Observable<TodosVm> {
+    protected processExportTodos(response: HttpResponseBase): Observable<void> {
         const status = response.status;
         const responseBlob =
             response instanceof HttpResponse ? response.body :
@@ -376,10 +377,7 @@ export class TodoListsClient implements ITodoListsClient {
         let _headers: any = {}; if (response.headers) { for (let key of response.headers.keys()) { _headers[key] = response.headers.get(key); }}
         if (status === 200) {
             return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
-            let result200: any = null;
-            let resultData200 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
-            result200 = TodosVm.fromJS(resultData200);
-            return _observableOf(result200);
+            return _observableOf(null as any);
             }));
         } else if (status !== 200 && status !== 204) {
             return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
@@ -388,9 +386,30 @@ export class TodoListsClient implements ITodoListsClient {
         }
         return _observableOf(null as any);
     }
+}
 
-    create(command: CreateTodoListCommand): Observable<number> {
-        let url_ = this.baseUrl + "/api/TodoLists";
+export interface ITodoItemsClient {
+    createTodoItem(command: CreateTodoItemCommand): Observable<number>;
+    deleteTodoItem(id: number): Observable<void>;
+    updateTodoItem(id: number, command: UpdateTodoItemCommand): Observable<void>;
+    updateTodoItemDetail(id: number, command: UpdateTodoItemDetailCommand): Observable<void>;
+}
+
+@Injectable({
+    providedIn: 'root'
+})
+export class TodoItemsClient implements ITodoItemsClient {
+    private http: HttpClient;
+    private baseUrl: string;
+    protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined;
+
+    constructor(@Inject(HttpClient) http: HttpClient, @Optional() @Inject(API_BASE_URL) baseUrl?: string) {
+        this.http = http;
+        this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : "";
+    }
+
+    createTodoItem(command: CreateTodoItemCommand): Observable<number> {
+        let url_ = this.baseUrl + "/api/TodoItems";
         url_ = url_.replace(/[?&]$/, "");
 
         const content_ = JSON.stringify(command);
@@ -406,11 +425,11 @@ export class TodoListsClient implements ITodoListsClient {
         };
 
         return this.http.request("post", url_, options_).pipe(_observableMergeMap((response_ : any) => {
-            return this.processCreate(response_);
+            return this.processCreateTodoItem(response_);
         })).pipe(_observableCatch((response_: any) => {
             if (response_ instanceof HttpResponseBase) {
                 try {
-                    return this.processCreate(response_ as any);
+                    return this.processCreateTodoItem(response_ as any);
                 } catch (e) {
                     return _observableThrow(e) as any as Observable<number>;
                 }
@@ -419,7 +438,7 @@ export class TodoListsClient implements ITodoListsClient {
         }));
     }
 
-    protected processCreate(response: HttpResponseBase): Observable<number> {
+    protected processCreateTodoItem(response: HttpResponseBase): Observable<number> {
         const status = response.status;
         const responseBlob =
             response instanceof HttpResponse ? response.body :
@@ -442,8 +461,8 @@ export class TodoListsClient implements ITodoListsClient {
         return _observableOf(null as any);
     }
 
-    get2(id: number): Observable<FileResponse> {
-        let url_ = this.baseUrl + "/api/TodoLists/{id}";
+    deleteTodoItem(id: number): Observable<void> {
+        let url_ = this.baseUrl + "/api/TodoItems/{id}";
         if (id === undefined || id === null)
             throw new Error("The parameter 'id' must be defined.");
         url_ = url_.replace("{id}", encodeURIComponent("" + id));
@@ -453,42 +472,34 @@ export class TodoListsClient implements ITodoListsClient {
             observe: "response",
             responseType: "blob",
             headers: new HttpHeaders({
-                "Accept": "application/octet-stream"
             })
         };
 
-        return this.http.request("get", url_, options_).pipe(_observableMergeMap((response_ : any) => {
-            return this.processGet2(response_);
+        return this.http.request("delete", url_, options_).pipe(_observableMergeMap((response_ : any) => {
+            return this.processDeleteTodoItem(response_);
         })).pipe(_observableCatch((response_: any) => {
             if (response_ instanceof HttpResponseBase) {
                 try {
-                    return this.processGet2(response_ as any);
+                    return this.processDeleteTodoItem(response_ as any);
                 } catch (e) {
-                    return _observableThrow(e) as any as Observable<FileResponse>;
+                    return _observableThrow(e) as any as Observable<void>;
                 }
             } else
-                return _observableThrow(response_) as any as Observable<FileResponse>;
+                return _observableThrow(response_) as any as Observable<void>;
         }));
     }
 
-    protected processGet2(response: HttpResponseBase): Observable<FileResponse> {
+    protected processDeleteTodoItem(response: HttpResponseBase): Observable<void> {
         const status = response.status;
         const responseBlob =
             response instanceof HttpResponse ? response.body :
             (response as any).error instanceof Blob ? (response as any).error : undefined;
 
         let _headers: any = {}; if (response.headers) { for (let key of response.headers.keys()) { _headers[key] = response.headers.get(key); }}
-        if (status === 200 || status === 206) {
-            const contentDisposition = response.headers ? response.headers.get("content-disposition") : undefined;
-            let fileNameMatch = contentDisposition ? /filename\*=(?:(\\?['"])(.*?)\1|(?:[^\s]+'.*?')?([^;\n]*))/g.exec(contentDisposition) : undefined;
-            let fileName = fileNameMatch && fileNameMatch.length > 1 ? fileNameMatch[3] || fileNameMatch[2] : undefined;
-            if (fileName) {
-                fileName = decodeURIComponent(fileName);
-            } else {
-                fileNameMatch = contentDisposition ? /filename="?([^"]*?)"?(;|$)/g.exec(contentDisposition) : undefined;
-                fileName = fileNameMatch && fileNameMatch.length > 1 ? fileNameMatch[1] : undefined;
-            }
-            return _observableOf({ fileName: fileName, data: responseBlob as any, status: status, headers: _headers });
+        if (status === 200) {
+            return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
+            return _observableOf(null as any);
+            }));
         } else if (status !== 200 && status !== 204) {
             return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
             return throwException("An unexpected server error occurred.", status, _responseText, _headers);
@@ -497,8 +508,8 @@ export class TodoListsClient implements ITodoListsClient {
         return _observableOf(null as any);
     }
 
-    update(id: number, command: UpdateTodoListCommand): Observable<void> {
-        let url_ = this.baseUrl + "/api/TodoLists/{id}";
+    updateTodoItem(id: number, command: UpdateTodoItemCommand): Observable<void> {
+        let url_ = this.baseUrl + "/api/TodoItems/{id}";
         if (id === undefined || id === null)
             throw new Error("The parameter 'id' must be defined.");
         url_ = url_.replace("{id}", encodeURIComponent("" + id));
@@ -516,11 +527,11 @@ export class TodoListsClient implements ITodoListsClient {
         };
 
         return this.http.request("put", url_, options_).pipe(_observableMergeMap((response_ : any) => {
-            return this.processUpdate(response_);
+            return this.processUpdateTodoItem(response_);
         })).pipe(_observableCatch((response_: any) => {
             if (response_ instanceof HttpResponseBase) {
                 try {
-                    return this.processUpdate(response_ as any);
+                    return this.processUpdateTodoItem(response_ as any);
                 } catch (e) {
                     return _observableThrow(e) as any as Observable<void>;
                 }
@@ -529,25 +540,18 @@ export class TodoListsClient implements ITodoListsClient {
         }));
     }
 
-    protected processUpdate(response: HttpResponseBase): Observable<void> {
+    protected processUpdateTodoItem(response: HttpResponseBase): Observable<void> {
         const status = response.status;
         const responseBlob =
             response instanceof HttpResponse ? response.body :
             (response as any).error instanceof Blob ? (response as any).error : undefined;
 
         let _headers: any = {}; if (response.headers) { for (let key of response.headers.keys()) { _headers[key] = response.headers.get(key); }}
-        if (status === 204) {
+        if (status === 200) {
             return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
             return _observableOf(null as any);
             }));
-        } else if (status === 400) {
-            return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
-            let result400: any = null;
-            let resultData400 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
-            result400 = ProblemDetails.fromJS(resultData400);
-            return throwException("A server side error occurred.", status, _responseText, _headers, result400);
-            }));
-        } else {
+        } else if (status !== 200 && status !== 204) {
             return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
             let resultdefault: any = null;
             let resultDatadefault = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
@@ -557,26 +561,30 @@ export class TodoListsClient implements ITodoListsClient {
         }
     }
 
-    delete(id: number): Observable<void> {
-        let url_ = this.baseUrl + "/api/TodoLists/{id}";
+    updateTodoItemDetail(id: number, command: UpdateTodoItemDetailCommand): Observable<void> {
+        let url_ = this.baseUrl + "/api/TodoItems/UpdateDetail/{id}";
         if (id === undefined || id === null)
             throw new Error("The parameter 'id' must be defined.");
         url_ = url_.replace("{id}", encodeURIComponent("" + id));
         url_ = url_.replace(/[?&]$/, "");
 
+        const content_ = JSON.stringify(command);
+
         let options_ : any = {
+            body: content_,
             observe: "response",
             responseType: "blob",
             headers: new HttpHeaders({
+                "Content-Type": "application/json",
             })
         };
 
-        return this.http.request("delete", url_, options_).pipe(_observableMergeMap((response_ : any) => {
-            return this.processDelete(response_);
+        return this.http.request("put", url_, options_).pipe(_observableMergeMap((response_ : any) => {
+            return this.processUpdateTodoItemDetail(response_);
         })).pipe(_observableCatch((response_: any) => {
             if (response_ instanceof HttpResponseBase) {
                 try {
-                    return this.processDelete(response_ as any);
+                    return this.processUpdateTodoItemDetail(response_ as any);
                 } catch (e) {
                     return _observableThrow(e) as any as Observable<void>;
                 }
@@ -585,72 +593,7 @@ export class TodoListsClient implements ITodoListsClient {
         }));
     }
 
-    protected processDelete(response: HttpResponseBase): Observable<void> {
-        const status = response.status;
-        const responseBlob =
-            response instanceof HttpResponse ? response.body :
-            (response as any).error instanceof Blob ? (response as any).error : undefined;
-
-        let _headers: any = {}; if (response.headers) { for (let key of response.headers.keys()) { _headers[key] = response.headers.get(key); }}
-        if (status === 204) {
-            return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
-            return _observableOf(null as any);
-            }));
-        } else {
-            return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
-            let resultdefault: any = null;
-            let resultDatadefault = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
-            resultdefault = ProblemDetails.fromJS(resultDatadefault);
-            return throwException("A server side error occurred.", status, _responseText, _headers, resultdefault);
-            }));
-        }
-    }
-}
-
-export interface IWeatherForecastClient {
-    get(): Observable<WeatherForecast[]>;
-}
-
-@Injectable({
-    providedIn: 'root'
-})
-export class WeatherForecastClient implements IWeatherForecastClient {
-    private http: HttpClient;
-    private baseUrl: string;
-    protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined;
-
-    constructor(@Inject(HttpClient) http: HttpClient, @Optional() @Inject(API_BASE_URL) baseUrl?: string) {
-        this.http = http;
-        this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : "";
-    }
-
-    get(): Observable<WeatherForecast[]> {
-        let url_ = this.baseUrl + "/api/WeatherForecast";
-        url_ = url_.replace(/[?&]$/, "");
-
-        let options_ : any = {
-            observe: "response",
-            responseType: "blob",
-            headers: new HttpHeaders({
-                "Accept": "application/json"
-            })
-        };
-
-        return this.http.request("get", url_, options_).pipe(_observableMergeMap((response_ : any) => {
-            return this.processGet(response_);
-        })).pipe(_observableCatch((response_: any) => {
-            if (response_ instanceof HttpResponseBase) {
-                try {
-                    return this.processGet(response_ as any);
-                } catch (e) {
-                    return _observableThrow(e) as any as Observable<WeatherForecast[]>;
-                }
-            } else
-                return _observableThrow(response_) as any as Observable<WeatherForecast[]>;
-        }));
-    }
-
-    protected processGet(response: HttpResponseBase): Observable<WeatherForecast[]> {
+    protected processUpdateTodoItemDetail(response: HttpResponseBase): Observable<void> {
         const status = response.status;
         const responseBlob =
             response instanceof HttpResponse ? response.body :
@@ -659,17 +602,7 @@ export class WeatherForecastClient implements IWeatherForecastClient {
         let _headers: any = {}; if (response.headers) { for (let key of response.headers.keys()) { _headers[key] = response.headers.get(key); }}
         if (status === 200) {
             return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
-            let result200: any = null;
-            let resultData200 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
-            if (Array.isArray(resultData200)) {
-                result200 = [] as any;
-                for (let item of resultData200)
-                    result200!.push(WeatherForecast.fromJS(item));
-            }
-            else {
-                result200 = <any>null;
-            }
-            return _observableOf(result200);
+            return _observableOf(null as any);
             }));
         } else if (status !== 200 && status !== 204) {
             return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
@@ -680,15 +613,13 @@ export class WeatherForecastClient implements IWeatherForecastClient {
     }
 }
 
-export class PaginatedListOfTodoItemBriefDto implements IPaginatedListOfTodoItemBriefDto {
-    items?: TodoItemBriefDto[];
-    pageNumber?: number;
-    totalPages?: number;
-    totalCount?: number;
-    hasPreviousPage?: boolean;
-    hasNextPage?: boolean;
+export class WeatherForecast implements IWeatherForecast {
+    date?: Date;
+    temperatureC?: number;
+    temperatureF?: number;
+    summary?: string | undefined;
 
-    constructor(data?: IPaginatedListOfTodoItemBriefDto) {
+    constructor(data?: IWeatherForecast) {
         if (data) {
             for (var property in data) {
                 if (data.hasOwnProperty(property))
@@ -699,58 +630,41 @@ export class PaginatedListOfTodoItemBriefDto implements IPaginatedListOfTodoItem
 
     init(_data?: any) {
         if (_data) {
-            if (Array.isArray(_data["items"])) {
-                this.items = [] as any;
-                for (let item of _data["items"])
-                    this.items!.push(TodoItemBriefDto.fromJS(item));
-            }
-            this.pageNumber = _data["pageNumber"];
-            this.totalPages = _data["totalPages"];
-            this.totalCount = _data["totalCount"];
-            this.hasPreviousPage = _data["hasPreviousPage"];
-            this.hasNextPage = _data["hasNextPage"];
+            this.date = _data["date"] ? new Date(_data["date"].toString()) : <any>undefined;
+            this.temperatureC = _data["temperatureC"];
+            this.temperatureF = _data["temperatureF"];
+            this.summary = _data["summary"];
         }
     }
 
-    static fromJS(data: any): PaginatedListOfTodoItemBriefDto {
+    static fromJS(data: any): WeatherForecast {
         data = typeof data === 'object' ? data : {};
-        let result = new PaginatedListOfTodoItemBriefDto();
+        let result = new WeatherForecast();
         result.init(data);
         return result;
     }
 
     toJSON(data?: any) {
         data = typeof data === 'object' ? data : {};
-        if (Array.isArray(this.items)) {
-            data["items"] = [];
-            for (let item of this.items)
-                data["items"].push(item.toJSON());
-        }
-        data["pageNumber"] = this.pageNumber;
-        data["totalPages"] = this.totalPages;
-        data["totalCount"] = this.totalCount;
-        data["hasPreviousPage"] = this.hasPreviousPage;
-        data["hasNextPage"] = this.hasNextPage;
+        data["date"] = this.date ? this.date.toISOString() : <any>undefined;
+        data["temperatureC"] = this.temperatureC;
+        data["temperatureF"] = this.temperatureF;
+        data["summary"] = this.summary;
         return data;
     }
 }
 
-export interface IPaginatedListOfTodoItemBriefDto {
-    items?: TodoItemBriefDto[];
-    pageNumber?: number;
-    totalPages?: number;
-    totalCount?: number;
-    hasPreviousPage?: boolean;
-    hasNextPage?: boolean;
+export interface IWeatherForecast {
+    date?: Date;
+    temperatureC?: number;
+    temperatureF?: number;
+    summary?: string | undefined;
 }
 
-export class TodoItemBriefDto implements ITodoItemBriefDto {
-    id?: number;
-    listId?: number;
+export class CreateTodoListCommand implements ICreateTodoListCommand {
     title?: string | undefined;
-    done?: boolean;
 
-    constructor(data?: ITodoItemBriefDto) {
+    constructor(data?: ICreateTodoListCommand) {
         if (data) {
             for (var property in data) {
                 if (data.hasOwnProperty(property))
@@ -761,238 +675,26 @@ export class TodoItemBriefDto implements ITodoItemBriefDto {
 
     init(_data?: any) {
         if (_data) {
-            this.id = _data["id"];
-            this.listId = _data["listId"];
             this.title = _data["title"];
-            this.done = _data["done"];
-        }
-    }
-
-    static fromJS(data: any): TodoItemBriefDto {
-        data = typeof data === 'object' ? data : {};
-        let result = new TodoItemBriefDto();
-        result.init(data);
-        return result;
-    }
-
-    toJSON(data?: any) {
-        data = typeof data === 'object' ? data : {};
-        data["id"] = this.id;
-        data["listId"] = this.listId;
-        data["title"] = this.title;
-        data["done"] = this.done;
-        return data;
-    }
-}
-
-export interface ITodoItemBriefDto {
-    id?: number;
-    listId?: number;
-    title?: string | undefined;
-    done?: boolean;
-}
-
-export class CreateTodoItemCommand implements ICreateTodoItemCommand {
-    listId?: number;
-    title?: string | undefined;
-
-    constructor(data?: ICreateTodoItemCommand) {
-        if (data) {
-            for (var property in data) {
-                if (data.hasOwnProperty(property))
-                    (<any>this)[property] = (<any>data)[property];
-            }
-        }
-    }
-
-    init(_data?: any) {
-        if (_data) {
-            this.listId = _data["listId"];
-            this.title = _data["title"];
-        }
-    }
-
-    static fromJS(data: any): CreateTodoItemCommand {
-        data = typeof data === 'object' ? data : {};
-        let result = new CreateTodoItemCommand();
-        result.init(data);
-        return result;
-    }
-
-    toJSON(data?: any) {
-        data = typeof data === 'object' ? data : {};
-        data["listId"] = this.listId;
-        data["title"] = this.title;
-        return data;
-    }
-}
-
-export interface ICreateTodoItemCommand {
-    listId?: number;
-    title?: string | undefined;
-}
-
-export class ProblemDetails implements IProblemDetails {
-    type?: string | undefined;
-    title?: string | undefined;
-    status?: number | undefined;
-    detail?: string | undefined;
-    instance?: string | undefined;
-
-    [key: string]: any;
-
-    constructor(data?: IProblemDetails) {
-        if (data) {
-            for (var property in data) {
-                if (data.hasOwnProperty(property))
-                    (<any>this)[property] = (<any>data)[property];
-            }
-        }
-    }
-
-    init(_data?: any) {
-        if (_data) {
-            for (var property in _data) {
-                if (_data.hasOwnProperty(property))
-                    this[property] = _data[property];
-            }
-            this.type = _data["type"];
-            this.title = _data["title"];
-            this.status = _data["status"];
-            this.detail = _data["detail"];
-            this.instance = _data["instance"];
-        }
-    }
-
-    static fromJS(data: any): ProblemDetails {
-        data = typeof data === 'object' ? data : {};
-        let result = new ProblemDetails();
-        result.init(data);
-        return result;
-    }
-
-    toJSON(data?: any) {
-        data = typeof data === 'object' ? data : {};
-        for (var property in this) {
-            if (this.hasOwnProperty(property))
-                data[property] = this[property];
-        }
-        data["type"] = this.type;
-        data["title"] = this.title;
-        data["status"] = this.status;
-        data["detail"] = this.detail;
-        data["instance"] = this.instance;
-        return data;
-    }
-}
-
-export interface IProblemDetails {
-    type?: string | undefined;
-    title?: string | undefined;
-    status?: number | undefined;
-    detail?: string | undefined;
-    instance?: string | undefined;
-
-    [key: string]: any;
-}
-
-export class UpdateTodoItemCommand implements IUpdateTodoItemCommand {
-    id?: number;
-    title?: string | undefined;
-    done?: boolean;
-
-    constructor(data?: IUpdateTodoItemCommand) {
-        if (data) {
-            for (var property in data) {
-                if (data.hasOwnProperty(property))
-                    (<any>this)[property] = (<any>data)[property];
-            }
         }
     }
 
-    init(_data?: any) {
-        if (_data) {
-            this.id = _data["id"];
-            this.title = _data["title"];
-            this.done = _data["done"];
-        }
-    }
-
-    static fromJS(data: any): UpdateTodoItemCommand {
+    static fromJS(data: any): CreateTodoListCommand {
         data = typeof data === 'object' ? data : {};
-        let result = new UpdateTodoItemCommand();
+        let result = new CreateTodoListCommand();
         result.init(data);
         return result;
     }
 
     toJSON(data?: any) {
         data = typeof data === 'object' ? data : {};
-        data["id"] = this.id;
         data["title"] = this.title;
-        data["done"] = this.done;
         return data;
     }
 }
 
-export interface IUpdateTodoItemCommand {
-    id?: number;
+export interface ICreateTodoListCommand {
     title?: string | undefined;
-    done?: boolean;
-}
-
-export class UpdateTodoItemDetailCommand implements IUpdateTodoItemDetailCommand {
-    id?: number;
-    listId?: number;
-    priority?: PriorityLevel;
-    note?: string | undefined;
-
-    constructor(data?: IUpdateTodoItemDetailCommand) {
-        if (data) {
-            for (var property in data) {
-                if (data.hasOwnProperty(property))
-                    (<any>this)[property] = (<any>data)[property];
-            }
-        }
-    }
-
-    init(_data?: any) {
-        if (_data) {
-            this.id = _data["id"];
-            this.listId = _data["listId"];
-            this.priority = _data["priority"];
-            this.note = _data["note"];
-        }
-    }
-
-    static fromJS(data: any): UpdateTodoItemDetailCommand {
-        data = typeof data === 'object' ? data : {};
-        let result = new UpdateTodoItemDetailCommand();
-        result.init(data);
-        return result;
-    }
-
-    toJSON(data?: any) {
-        data = typeof data === 'object' ? data : {};
-        data["id"] = this.id;
-        data["listId"] = this.listId;
-        data["priority"] = this.priority;
-        data["note"] = this.note;
-        return data;
-    }
-}
-
-export interface IUpdateTodoItemDetailCommand {
-    id?: number;
-    listId?: number;
-    priority?: PriorityLevel;
-    note?: string | undefined;
-}
-
-export enum PriorityLevel {
-    None = 0,
-    Low = 1,
-    Medium = 2,
-    High = 3,
 }
 
 export class TodosVm implements ITodosVm {
@@ -1203,10 +905,11 @@ export interface ITodoItemDto {
     note?: string | undefined;
 }
 
-export class CreateTodoListCommand implements ICreateTodoListCommand {
+export class UpdateTodoListCommand implements IUpdateTodoListCommand {
+    id?: number;
     title?: string | undefined;
 
-    constructor(data?: ICreateTodoListCommand) {
+    constructor(data?: IUpdateTodoListCommand) {
         if (data) {
             for (var property in data) {
                 if (data.hasOwnProperty(property))
@@ -1217,33 +920,77 @@ export class CreateTodoListCommand implements ICreateTodoListCommand {
 
     init(_data?: any) {
         if (_data) {
+            this.id = _data["id"];
             this.title = _data["title"];
         }
     }
 
-    static fromJS(data: any): CreateTodoListCommand {
+    static fromJS(data: any): UpdateTodoListCommand {
         data = typeof data === 'object' ? data : {};
-        let result = new CreateTodoListCommand();
+        let result = new UpdateTodoListCommand();
         result.init(data);
         return result;
     }
 
     toJSON(data?: any) {
         data = typeof data === 'object' ? data : {};
+        data["id"] = this.id;
         data["title"] = this.title;
         return data;
     }
 }
 
-export interface ICreateTodoListCommand {
+export interface IUpdateTodoListCommand {
+    id?: number;
     title?: string | undefined;
 }
 
-export class UpdateTodoListCommand implements IUpdateTodoListCommand {
+export class CreateTodoItemCommand implements ICreateTodoItemCommand {
+    listId?: number;
+    title?: string | undefined;
+
+    constructor(data?: ICreateTodoItemCommand) {
+        if (data) {
+            for (var property in data) {
+                if (data.hasOwnProperty(property))
+                    (<any>this)[property] = (<any>data)[property];
+            }
+        }
+    }
+
+    init(_data?: any) {
+        if (_data) {
+            this.listId = _data["listId"];
+            this.title = _data["title"];
+        }
+    }
+
+    static fromJS(data: any): CreateTodoItemCommand {
+        data = typeof data === 'object' ? data : {};
+        let result = new CreateTodoItemCommand();
+        result.init(data);
+        return result;
+    }
+
+    toJSON(data?: any) {
+        data = typeof data === 'object' ? data : {};
+        data["listId"] = this.listId;
+        data["title"] = this.title;
+        return data;
+    }
+}
+
+export interface ICreateTodoItemCommand {
+    listId?: number;
+    title?: string | undefined;
+}
+
+export class UpdateTodoItemCommand implements IUpdateTodoItemCommand {
     id?: number;
     title?: string | undefined;
+    done?: boolean;
 
-    constructor(data?: IUpdateTodoListCommand) {
+    constructor(data?: IUpdateTodoItemCommand) {
         if (data) {
             for (var property in data) {
                 if (data.hasOwnProperty(property))
@@ -1256,12 +1003,13 @@ export class UpdateTodoListCommand implements IUpdateTodoListCommand {
         if (_data) {
             this.id = _data["id"];
             this.title = _data["title"];
+            this.done = _data["done"];
         }
     }
 
-    static fromJS(data: any): UpdateTodoListCommand {
+    static fromJS(data: any): UpdateTodoItemCommand {
         data = typeof data === 'object' ? data : {};
-        let result = new UpdateTodoListCommand();
+        let result = new UpdateTodoItemCommand();
         result.init(data);
         return result;
     }
@@ -1270,22 +1018,24 @@ export class UpdateTodoListCommand implements IUpdateTodoListCommand {
         data = typeof data === 'object' ? data : {};
         data["id"] = this.id;
         data["title"] = this.title;
+        data["done"] = this.done;
         return data;
     }
 }
 
-export interface IUpdateTodoListCommand {
+export interface IUpdateTodoItemCommand {
     id?: number;
     title?: string | undefined;
+    done?: boolean;
 }
 
-export class WeatherForecast implements IWeatherForecast {
-    date?: Date;
-    temperatureC?: number;
-    temperatureF?: number;
-    summary?: string | undefined;
+export class UpdateTodoItemDetailCommand implements IUpdateTodoItemDetailCommand {
+    id?: number;
+    listId?: number;
+    priority?: PriorityLevel;
+    note?: string | undefined;
 
-    constructor(data?: IWeatherForecast) {
+    constructor(data?: IUpdateTodoItemDetailCommand) {
         if (data) {
             for (var property in data) {
                 if (data.hasOwnProperty(property))
@@ -1296,42 +1046,42 @@ export class WeatherForecast implements IWeatherForecast {
 
     init(_data?: any) {
         if (_data) {
-            this.date = _data["date"] ? new Date(_data["date"].toString()) : <any>undefined;
-            this.temperatureC = _data["temperatureC"];
-            this.temperatureF = _data["temperatureF"];
-            this.summary = _data["summary"];
+            this.id = _data["id"];
+            this.listId = _data["listId"];
+            this.priority = _data["priority"];
+            this.note = _data["note"];
         }
     }
 
-    static fromJS(data: any): WeatherForecast {
+    static fromJS(data: any): UpdateTodoItemDetailCommand {
         data = typeof data === 'object' ? data : {};
-        let result = new WeatherForecast();
+        let result = new UpdateTodoItemDetailCommand();
         result.init(data);
         return result;
     }
 
     toJSON(data?: any) {
         data = typeof data === 'object' ? data : {};
-        data["date"] = this.date ? this.date.toISOString() : <any>undefined;
-        data["temperatureC"] = this.temperatureC;
-        data["temperatureF"] = this.temperatureF;
-        data["summary"] = this.summary;
+        data["id"] = this.id;
+        data["listId"] = this.listId;
+        data["priority"] = this.priority;
+        data["note"] = this.note;
         return data;
     }
 }
 
-export interface IWeatherForecast {
-    date?: Date;
-    temperatureC?: number;
-    temperatureF?: number;
-    summary?: string | undefined;
+export interface IUpdateTodoItemDetailCommand {
+    id?: number;
+    listId?: number;
+    priority?: PriorityLevel;
+    note?: string | undefined;
 }
 
-export interface FileResponse {
-    data: Blob;
-    status: number;
-    fileName?: string;
-    headers?: { [name: string]: any };
+export enum PriorityLevel {
+    None = 0,
+    Low = 1,
+    Medium = 2,
+    High = 3,
 }
 
 export class SwaggerException extends Error {
diff --git a/src/WebUI/ConfigureServices.cs b/src/WebUI/ConfigureServices.cs
index 7559d8a84..f5811446b 100644
--- a/src/WebUI/ConfigureServices.cs
+++ b/src/WebUI/ConfigureServices.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.Mvc;
 using ZymLabs.NSwag.FluentValidation;
 
-namespace Microsoft.Extensions.DependencyInjection;
+namespace CleanArchitecture.WebUI;
 
 public static class ConfigureServices
 {
@@ -19,8 +19,6 @@ public static IServiceCollection AddWebUIServices(this IServiceCollection servic
         services.AddHealthChecks()
             .AddDbContextCheck<ApplicationDbContext>();
 
-        services.AddControllersWithViews();
-
         services.AddRazorPages();
 
         services.AddScoped(provider =>
@@ -31,6 +29,8 @@ 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/Controllers/ApiControllerBase.cs b/src/WebUI/Controllers/ApiControllerBase.cs
deleted file mode 100644
index 98ed6b9d6..000000000
--- a/src/WebUI/Controllers/ApiControllerBase.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using CleanArchitecture.WebUI.Filters;
-using MediatR;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace CleanArchitecture.WebUI.Controllers;
-
-[Authorize]
-[ApiController]
-[ApiExceptionFilter]
-[Route("api/[controller]")]
-public abstract class ApiControllerBase : ControllerBase
-{
-    private ISender? _mediator;
-
-    protected ISender Mediator => _mediator ??= HttpContext.RequestServices.GetRequiredService<ISender>();
-}
diff --git a/src/WebUI/Controllers/TodoItemsController.cs b/src/WebUI/Controllers/TodoItemsController.cs
deleted file mode 100644
index 8c9ddd970..000000000
--- a/src/WebUI/Controllers/TodoItemsController.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using CleanArchitecture.Application.Common.Models;
-using CleanArchitecture.Application.TodoItems.Commands.CreateTodoItem;
-using CleanArchitecture.Application.TodoItems.Commands.DeleteTodoItem;
-using CleanArchitecture.Application.TodoItems.Commands.UpdateTodoItem;
-using CleanArchitecture.Application.TodoItems.Commands.UpdateTodoItemDetail;
-using CleanArchitecture.Application.TodoItems.Queries.GetTodoItemsWithPagination;
-using Microsoft.AspNetCore.Mvc;
-
-namespace CleanArchitecture.WebUI.Controllers;
-
-public class TodoItemsController : ApiControllerBase
-{
-    [HttpGet]
-    public async Task<ActionResult<PaginatedList<TodoItemBriefDto>>> GetTodoItemsWithPagination([FromQuery] GetTodoItemsWithPaginationQuery query)
-    {
-        return await Mediator.Send(query);
-    }
-
-    [HttpPost]
-    public async Task<ActionResult<int>> Create(CreateTodoItemCommand command)
-    {
-        return await Mediator.Send(command);
-    }
-
-    [HttpPut("{id}")]
-    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesDefaultResponseType]
-    public async Task<IActionResult> Update(int id, UpdateTodoItemCommand command)
-    {
-        if (id != command.Id)
-        {
-            return BadRequest();
-        }
-
-        await Mediator.Send(command);
-
-        return NoContent();
-    }
-
-    [HttpPut("[action]")]
-    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesDefaultResponseType]
-    public async Task<IActionResult> UpdateItemDetails(int id, UpdateTodoItemDetailCommand command)
-    {
-        if (id != command.Id)
-        {
-            return BadRequest();
-        }
-
-        await Mediator.Send(command);
-
-        return NoContent();
-    }
-
-    [HttpDelete("{id}")]
-    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [ProducesDefaultResponseType]
-    public async Task<IActionResult> Delete(int id)
-    {
-        await Mediator.Send(new DeleteTodoItemCommand(id));
-
-        return NoContent();
-    }
-}
diff --git a/src/WebUI/Controllers/TodoListsController.cs b/src/WebUI/Controllers/TodoListsController.cs
deleted file mode 100644
index c4175d7f4..000000000
--- a/src/WebUI/Controllers/TodoListsController.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using CleanArchitecture.Application.TodoLists.Commands.CreateTodoList;
-using CleanArchitecture.Application.TodoLists.Commands.DeleteTodoList;
-using CleanArchitecture.Application.TodoLists.Commands.UpdateTodoList;
-using CleanArchitecture.Application.TodoLists.Queries.ExportTodos;
-using CleanArchitecture.Application.TodoLists.Queries.GetTodos;
-using Microsoft.AspNetCore.Mvc;
-
-namespace CleanArchitecture.WebUI.Controllers;
-
-public class TodoListsController : ApiControllerBase
-{
-    [HttpGet]
-    public async Task<ActionResult<TodosVm>> Get()
-    {
-        return await Mediator.Send(new GetTodosQuery());
-    }
-
-    [HttpGet("{id}")]
-    public async Task<FileResult> Get(int id)
-    {
-        var vm = await Mediator.Send(new ExportTodosQuery { ListId = id });
-
-        return File(vm.Content, vm.ContentType, vm.FileName);
-    }
-
-    [HttpPost]
-    public async Task<ActionResult<int>> Create(CreateTodoListCommand command)
-    {
-        return await Mediator.Send(command);
-    }
-
-    [HttpPut("{id}")]
-    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesDefaultResponseType]
-    public async Task<IActionResult> Update(int id, UpdateTodoListCommand command)
-    {
-        if (id != command.Id)
-        {
-            return BadRequest();
-        }
-
-        await Mediator.Send(command);
-
-        return NoContent();
-    }
-
-    [HttpDelete("{id}")]
-    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [ProducesDefaultResponseType]
-    public async Task<IActionResult> Delete(int id)
-    {
-        await Mediator.Send(new DeleteTodoListCommand(id));
-
-        return NoContent();
-    }
-}
diff --git a/src/WebUI/Controllers/WeatherForecastController.cs b/src/WebUI/Controllers/WeatherForecastController.cs
deleted file mode 100644
index d18544bdf..000000000
--- a/src/WebUI/Controllers/WeatherForecastController.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using CleanArchitecture.Application.WeatherForecasts.Queries.GetWeatherForecasts;
-using Microsoft.AspNetCore.Mvc;
-
-namespace CleanArchitecture.WebUI.Controllers;
-
-public class WeatherForecastController : ApiControllerBase
-{
-    [HttpGet]
-    public async Task<IEnumerable<WeatherForecast>> Get()
-    {
-        return await Mediator.Send(new GetWeatherForecasts());
-    }
-}
diff --git a/src/WebUI/Filters/ApiExceptionFilterAttribute.cs b/src/WebUI/Filters/ApiExceptionFilterAttribute.cs
deleted file mode 100644
index 74fd3638d..000000000
--- a/src/WebUI/Filters/ApiExceptionFilterAttribute.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using Ardalis.GuardClauses;
-using CleanArchitecture.Application.Common.Exceptions;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-
-namespace CleanArchitecture.WebUI.Filters;
-
-public class ApiExceptionFilterAttribute : ExceptionFilterAttribute
-{
-    private readonly IDictionary<Type, Action<ExceptionContext>> _exceptionHandlers;
-
-    public ApiExceptionFilterAttribute()
-    {
-        // Register known exception types and handlers.
-        _exceptionHandlers = new Dictionary<Type, Action<ExceptionContext>>
-            {
-                { typeof(ValidationException), HandleValidationException },
-                { typeof(NotFoundException), HandleNotFoundException },
-                { typeof(UnauthorizedAccessException), HandleUnauthorizedAccessException },
-                { typeof(ForbiddenAccessException), HandleForbiddenAccessException },
-            };
-    }
-
-    public override void OnException(ExceptionContext context)
-    {
-        HandleException(context);
-
-        base.OnException(context);
-    }
-
-    private void HandleException(ExceptionContext context)
-    {
-        Type type = context.Exception.GetType();
-        if (_exceptionHandlers.ContainsKey(type))
-        {
-            _exceptionHandlers[type].Invoke(context);
-            return;
-        }
-
-        if (!context.ModelState.IsValid)
-        {
-            HandleInvalidModelStateException(context);
-            return;
-        }
-    }
-
-    private void HandleValidationException(ExceptionContext context)
-    {
-        var exception = (ValidationException)context.Exception;
-
-        var details = new ValidationProblemDetails(exception.Errors)
-        {
-            Type = "https://tools.ietf.org/html/rfc7231#section-6.5.1"
-        };
-
-        context.Result = new BadRequestObjectResult(details);
-
-        context.ExceptionHandled = true;
-    }
-
-    private void HandleInvalidModelStateException(ExceptionContext context)
-    {
-        var details = new ValidationProblemDetails(context.ModelState)
-        {
-            Type = "https://tools.ietf.org/html/rfc7231#section-6.5.1"
-        };
-
-        context.Result = new BadRequestObjectResult(details);
-
-        context.ExceptionHandled = true;
-    }
-
-    private void HandleNotFoundException(ExceptionContext context)
-    {
-        var exception = (NotFoundException)context.Exception;
-
-        var details = new ProblemDetails()
-        {
-            Type = "https://tools.ietf.org/html/rfc7231#section-6.5.4",
-            Title = "The specified resource was not found.",
-            Detail = exception.Message
-        };
-
-        context.Result = new NotFoundObjectResult(details);
-
-        context.ExceptionHandled = true;
-    }
-
-    private void HandleUnauthorizedAccessException(ExceptionContext context)
-    {
-        var details = new ProblemDetails
-        {
-            Status = StatusCodes.Status401Unauthorized,
-            Title = "Unauthorized",
-            Type = "https://tools.ietf.org/html/rfc7235#section-3.1"
-        };
-
-        context.Result = new ObjectResult(details)
-        {
-            StatusCode = StatusCodes.Status401Unauthorized
-        };
-
-        context.ExceptionHandled = true;
-    }
-
-    private void HandleForbiddenAccessException(ExceptionContext context)
-    {
-        var details = new ProblemDetails
-        {
-            Status = StatusCodes.Status403Forbidden,
-            Title = "Forbidden",
-            Type = "https://tools.ietf.org/html/rfc7231#section-6.5.3"
-        };
-
-        context.Result = new ObjectResult(details)
-        {
-            StatusCode = StatusCodes.Status403Forbidden
-        };
-
-        context.ExceptionHandled = true;
-    }
-}
diff --git a/src/WebUI/GlobalUsings.cs b/src/WebUI/GlobalUsings.cs
new file mode 100644
index 000000000..f3be76bfc
--- /dev/null
+++ b/src/WebUI/GlobalUsings.cs
@@ -0,0 +1,2 @@
+global using CleanArchitecture.WebUI.Infrastructure;
+global using MediatR;
diff --git a/src/WebUI/Infrastructure/AbstractEndpoint.cs b/src/WebUI/Infrastructure/AbstractEndpoint.cs
new file mode 100644
index 000000000..7f818d7f7
--- /dev/null
+++ b/src/WebUI/Infrastructure/AbstractEndpoint.cs
@@ -0,0 +1,60 @@
+namespace CleanArchitecture.WebUI.Infrastructure;
+
+public abstract class AbstractEndpoint : IEndpoint
+{
+    public abstract void Map(WebApplication app);
+
+    public string Name => GetType().Name;
+
+    public string Group => GetType().Namespace!.Split(".")[^1];
+
+    public string BaseRoute => $"/api/{Group}/";
+
+    public RouteHandlerBuilder MapGet(WebApplication app, Delegate handler) => MapGet(app, "", handler);
+
+    public RouteHandlerBuilder MapGet(WebApplication app, string pattern, Delegate handler, bool withDefaults = true)
+    {
+        var builder = app.MapGet(BuildRoutePattern(pattern), handler);
+
+        if (withDefaults)
+        {
+            builder.WithDefaults(this);
+        }
+
+        return builder;
+    }
+
+    public RouteHandlerBuilder MapPost(WebApplication app, Delegate handler) => MapPost(app, "", handler);
+
+    public RouteHandlerBuilder MapPost(WebApplication app, string pattern, Delegate handler)
+    {
+        return app.MapPost(BuildRoutePattern(pattern), handler)
+            .WithDefaults(this);
+    }
+
+    public RouteHandlerBuilder MapPut(WebApplication app, Delegate handler) => MapPut(app, "", handler);
+
+    public RouteHandlerBuilder MapPut(WebApplication app, string pattern, Delegate handler)
+    {
+        return app.MapPut(BuildRoutePattern(pattern), handler)
+            .WithDefaults(this);
+    }
+
+    public RouteHandlerBuilder MapDelete(WebApplication app, Delegate handler) => MapDelete(app, "", handler);
+
+    public RouteHandlerBuilder MapDelete(WebApplication app, string pattern, Delegate handler)
+    {
+        return app.MapDelete(BuildRoutePattern(pattern), handler)
+            .WithDefaults(this);
+    }
+
+    private string BuildRoutePattern(string pattern)
+    {
+        if (!pattern.StartsWith("/"))
+        {
+            pattern = $"{BaseRoute}{pattern}";
+        }
+
+        return pattern;
+    }
+}
diff --git a/src/WebUI/Infrastructure/ApiExceptionFilter.cs b/src/WebUI/Infrastructure/ApiExceptionFilter.cs
new file mode 100644
index 000000000..2259dcd71
--- /dev/null
+++ b/src/WebUI/Infrastructure/ApiExceptionFilter.cs
@@ -0,0 +1,106 @@
+using CleanArchitecture.Application.Common.Exceptions;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CleanArchitecture.WebUI.Filters;
+
+public class ApiExceptionFilter : IEndpointFilter
+{
+    private readonly IDictionary<Type, Func<Exception, IResult>> _exceptionHandlers;
+
+    public ApiExceptionFilter()
+    {
+        // Register known exception types and handlers.
+        _exceptionHandlers = new Dictionary<Type, Func<Exception, IResult>>
+            {
+                { typeof(ValidationException), HandleValidationException },
+                { typeof(NotFoundException), HandleNotFoundException },
+                { typeof(UnauthorizedAccessException), HandleUnauthorizedAccessException },
+                { typeof(ForbiddenAccessException), HandleForbiddenAccessException },
+            };
+    }
+
+    public async ValueTask<object?> InvokeAsync(EndpointFilterInvocationContext context, EndpointFilterDelegate next)
+    {
+        try
+        {
+            return await next(context);
+        }
+        catch (Exception ex)
+        {
+            var result = HandleException(ex);
+
+            if (result is not null)
+            {
+                return result;
+            }
+
+            throw;
+        }
+    }
+
+    private IResult? HandleException(Exception ex)
+    {
+        var type = ex.GetType();
+
+        if (_exceptionHandlers.ContainsKey(type))
+        {
+            return _exceptionHandlers[type].Invoke(ex);
+        }
+
+        return null;
+    }
+
+    private IResult HandleValidationException(Exception ex)
+    {
+        var exception = (ValidationException)ex;
+
+        var details = new ValidationProblemDetails(exception.Errors)
+        {
+            Type = "https://tools.ietf.org/html/rfc7231#section-6.5.1"
+        };
+
+        return Results.BadRequest(details);
+    }
+
+    private IResult HandleNotFoundException(Exception ex)
+    {
+        var exception = (NotFoundException)ex;
+
+        var details = new ProblemDetails()
+        {
+            Type = "https://tools.ietf.org/html/rfc7231#section-6.5.4",
+            Title = "The specified resource was not found.",
+            Detail = exception.Message
+        };
+
+        return Results.NotFound(details);
+    }
+
+    private IResult HandleUnauthorizedAccessException(Exception ex)
+    {
+        var details = new ProblemDetails
+        {
+            Status = StatusCodes.Status401Unauthorized,
+            Title = "Unauthorized",
+            Type = "https://tools.ietf.org/html/rfc7235#section-3.1"
+        };
+
+        return Results.Json(
+            details, 
+            statusCode: StatusCodes.Status401Unauthorized);
+    }
+
+    private IResult HandleForbiddenAccessException(Exception ex)
+    {
+        var details = new ProblemDetails
+        {
+            Status = StatusCodes.Status403Forbidden,
+            Title = "Forbidden",
+            Type = "https://tools.ietf.org/html/rfc7231#section-6.5.3"
+        };
+
+        return Results.Json(
+            details,
+            statusCode: StatusCodes.Status403Forbidden);
+    }
+}
diff --git a/src/WebUI/Infrastructure/IEndpoint.cs b/src/WebUI/Infrastructure/IEndpoint.cs
new file mode 100644
index 000000000..1053fbd60
--- /dev/null
+++ b/src/WebUI/Infrastructure/IEndpoint.cs
@@ -0,0 +1,6 @@
+namespace CleanArchitecture.WebUI.Infrastructure;
+
+public interface IEndpoint
+{
+    void Map(WebApplication app);
+}
diff --git a/src/WebUI/Infrastructure/RouteHandlerBuilderExtensions.cs b/src/WebUI/Infrastructure/RouteHandlerBuilderExtensions.cs
new file mode 100644
index 000000000..6e32a6e9f
--- /dev/null
+++ b/src/WebUI/Infrastructure/RouteHandlerBuilderExtensions.cs
@@ -0,0 +1,17 @@
+using CleanArchitecture.WebUI.Filters;
+
+namespace CleanArchitecture.WebUI.Infrastructure;
+
+public static class RouteHandlerBuilderExtensions
+{
+    public static RouteHandlerBuilder WithDefaults(this RouteHandlerBuilder builder, AbstractEndpoint endpoint)
+    {
+        return builder
+            .WithName($"{endpoint.Group}_{endpoint.Name}")
+            .WithGroupName(endpoint.Group)
+            .WithTags(endpoint.Group)
+            .RequireAuthorization()
+            .WithOpenApi()
+            .AddEndpointFilter<ApiExceptionFilter>();
+    }
+}
\ No newline at end of file
diff --git a/src/WebUI/Infrastructure/WebApplicationExtensions.cs b/src/WebUI/Infrastructure/WebApplicationExtensions.cs
new file mode 100644
index 000000000..c86c9afb2
--- /dev/null
+++ b/src/WebUI/Infrastructure/WebApplicationExtensions.cs
@@ -0,0 +1,27 @@
+using System.Reflection;
+
+namespace CleanArchitecture.WebUI.Infrastructure;
+
+public static class WebApplicationExtensions
+{
+    public static WebApplication MapEndpoints(this WebApplication app)
+    {
+        var endPointType = typeof(IEndpoint);
+
+        var assembly = Assembly.GetExecutingAssembly();
+
+        var endpointTypes = assembly.GetExportedTypes()
+            .Where(t => t.IsAbstract == false &&
+                        t.GetInterfaces().Contains(endPointType));
+
+        foreach (var type in endpointTypes)
+        {
+            if (Activator.CreateInstance(type) is IEndpoint instance)
+            {
+                instance.Map(app);
+            }
+        }
+
+        return app;
+    }
+}
diff --git a/src/WebUI/OidcConfiguration/OidcConfiguration.cs b/src/WebUI/OidcConfiguration/OidcConfiguration.cs
new file mode 100644
index 000000000..419b2b3d5
--- /dev/null
+++ b/src/WebUI/OidcConfiguration/OidcConfiguration.cs
@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CleanArchitecture.WebUI.OidcConfiguration;
+
+public class OidcConfiguration : AbstractEndpoint
+{
+    public override void Map(WebApplication app)
+    {
+        MapGet(app, "/_configuration/{clientId}", (IClientRequestParametersProvider clientRequestParametersProvider, HttpContext context, string clientId) =>
+        {
+            var parameters = clientRequestParametersProvider.GetClientParameters(context, clientId);
+            return Results.Ok(parameters);
+        }, withDefaults: false).ExcludeFromDescription();
+    }
+}
\ No newline at end of file
diff --git a/src/WebUI/Program.cs b/src/WebUI/Program.cs
index dd72c52a3..5a5ed9b28 100644
--- a/src/WebUI/Program.cs
+++ b/src/WebUI/Program.cs
@@ -1,4 +1,5 @@
 using CleanArchitecture.Infrastructure.Persistence;
+using CleanArchitecture.WebUI;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -12,7 +13,6 @@
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
-    app.UseDeveloperExceptionPage();
     app.UseMigrationsEndPoint();
 
     // Initialise and seed database
@@ -39,6 +39,12 @@
     settings.DocumentPath = "/api/specification.json";
 });
 
+app.UseRouting();
+
+app.UseAuthentication();
+app.UseIdentityServer();
+app.UseAuthorization();
+
 app.MapControllerRoute(
     name: "default",
     pattern: "{controller}/{action=Index}/{id?}");
@@ -47,4 +53,6 @@
 
 app.MapFallbackToFile("index.html");
 
-app.Run();
\ No newline at end of file
+app.MapEndpoints();
+
+app.Run();
diff --git a/src/WebUI/Services/CurrentUser.cs b/src/WebUI/Services/CurrentUser.cs
index a381739a4..b34d96be8 100644
--- a/src/WebUI/Services/CurrentUser.cs
+++ b/src/WebUI/Services/CurrentUser.cs
@@ -1,7 +1,7 @@
 using System.Security.Claims;
 
 using CleanArchitecture.Application.Common.Interfaces;
-
+
 namespace CleanArchitecture.WebUI.Services;
 
 public class CurrentUser : IUser
diff --git a/src/WebUI/TodoItems/CreateTodoItem.cs b/src/WebUI/TodoItems/CreateTodoItem.cs
new file mode 100644
index 000000000..45a7efc13
--- /dev/null
+++ b/src/WebUI/TodoItems/CreateTodoItem.cs
@@ -0,0 +1,12 @@
+using CleanArchitecture.Application.TodoItems.Commands.CreateTodoItem;
+
+namespace CleanArchitecture.WebUI.TodoItems;
+
+public class CreateTodoItem : AbstractEndpoint
+{
+    public override void Map(WebApplication app)
+    {
+        MapPost(app,
+            async (ISender sender, CreateTodoItemCommand command) => await sender.Send(command));
+    }
+}
diff --git a/src/WebUI/TodoItems/DeleteTodoItem.cs b/src/WebUI/TodoItems/DeleteTodoItem.cs
new file mode 100644
index 000000000..a802f2847
--- /dev/null
+++ b/src/WebUI/TodoItems/DeleteTodoItem.cs
@@ -0,0 +1,16 @@
+using CleanArchitecture.Application.TodoItems.Commands.DeleteTodoItem;
+
+namespace CleanArchitecture.WebUI.TodoItems;
+
+public class DeleteTodoItem : AbstractEndpoint
+{
+    public override void Map(WebApplication app)
+    {
+        MapDelete(app, "{id}",
+            async (ISender sender, int id) =>
+            {
+                await sender.Send(new DeleteTodoItemCommand(id));
+                return Results.NoContent();
+            });
+    }
+}
diff --git a/src/WebUI/TodoItems/UpdateTodoItem.cs b/src/WebUI/TodoItems/UpdateTodoItem.cs
new file mode 100644
index 000000000..951804753
--- /dev/null
+++ b/src/WebUI/TodoItems/UpdateTodoItem.cs
@@ -0,0 +1,19 @@
+using CleanArchitecture.Application.TodoItems.Commands.UpdateTodoItem;
+
+namespace CleanArchitecture.WebUI.TodoItems;
+
+public class UpdateTodoItem : AbstractEndpoint
+{
+    public override void Map(WebApplication app)
+    {
+        MapPut(app, "{id}",
+            async (ISender sender, int id, UpdateTodoItemCommand command) =>
+            {
+                if (id != command.Id) return Results.BadRequest();
+
+                await sender.Send(command);
+
+                return Results.NoContent();
+            });
+    }
+}
diff --git a/src/WebUI/TodoItems/UpdateTodoItemDetail.cs b/src/WebUI/TodoItems/UpdateTodoItemDetail.cs
new file mode 100644
index 000000000..c602d7a74
--- /dev/null
+++ b/src/WebUI/TodoItems/UpdateTodoItemDetail.cs
@@ -0,0 +1,19 @@
+using CleanArchitecture.Application.TodoItems.Commands.UpdateTodoItemDetail;
+
+namespace CleanArchitecture.WebUI.TodoItems;
+
+public class UpdateTodoItemDetail : AbstractEndpoint
+{
+    public override void Map(WebApplication app)
+    {
+        MapPut(app, "UpdateDetail/{id}",
+            async (ISender sender, int id, UpdateTodoItemDetailCommand command) =>
+            {
+                if (id != command.Id) return Results.BadRequest();
+
+                await sender.Send(command);
+
+                return Results.NoContent();
+            });
+    }
+}
diff --git a/src/WebUI/TodoLists/CreateTodoList.cs b/src/WebUI/TodoLists/CreateTodoList.cs
new file mode 100644
index 000000000..b2179b49c
--- /dev/null
+++ b/src/WebUI/TodoLists/CreateTodoList.cs
@@ -0,0 +1,12 @@
+using CleanArchitecture.Application.TodoLists.Commands.CreateTodoList;
+
+namespace CleanArchitecture.WebUI.TodoLists;
+
+public class CreateTodoList : AbstractEndpoint
+{
+    public override void Map(WebApplication app)
+    {
+        MapPost(app,
+            async (ISender sender, CreateTodoListCommand command) => await sender.Send(command));
+    }
+}
diff --git a/src/WebUI/TodoLists/DeleteTodoList.cs b/src/WebUI/TodoLists/DeleteTodoList.cs
new file mode 100644
index 000000000..33c556d98
--- /dev/null
+++ b/src/WebUI/TodoLists/DeleteTodoList.cs
@@ -0,0 +1,16 @@
+using CleanArchitecture.Application.TodoLists.Commands.DeleteTodoList;
+
+namespace CleanArchitecture.WebUI.TodoLists;
+
+public class DeleteTodoList : AbstractEndpoint
+{
+    public override void Map(WebApplication app)
+    {
+        MapDelete(app, "{id}",
+            async (ISender sender, int id) =>
+            {
+                await sender.Send(new DeleteTodoListCommand(id));
+                return Results.NoContent();
+            });
+    }
+}
diff --git a/src/WebUI/TodoLists/ExportTodos.cs b/src/WebUI/TodoLists/ExportTodos.cs
new file mode 100644
index 000000000..a42a809ec
--- /dev/null
+++ b/src/WebUI/TodoLists/ExportTodos.cs
@@ -0,0 +1,16 @@
+using CleanArchitecture.Application.TodoLists.Queries.ExportTodos;
+
+namespace CleanArchitecture.WebUI.TodoLists;
+
+public class ExportTodos : AbstractEndpoint
+{
+    public override void Map(WebApplication app)
+    {
+        MapGet(app, "Export/{id}",
+             async (ISender sender, int id) => 
+             {
+                 var vm = await sender.Send(new ExportTodosQuery { ListId = id });
+                 return Results.File(vm.Content, vm.ContentType, vm.FileName);
+             });
+    }
+}
\ No newline at end of file
diff --git a/src/WebUI/TodoLists/GetTodoLists.cs b/src/WebUI/TodoLists/GetTodoLists.cs
new file mode 100644
index 000000000..e7c5e4a2b
--- /dev/null
+++ b/src/WebUI/TodoLists/GetTodoLists.cs
@@ -0,0 +1,12 @@
+using CleanArchitecture.Application.TodoLists.Queries.GetTodos;
+
+namespace CleanArchitecture.WebUI.TodoLists;
+
+public class GetTodoLists : AbstractEndpoint
+{
+    public override void Map(WebApplication app)
+    {
+        MapGet(app,
+             async (ISender sender) => await sender.Send(new GetTodosQuery()));
+    }
+}
diff --git a/src/WebUI/TodoLists/UpdateTodoList.cs b/src/WebUI/TodoLists/UpdateTodoList.cs
new file mode 100644
index 000000000..413d67454
--- /dev/null
+++ b/src/WebUI/TodoLists/UpdateTodoList.cs
@@ -0,0 +1,19 @@
+using CleanArchitecture.Application.TodoLists.Commands.UpdateTodoList;
+
+namespace CleanArchitecture.WebUI.TodoLists;
+
+public class UpdateTodoList : AbstractEndpoint
+{
+    public override void Map(WebApplication app)
+    {
+        MapPut(app, "{id}",
+            async (ISender sender, int id, UpdateTodoListCommand command) =>
+            {
+                if (id != command.Id) return Results.BadRequest();
+
+                await sender.Send(command);
+
+                return Results.NoContent();
+            });
+    }
+}
diff --git a/src/WebUI/WeatherForecasts/GetWeatherForecasts.cs b/src/WebUI/WeatherForecasts/GetWeatherForecasts.cs
new file mode 100644
index 000000000..7802dd2a4
--- /dev/null
+++ b/src/WebUI/WeatherForecasts/GetWeatherForecasts.cs
@@ -0,0 +1,12 @@
+using CleanArchitecture.Application.WeatherForecasts.Queries.GetWeatherForecasts;
+
+namespace CleanArchitecture.WebUI.WeatherForecasts;
+
+public class GetWeatherForecasts : AbstractEndpoint
+{
+    public override void Map(WebApplication app)
+    {
+        MapGet(app,
+            async (ISender sender) => await sender.Send(new GetWeatherForecastsQuery()));
+    }
+}
\ No newline at end of file
diff --git a/src/WebUI/WebUI.csproj b/src/WebUI/WebUI.csproj
index b178d40c6..daa193f77 100644
--- a/src/WebUI/WebUI.csproj
+++ b/src/WebUI/WebUI.csproj
@@ -9,6 +9,8 @@
         <SpaProxyLaunchCommand>npm start</SpaProxyLaunchCommand>
         <ImplicitUsings>enable</ImplicitUsings>
         <IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
+		<RootNamespace>CleanArchitecture.WebUI</RootNamespace>
+		<AssemblyName>CleanArchitecture.WebUI</AssemblyName>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/WebUI/wwwroot/api/specification.json b/src/WebUI/wwwroot/api/specification.json
index c83075b6e..2f761cfe5 100644
--- a/src/WebUI/wwwroot/api/specification.json
+++ b/src/WebUI/wwwroot/api/specification.json
@@ -1,70 +1,52 @@
 {
-  "x-generator": "NSwag v13.19.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v10.0.0.0))",
+  "x-generator": "NSwag v13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v13.0.0.0))",
   "openapi": "3.0.0",
   "info": {
     "title": "CleanArchitecture API",
     "version": "1.0.0"
   },
   "paths": {
-    "/api/TodoItems": {
+    "/api/WeatherForecasts": {
       "get": {
         "tags": [
-          "TodoItems"
-        ],
-        "operationId": "TodoItems_GetTodoItemsWithPagination",
-        "parameters": [
-          {
-            "name": "ListId",
-            "in": "query",
-            "schema": {
-              "type": "integer",
-              "format": "int32"
-            },
-            "x-position": 1
-          },
-          {
-            "name": "PageNumber",
-            "in": "query",
-            "schema": {
-              "type": "integer",
-              "format": "int32"
-            },
-            "x-position": 2
-          },
-          {
-            "name": "PageSize",
-            "in": "query",
-            "schema": {
-              "type": "integer",
-              "format": "int32"
-            },
-            "x-position": 3
-          }
+          "WeatherForecasts"
         ],
+        "operationId": "WeatherForecasts_GetWeatherForecasts",
         "responses": {
           "200": {
             "description": "",
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/PaginatedListOfTodoItemBriefDto"
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/WeatherForecast"
+                  }
                 }
               }
             }
           }
-        }
-      },
+        },
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
+      }
+    },
+    "/api/TodoLists": {
       "post": {
         "tags": [
-          "TodoItems"
+          "TodoLists"
         ],
-        "operationId": "TodoItems_Create",
+        "operationId": "TodoLists_CreateTodoList",
         "requestBody": {
           "x-name": "command",
+          "description": "",
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/CreateTodoItemCommand"
+                "$ref": "#/components/schemas/CreateTodoListCommand"
               }
             }
           },
@@ -83,70 +65,43 @@
               }
             }
           }
-        }
-      }
-    },
-    "/api/TodoItems/{id}": {
-      "put": {
-        "tags": [
-          "TodoItems"
-        ],
-        "operationId": "TodoItems_Update",
-        "parameters": [
+        },
+        "security": [
           {
-            "name": "id",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "integer",
-              "format": "int32"
-            },
-            "x-position": 1
+            "JWT": []
           }
+        ]
+      },
+      "get": {
+        "tags": [
+          "TodoLists"
         ],
-        "requestBody": {
-          "x-name": "command",
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateTodoItemCommand"
-              }
-            }
-          },
-          "required": true,
-          "x-position": 2
-        },
+        "operationId": "TodoLists_GetTodoLists",
         "responses": {
-          "204": {
-            "description": ""
-          },
-          "400": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
-            }
-          },
-          "default": {
+          "200": {
             "description": "",
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
+                  "$ref": "#/components/schemas/TodosVm"
                 }
               }
             }
           }
-        }
-      },
+        },
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
+      }
+    },
+    "/api/TodoLists/{id}": {
       "delete": {
         "tags": [
-          "TodoItems"
+          "TodoLists"
         ],
-        "operationId": "TodoItems_Delete",
+        "operationId": "TodoLists_DeleteTodoList",
         "parameters": [
           {
             "name": "id",
@@ -160,32 +115,26 @@
           }
         ],
         "responses": {
-          "204": {
+          "200": {
             "description": ""
-          },
-          "default": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
-            }
           }
-        }
-      }
-    },
-    "/api/TodoItems/UpdateItemDetails": {
+        },
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
+      },
       "put": {
         "tags": [
-          "TodoItems"
+          "TodoLists"
         ],
-        "operationId": "TodoItems_UpdateItemDetails",
+        "operationId": "TodoLists_UpdateTodoList",
         "parameters": [
           {
             "name": "id",
-            "in": "query",
+            "in": "path",
+            "required": true,
             "schema": {
               "type": "integer",
               "format": "int32"
@@ -195,10 +144,11 @@
         ],
         "requestBody": {
           "x-name": "command",
+          "description": "",
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateTodoItemDetailCommand"
+                "$ref": "#/components/schemas/UpdateTodoListCommand"
               }
             }
           },
@@ -206,62 +156,60 @@
           "x-position": 2
         },
         "responses": {
-          "204": {
+          "200": {
             "description": ""
-          },
-          "400": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
-            }
           }
-        }
+        },
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
       }
     },
-    "/api/TodoLists": {
+    "/api/TodoLists/Export/{id}": {
       "get": {
         "tags": [
           "TodoLists"
         ],
-        "operationId": "TodoLists_Get",
+        "operationId": "TodoLists_ExportTodos",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "x-position": 1
+          }
+        ],
         "responses": {
           "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/TodosVm"
-                }
-              }
-            }
+            "description": ""
           }
-        }
-      },
+        },
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
+      }
+    },
+    "/api/TodoItems": {
       "post": {
         "tags": [
-          "TodoLists"
+          "TodoItems"
         ],
-        "operationId": "TodoLists_Create",
+        "operationId": "TodoItems_CreateTodoItem",
         "requestBody": {
           "x-name": "command",
+          "description": "",
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/CreateTodoListCommand"
+                "$ref": "#/components/schemas/CreateTodoItemCommand"
               }
             }
           },
@@ -280,15 +228,20 @@
               }
             }
           }
-        }
+        },
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
       }
     },
-    "/api/TodoLists/{id}": {
-      "get": {
+    "/api/TodoItems/{id}": {
+      "delete": {
         "tags": [
-          "TodoLists"
+          "TodoItems"
         ],
-        "operationId": "TodoLists_Get2",
+        "operationId": "TodoItems_DeleteTodoItem",
         "parameters": [
           {
             "name": "id",
@@ -303,23 +256,20 @@
         ],
         "responses": {
           "200": {
-            "description": "",
-            "content": {
-              "application/octet-stream": {
-                "schema": {
-                  "type": "string",
-                  "format": "binary"
-                }
-              }
-            }
+            "description": ""
           }
-        }
+        },
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
       },
       "put": {
         "tags": [
-          "TodoLists"
+          "TodoItems"
         ],
-        "operationId": "TodoLists_Update",
+        "operationId": "TodoItems_UpdateTodoItem",
         "parameters": [
           {
             "name": "id",
@@ -334,10 +284,11 @@
         ],
         "requestBody": {
           "x-name": "command",
+          "description": "",
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdateTodoListCommand"
+                "$ref": "#/components/schemas/UpdateTodoItemCommand"
               }
             }
           },
@@ -345,36 +296,23 @@
           "x-position": 2
         },
         "responses": {
-          "204": {
+          "200": {
             "description": ""
-          },
-          "400": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
-            }
           }
-        }
-      },
-      "delete": {
+        },
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
+      }
+    },
+    "/api/TodoItems/UpdateDetail/{id}": {
+      "put": {
         "tags": [
-          "TodoLists"
+          "TodoItems"
         ],
-        "operationId": "TodoLists_Delete",
+        "operationId": "TodoItems_UpdateTodoItemDetail",
         "parameters": [
           {
             "name": "id",
@@ -387,197 +325,66 @@
             "x-position": 1
           }
         ],
-        "responses": {
-          "204": {
-            "description": ""
-          },
-          "default": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
+        "requestBody": {
+          "x-name": "command",
+          "description": "",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateTodoItemDetailCommand"
               }
             }
-          }
-        }
-      }
-    },
-    "/api/WeatherForecast": {
-      "get": {
-        "tags": [
-          "WeatherForecast"
-        ],
-        "operationId": "WeatherForecast_Get",
+          },
+          "required": true,
+          "x-position": 2
+        },
         "responses": {
           "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/WeatherForecast"
-                  }
-                }
-              }
-            }
+            "description": ""
           }
-        }
+        },
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
       }
     }
   },
   "components": {
     "schemas": {
-      "PaginatedListOfTodoItemBriefDto": {
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "items": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/TodoItemBriefDto"
-            }
-          },
-          "pageNumber": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "totalPages": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "totalCount": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "hasPreviousPage": {
-            "type": "boolean"
-          },
-          "hasNextPage": {
-            "type": "boolean"
-          }
-        }
-      },
-      "TodoItemBriefDto": {
+      "WeatherForecast": {
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "id": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "listId": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "title": {
+          "date": {
             "type": "string",
-            "nullable": true
+            "format": "date-time"
           },
-          "done": {
-            "type": "boolean"
-          }
-        }
-      },
-      "CreateTodoItemCommand": {
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "listId": {
+          "temperatureC": {
             "type": "integer",
             "format": "int32"
           },
-          "title": {
-            "type": "string",
-            "nullable": true
-          }
-        }
-      },
-      "ProblemDetails": {
-        "type": "object",
-        "additionalProperties": {
-          "nullable": true
-        },
-        "properties": {
-          "type": {
-            "type": "string",
-            "nullable": true
-          },
-          "title": {
-            "type": "string",
-            "nullable": true
-          },
-          "status": {
-            "type": "integer",
-            "format": "int32",
-            "nullable": true
-          },
-          "detail": {
-            "type": "string",
-            "nullable": true
-          },
-          "instance": {
-            "type": "string",
-            "nullable": true
-          }
-        }
-      },
-      "UpdateTodoItemCommand": {
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "id": {
+          "temperatureF": {
             "type": "integer",
             "format": "int32"
           },
-          "title": {
+          "summary": {
             "type": "string",
             "nullable": true
-          },
-          "done": {
-            "type": "boolean"
           }
         }
       },
-      "UpdateTodoItemDetailCommand": {
+      "CreateTodoListCommand": {
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "id": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "listId": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "priority": {
-            "$ref": "#/components/schemas/PriorityLevel"
-          },
-          "note": {
+          "title": {
             "type": "string",
             "nullable": true
           }
         }
       },
-      "PriorityLevel": {
-        "type": "integer",
-        "description": "",
-        "x-enumNames": [
-          "None",
-          "Low",
-          "Medium",
-          "High"
-        ],
-        "enum": [
-          0,
-          1,
-          2,
-          3
-        ]
-      },
       "TodosVm": {
         "type": "object",
         "additionalProperties": false,
@@ -585,7 +392,7 @@
           "priorityLevels": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/LookupDto"
+              "$ref": "#/components/schemas/PriorityLevelDto"
             }
           },
           "lists": {
@@ -596,15 +403,15 @@
           }
         }
       },
-      "LookupDto": {
+      "PriorityLevelDto": {
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "id": {
+          "value": {
             "type": "integer",
             "format": "int32"
           },
-          "title": {
+          "name": {
             "type": "string",
             "nullable": true
           }
@@ -663,21 +470,25 @@
           }
         }
       },
-      "CreateTodoListCommand": {
+      "UpdateTodoListCommand": {
         "type": "object",
         "additionalProperties": false,
         "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
           "title": {
             "type": "string",
             "nullable": true
           }
         }
       },
-      "UpdateTodoListCommand": {
+      "CreateTodoItemCommand": {
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "id": {
+          "listId": {
             "type": "integer",
             "format": "int32"
           },
@@ -687,28 +498,73 @@
           }
         }
       },
-      "WeatherForecast": {
+      "UpdateTodoItemCommand": {
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "date": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "title": {
             "type": "string",
-            "format": "date-time"
+            "nullable": true
           },
-          "temperatureC": {
+          "done": {
+            "type": "boolean"
+          }
+        }
+      },
+      "UpdateTodoItemDetailCommand": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "id": {
             "type": "integer",
             "format": "int32"
           },
-          "temperatureF": {
+          "listId": {
             "type": "integer",
             "format": "int32"
           },
-          "summary": {
+          "priority": {
+            "$ref": "#/components/schemas/PriorityLevel"
+          },
+          "note": {
             "type": "string",
             "nullable": true
           }
         }
+      },
+      "PriorityLevel": {
+        "type": "integer",
+        "description": "",
+        "x-enumNames": [
+          "None",
+          "Low",
+          "Medium",
+          "High"
+        ],
+        "enum": [
+          0,
+          1,
+          2,
+          3
+        ]
       }
+    },
+    "securitySchemes": {
+      "JWT": {
+        "type": "apiKey",
+        "description": "Type into the textbox: Bearer {your JWT token}.",
+        "name": "Authorization",
+        "in": "header"
+      }
+    }
+  },
+  "security": [
+    {
+      "JWT": []
     }
-  }
+  ]
 }
\ No newline at end of file

From d44b68ce304a80dfb6af77b9a78e7943d93cce87 Mon Sep 17 00:00:00 2001
From: Jason Taylor <jasongt@outlook.com>
Date: Tue, 27 Jun 2023 19:11:36 +1000
Subject: [PATCH 2/3] =?UTF-8?q?=E2=9C=A8=20Fixing=20merge=20issues=20and?=
 =?UTF-8?q?=20improving=20approach.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...recasts.cs => GetWeatherForecastsQuery.cs} |   6 +-
 .../ClientApp/src/app/todo/todo.component.ts  |   4 +-
 src/WebUI/ClientApp/src/app/web-api-client.ts |  52 ++----
 src/WebUI/ConfigureServices.cs                |   6 +-
 .../Infrastructure/ApiExceptionFilter.cs      | 151 +++++++++---------
 .../{AbstractEndpoint.cs => EndPointBase.cs}  | 120 +++++++-------
 .../RouteHandlerBuilderExtensions.cs          |   2 +-
 .../OidcConfiguration/OidcConfiguration.cs    |  16 --
 src/WebUI/Program.cs                          |   7 -
 src/WebUI/TodoItems/CreateTodoItem.cs         |   2 +-
 src/WebUI/TodoItems/DeleteTodoItem.cs         |   2 +-
 src/WebUI/TodoItems/UpdateTodoItem.cs         |   2 +-
 src/WebUI/TodoItems/UpdateTodoItemDetail.cs   |   2 +-
 src/WebUI/TodoLists/CreateTodoList.cs         |   2 +-
 src/WebUI/TodoLists/DeleteTodoList.cs         |   2 +-
 src/WebUI/TodoLists/ExportTodos.cs            |   2 +-
 src/WebUI/TodoLists/GetTodoLists.cs           |   2 +-
 src/WebUI/TodoLists/UpdateTodoList.cs         |   2 +-
 .../WeatherForecasts/GetWeatherForecasts.cs   |   2 +-
 src/WebUI/WebUI.csproj                        |   1 +
 src/WebUI/wwwroot/api/specification.json      |  95 ++---------
 21 files changed, 181 insertions(+), 299 deletions(-)
 rename src/Application/WeatherForecasts/Queries/GetWeatherForecasts/{GetWeatherForecasts.cs => GetWeatherForecastsQuery.cs} (81%)
 rename src/WebUI/Infrastructure/{AbstractEndpoint.cs => EndPointBase.cs} (94%)
 delete mode 100644 src/WebUI/OidcConfiguration/OidcConfiguration.cs

diff --git a/src/Application/WeatherForecasts/Queries/GetWeatherForecasts/GetWeatherForecasts.cs b/src/Application/WeatherForecasts/Queries/GetWeatherForecasts/GetWeatherForecastsQuery.cs
similarity index 81%
rename from src/Application/WeatherForecasts/Queries/GetWeatherForecasts/GetWeatherForecasts.cs
rename to src/Application/WeatherForecasts/Queries/GetWeatherForecasts/GetWeatherForecastsQuery.cs
index 6dccdc8bb..bd2ae0c73 100644
--- a/src/Application/WeatherForecasts/Queries/GetWeatherForecasts/GetWeatherForecasts.cs
+++ b/src/Application/WeatherForecasts/Queries/GetWeatherForecasts/GetWeatherForecastsQuery.cs
@@ -1,8 +1,8 @@
 namespace CleanArchitecture.Application.WeatherForecasts.Queries.GetWeatherForecasts;
 
-public record GetWeatherForecasts : IRequest<IEnumerable<WeatherForecast>>;
+public record GetWeatherForecastsQuery : IRequest<IEnumerable<WeatherForecast>>;
 
-public class GetWeatherForecastsQueryHandler : IRequestHandler<GetWeatherForecasts, IEnumerable<WeatherForecast>>
+public class GetWeatherForecastsQueryHandler : IRequestHandler<GetWeatherForecastsQuery, IEnumerable<WeatherForecast>>
 {
     private static readonly string[] Summaries = new[]
     {
@@ -10,7 +10,7 @@ public class GetWeatherForecastsQueryHandler : IRequestHandler<GetWeatherForecas
     };
 
 #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
-    public async Task<IEnumerable<WeatherForecast>> Handle(GetWeatherForecasts request, CancellationToken cancellationToken)
+    public async Task<IEnumerable<WeatherForecast>> Handle(GetWeatherForecastsQuery request, CancellationToken cancellationToken)
 #pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
     {
         var rng = new Random();
diff --git a/src/WebUI/ClientApp/src/app/todo/todo.component.ts b/src/WebUI/ClientApp/src/app/todo/todo.component.ts
index db0d51e0c..6bfef6e6a 100644
--- a/src/WebUI/ClientApp/src/app/todo/todo.component.ts
+++ b/src/WebUI/ClientApp/src/app/todo/todo.component.ts
@@ -135,7 +135,7 @@ export class TodoComponent implements OnInit {
 
   updateItemDetails(): void {
     const item = this.itemDetailsEditor as UpdateTodoItemDetailCommand;
-    this.itemsClient.updateItemDetails(this.selectedItem.id, item).subscribe(
+    this.itemsClient.updateTodoItemDetail(this.selectedItem.id, item).subscribe(
       () => {
         if (this.selectedItem.listId !== this.itemDetailsEditor.listId) {
           this.selectedList.items = this.selectedList.items.filter(
@@ -194,7 +194,7 @@ export class TodoComponent implements OnInit {
           error => console.error(error)
         );
     } else {
-        this.itemsClient.updateTTodoItem(item.id, item as UpdateTodoItemCommand).subscribe(
+        this.itemsClient.updateTodoItem(item.id, item as UpdateTodoItemCommand).subscribe(
         () => console.log('Update succeeded.'),
         error => console.error(error)
       );
diff --git a/src/WebUI/ClientApp/src/app/web-api-client.ts b/src/WebUI/ClientApp/src/app/web-api-client.ts
index 120c74b4d..b9b5108f3 100644
--- 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>
 //----------------------
 
@@ -204,23 +204,10 @@ export class TodoListsClient implements ITodoListsClient {
             }));
         } else if (status !== 200 && status !== 204) {
             return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
-            return _observableOf(null as any);
-            }));
-        } else if (status === 400) {
-            return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
-            let result400: any = null;
-            let resultData400 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
-            result400 = ProblemDetails.fromJS(resultData400);
-            return throwException("A server side error occurred.", status, _responseText, _headers, result400);
-            }));
-        } else {
-            return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
-            let resultdefault: any = null;
-            let resultDatadefault = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
-            resultdefault = ProblemDetails.fromJS(resultDatadefault);
-            return throwException("A server side error occurred.", status, _responseText, _headers, resultdefault);
+            return throwException("An unexpected server error occurred.", status, _responseText, _headers);
             }));
         }
+        return _observableOf(null as any);
     }
 
     deleteTodoList(id: number): Observable<void> {
@@ -264,16 +251,10 @@ export class TodoListsClient implements ITodoListsClient {
             }));
         } else if (status !== 200 && status !== 204) {
             return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
-            return _observableOf(null as any);
-            }));
-        } else {
-            return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
-            let resultdefault: any = null;
-            let resultDatadefault = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
-            resultdefault = ProblemDetails.fromJS(resultDatadefault);
-            return throwException("A server side error occurred.", status, _responseText, _headers, resultdefault);
+            return throwException("An unexpected server error occurred.", status, _responseText, _headers);
             }));
         }
+        return _observableOf(null as any);
     }
 
     updateTodoList(id: number, command: UpdateTodoListCommand): Observable<void> {
@@ -321,23 +302,10 @@ export class TodoListsClient implements ITodoListsClient {
             }));
         } else if (status !== 200 && status !== 204) {
             return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
-            return _observableOf(null as any);
-            }));
-        } else if (status === 400) {
-            return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
-            let result400: any = null;
-            let resultData400 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
-            result400 = ProblemDetails.fromJS(resultData400);
-            return throwException("A server side error occurred.", status, _responseText, _headers, result400);
-            }));
-        } else {
-            return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
-            let resultdefault: any = null;
-            let resultDatadefault = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
-            resultdefault = ProblemDetails.fromJS(resultDatadefault);
-            return throwException("A server side error occurred.", status, _responseText, _headers, resultdefault);
+            return throwException("An unexpected server error occurred.", status, _responseText, _headers);
             }));
         }
+        return _observableOf(null as any);
     }
 
     exportTodos(id: number): Observable<void> {
@@ -553,12 +521,10 @@ export class TodoItemsClient implements ITodoItemsClient {
             }));
         } else if (status !== 200 && status !== 204) {
             return blobToText(responseBlob).pipe(_observableMergeMap((_responseText: string) => {
-            let resultdefault: any = null;
-            let resultDatadefault = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
-            resultdefault = ProblemDetails.fromJS(resultDatadefault);
-            return throwException("A server side error occurred.", status, _responseText, _headers, resultdefault);
+            return throwException("An unexpected server error occurred.", status, _responseText, _headers);
             }));
         }
+        return _observableOf(null as any);
     }
 
     updateTodoItemDetail(id: number, command: UpdateTodoItemDetailCommand): Observable<void> {
diff --git a/src/WebUI/ConfigureServices.cs b/src/WebUI/ConfigureServices.cs
index f5811446b..bd873df03 100644
--- 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,12 +29,12 @@ 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);
 
+        services.AddEndpointsApiExplorer();
+
         services.AddOpenApiDocument(configure => 
             configure.Title = "CleanArchitecture API");
 
diff --git a/src/WebUI/Infrastructure/ApiExceptionFilter.cs b/src/WebUI/Infrastructure/ApiExceptionFilter.cs
index 2259dcd71..9d8294c50 100644
--- a/src/WebUI/Infrastructure/ApiExceptionFilter.cs
+++ b/src/WebUI/Infrastructure/ApiExceptionFilter.cs
@@ -1,22 +1,23 @@
-using CleanArchitecture.Application.Common.Exceptions;
-using Microsoft.AspNetCore.Mvc;
-
-namespace CleanArchitecture.WebUI.Filters;
-
-public class ApiExceptionFilter : IEndpointFilter
-{
-    private readonly IDictionary<Type, Func<Exception, IResult>> _exceptionHandlers;
-
-    public ApiExceptionFilter()
-    {
-        // Register known exception types and handlers.
-        _exceptionHandlers = new Dictionary<Type, Func<Exception, IResult>>
-            {
-                { typeof(ValidationException), HandleValidationException },
-                { typeof(NotFoundException), HandleNotFoundException },
-                { typeof(UnauthorizedAccessException), HandleUnauthorizedAccessException },
-                { typeof(ForbiddenAccessException), HandleForbiddenAccessException },
-            };
+using Ardalis.GuardClauses;
+using CleanArchitecture.Application.Common.Exceptions;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CleanArchitecture.WebUI.Filters;
+
+public class ApiExceptionFilter : IEndpointFilter
+{
+    private readonly IDictionary<Type, Func<Exception, IResult>> _exceptionHandlers;
+
+    public ApiExceptionFilter()
+    {
+        // Register known exception types and handlers.
+        _exceptionHandlers = new Dictionary<Type, Func<Exception, IResult>>
+            {
+                { typeof(ValidationException), HandleValidationException },
+                { typeof(NotFoundException), HandleNotFoundException },
+                { typeof(UnauthorizedAccessException), HandleUnauthorizedAccessException },
+                { typeof(ForbiddenAccessException), HandleForbiddenAccessException },
+            };
     }
 
     public async ValueTask<object?> InvokeAsync(EndpointFilterInvocationContext context, EndpointFilterDelegate next)
@@ -36,71 +37,71 @@ public ApiExceptionFilter()
 
             throw;
         }
-    }
-
-    private IResult? HandleException(Exception ex)
+    }
+
+    private IResult? HandleException(Exception ex)
     {
         var type = ex.GetType();
-
-        if (_exceptionHandlers.ContainsKey(type))
-        {
-            return _exceptionHandlers[type].Invoke(ex);
+
+        if (_exceptionHandlers.ContainsKey(type))
+        {
+            return _exceptionHandlers[type].Invoke(ex);
         }
 
-        return null;
-    }
-
-    private IResult HandleValidationException(Exception ex)
-    {
-        var exception = (ValidationException)ex;
-
-        var details = new ValidationProblemDetails(exception.Errors)
-        {
-            Type = "https://tools.ietf.org/html/rfc7231#section-6.5.1"
-        };
-
-        return Results.BadRequest(details);
-    }
-
-    private IResult HandleNotFoundException(Exception ex)
-    {
-        var exception = (NotFoundException)ex;
-
-        var details = new ProblemDetails()
-        {
-            Type = "https://tools.ietf.org/html/rfc7231#section-6.5.4",
-            Title = "The specified resource was not found.",
-            Detail = exception.Message
-        };
-
-        return Results.NotFound(details);
-    }
-
-    private IResult HandleUnauthorizedAccessException(Exception ex)
-    {
-        var details = new ProblemDetails
-        {
-            Status = StatusCodes.Status401Unauthorized,
-            Title = "Unauthorized",
-            Type = "https://tools.ietf.org/html/rfc7235#section-3.1"
-        };
+        return null;
+    }
+
+    private IResult HandleValidationException(Exception ex)
+    {
+        var exception = (ValidationException)ex;
+
+        var details = new ValidationProblemDetails(exception.Errors)
+        {
+            Type = "https://tools.ietf.org/html/rfc7231#section-6.5.1"
+        };
+
+        return Results.BadRequest(details);
+    }
+
+    private IResult HandleNotFoundException(Exception ex)
+    {
+        var exception = (NotFoundException)ex;
+
+        var details = new ProblemDetails()
+        {
+            Type = "https://tools.ietf.org/html/rfc7231#section-6.5.4",
+            Title = "The specified resource was not found.",
+            Detail = exception.Message
+        };
+
+        return Results.NotFound(details);
+    }
+
+    private IResult HandleUnauthorizedAccessException(Exception ex)
+    {
+        var details = new ProblemDetails
+        {
+            Status = StatusCodes.Status401Unauthorized,
+            Title = "Unauthorized",
+            Type = "https://tools.ietf.org/html/rfc7235#section-3.1"
+        };
 
         return Results.Json(
             details, 
-            statusCode: StatusCodes.Status401Unauthorized);
-    }
-
-    private IResult HandleForbiddenAccessException(Exception ex)
-    {
-        var details = new ProblemDetails
-        {
-            Status = StatusCodes.Status403Forbidden,
-            Title = "Forbidden",
-            Type = "https://tools.ietf.org/html/rfc7231#section-6.5.3"
+            statusCode: StatusCodes.Status401Unauthorized);
+    }
+
+    private IResult HandleForbiddenAccessException(Exception ex)
+    {
+        var details = new ProblemDetails
+        {
+            Status = StatusCodes.Status403Forbidden,
+            Title = "Forbidden",
+            Type = "https://tools.ietf.org/html/rfc7231#section-6.5.3"
         };
 
         return Results.Json(
             details,
-            statusCode: StatusCodes.Status403Forbidden);
+            statusCode: StatusCodes.Status403Forbidden);
     }
-}
+}
diff --git a/src/WebUI/Infrastructure/AbstractEndpoint.cs b/src/WebUI/Infrastructure/EndPointBase.cs
similarity index 94%
rename from src/WebUI/Infrastructure/AbstractEndpoint.cs
rename to src/WebUI/Infrastructure/EndPointBase.cs
index 7f818d7f7..de1f13085 100644
--- a/src/WebUI/Infrastructure/AbstractEndpoint.cs
+++ b/src/WebUI/Infrastructure/EndPointBase.cs
@@ -1,60 +1,60 @@
-namespace CleanArchitecture.WebUI.Infrastructure;
-
-public abstract class AbstractEndpoint : IEndpoint
-{
-    public abstract void Map(WebApplication app);
-
-    public string Name => GetType().Name;
-
-    public string Group => GetType().Namespace!.Split(".")[^1];
-
-    public string BaseRoute => $"/api/{Group}/";
-
-    public RouteHandlerBuilder MapGet(WebApplication app, Delegate handler) => MapGet(app, "", handler);
-
-    public RouteHandlerBuilder MapGet(WebApplication app, string pattern, Delegate handler, bool withDefaults = true)
-    {
-        var builder = app.MapGet(BuildRoutePattern(pattern), handler);
-
-        if (withDefaults)
-        {
-            builder.WithDefaults(this);
-        }
-
-        return builder;
-    }
-
-    public RouteHandlerBuilder MapPost(WebApplication app, Delegate handler) => MapPost(app, "", handler);
-
-    public RouteHandlerBuilder MapPost(WebApplication app, string pattern, Delegate handler)
-    {
-        return app.MapPost(BuildRoutePattern(pattern), handler)
-            .WithDefaults(this);
-    }
-
-    public RouteHandlerBuilder MapPut(WebApplication app, Delegate handler) => MapPut(app, "", handler);
-
-    public RouteHandlerBuilder MapPut(WebApplication app, string pattern, Delegate handler)
-    {
-        return app.MapPut(BuildRoutePattern(pattern), handler)
-            .WithDefaults(this);
-    }
-
-    public RouteHandlerBuilder MapDelete(WebApplication app, Delegate handler) => MapDelete(app, "", handler);
-
-    public RouteHandlerBuilder MapDelete(WebApplication app, string pattern, Delegate handler)
-    {
-        return app.MapDelete(BuildRoutePattern(pattern), handler)
-            .WithDefaults(this);
-    }
-
-    private string BuildRoutePattern(string pattern)
-    {
-        if (!pattern.StartsWith("/"))
-        {
-            pattern = $"{BaseRoute}{pattern}";
-        }
-
-        return pattern;
-    }
-}
+namespace CleanArchitecture.WebUI.Infrastructure;
+
+public abstract class EndPointBase : IEndpoint
+{
+    public abstract void Map(WebApplication app);
+
+    public string Name => GetType().Name;
+
+    public string Group => GetType().Namespace!.Split(".")[^1];
+
+    public string BaseRoute => $"/api/{Group}/";
+
+    public RouteHandlerBuilder MapGet(WebApplication app, Delegate handler) => MapGet(app, "", handler);
+
+    public RouteHandlerBuilder MapGet(WebApplication app, string pattern, Delegate handler, bool withDefaults = true)
+    {
+        var builder = app.MapGet(BuildRoutePattern(pattern), handler);
+
+        if (withDefaults)
+        {
+            builder.WithDefaults(this);
+        }
+
+        return builder;
+    }
+
+    public RouteHandlerBuilder MapPost(WebApplication app, Delegate handler) => MapPost(app, "", handler);
+
+    public RouteHandlerBuilder MapPost(WebApplication app, string pattern, Delegate handler)
+    {
+        return app.MapPost(BuildRoutePattern(pattern), handler)
+            .WithDefaults(this);
+    }
+
+    public RouteHandlerBuilder MapPut(WebApplication app, Delegate handler) => MapPut(app, "", handler);
+
+    public RouteHandlerBuilder MapPut(WebApplication app, string pattern, Delegate handler)
+    {
+        return app.MapPut(BuildRoutePattern(pattern), handler)
+            .WithDefaults(this);
+    }
+
+    public RouteHandlerBuilder MapDelete(WebApplication app, Delegate handler) => MapDelete(app, "", handler);
+
+    public RouteHandlerBuilder MapDelete(WebApplication app, string pattern, Delegate handler)
+    {
+        return app.MapDelete(BuildRoutePattern(pattern), handler)
+            .WithDefaults(this);
+    }
+
+    private string BuildRoutePattern(string pattern)
+    {
+        if (!pattern.StartsWith("/"))
+        {
+            pattern = $"{BaseRoute}{pattern}";
+        }
+
+        return pattern;
+    }
+}
diff --git a/src/WebUI/Infrastructure/RouteHandlerBuilderExtensions.cs b/src/WebUI/Infrastructure/RouteHandlerBuilderExtensions.cs
index 6e32a6e9f..8b42f5e22 100644
--- a/src/WebUI/Infrastructure/RouteHandlerBuilderExtensions.cs
+++ b/src/WebUI/Infrastructure/RouteHandlerBuilderExtensions.cs
@@ -4,7 +4,7 @@ namespace CleanArchitecture.WebUI.Infrastructure;
 
 public static class RouteHandlerBuilderExtensions
 {
-    public static RouteHandlerBuilder WithDefaults(this RouteHandlerBuilder builder, AbstractEndpoint endpoint)
+    public static RouteHandlerBuilder WithDefaults(this RouteHandlerBuilder builder, EndPointBase endpoint)
     {
         return builder
             .WithName($"{endpoint.Group}_{endpoint.Name}")
diff --git a/src/WebUI/OidcConfiguration/OidcConfiguration.cs b/src/WebUI/OidcConfiguration/OidcConfiguration.cs
deleted file mode 100644
index 419b2b3d5..000000000
--- a/src/WebUI/OidcConfiguration/OidcConfiguration.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
-using Microsoft.AspNetCore.Mvc;
-
-namespace CleanArchitecture.WebUI.OidcConfiguration;
-
-public class OidcConfiguration : AbstractEndpoint
-{
-    public override void Map(WebApplication app)
-    {
-        MapGet(app, "/_configuration/{clientId}", (IClientRequestParametersProvider clientRequestParametersProvider, HttpContext context, string clientId) =>
-        {
-            var parameters = clientRequestParametersProvider.GetClientParameters(context, clientId);
-            return Results.Ok(parameters);
-        }, withDefaults: false).ExcludeFromDescription();
-    }
-}
\ No newline at end of file
diff --git a/src/WebUI/Program.cs b/src/WebUI/Program.cs
index 5a5ed9b28..362e6760a 100644
--- 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/TodoItems/CreateTodoItem.cs b/src/WebUI/TodoItems/CreateTodoItem.cs
index 45a7efc13..0a30a6f82 100644
--- a/src/WebUI/TodoItems/CreateTodoItem.cs
+++ b/src/WebUI/TodoItems/CreateTodoItem.cs
@@ -2,7 +2,7 @@
 
 namespace CleanArchitecture.WebUI.TodoItems;
 
-public class CreateTodoItem : AbstractEndpoint
+public class CreateTodoItem : EndPointBase
 {
     public override void Map(WebApplication app)
     {
diff --git a/src/WebUI/TodoItems/DeleteTodoItem.cs b/src/WebUI/TodoItems/DeleteTodoItem.cs
index a802f2847..7bbc4f3d7 100644
--- a/src/WebUI/TodoItems/DeleteTodoItem.cs
+++ b/src/WebUI/TodoItems/DeleteTodoItem.cs
@@ -2,7 +2,7 @@
 
 namespace CleanArchitecture.WebUI.TodoItems;
 
-public class DeleteTodoItem : AbstractEndpoint
+public class DeleteTodoItem : EndPointBase
 {
     public override void Map(WebApplication app)
     {
diff --git a/src/WebUI/TodoItems/UpdateTodoItem.cs b/src/WebUI/TodoItems/UpdateTodoItem.cs
index 951804753..a868a68f0 100644
--- a/src/WebUI/TodoItems/UpdateTodoItem.cs
+++ b/src/WebUI/TodoItems/UpdateTodoItem.cs
@@ -2,7 +2,7 @@
 
 namespace CleanArchitecture.WebUI.TodoItems;
 
-public class UpdateTodoItem : AbstractEndpoint
+public class UpdateTodoItem : EndPointBase
 {
     public override void Map(WebApplication app)
     {
diff --git a/src/WebUI/TodoItems/UpdateTodoItemDetail.cs b/src/WebUI/TodoItems/UpdateTodoItemDetail.cs
index c602d7a74..21ec728c0 100644
--- a/src/WebUI/TodoItems/UpdateTodoItemDetail.cs
+++ b/src/WebUI/TodoItems/UpdateTodoItemDetail.cs
@@ -2,7 +2,7 @@
 
 namespace CleanArchitecture.WebUI.TodoItems;
 
-public class UpdateTodoItemDetail : AbstractEndpoint
+public class UpdateTodoItemDetail : EndPointBase
 {
     public override void Map(WebApplication app)
     {
diff --git a/src/WebUI/TodoLists/CreateTodoList.cs b/src/WebUI/TodoLists/CreateTodoList.cs
index b2179b49c..a2c312524 100644
--- a/src/WebUI/TodoLists/CreateTodoList.cs
+++ b/src/WebUI/TodoLists/CreateTodoList.cs
@@ -2,7 +2,7 @@
 
 namespace CleanArchitecture.WebUI.TodoLists;
 
-public class CreateTodoList : AbstractEndpoint
+public class CreateTodoList : EndPointBase
 {
     public override void Map(WebApplication app)
     {
diff --git a/src/WebUI/TodoLists/DeleteTodoList.cs b/src/WebUI/TodoLists/DeleteTodoList.cs
index 33c556d98..b4e948df1 100644
--- a/src/WebUI/TodoLists/DeleteTodoList.cs
+++ b/src/WebUI/TodoLists/DeleteTodoList.cs
@@ -2,7 +2,7 @@
 
 namespace CleanArchitecture.WebUI.TodoLists;
 
-public class DeleteTodoList : AbstractEndpoint
+public class DeleteTodoList : EndPointBase
 {
     public override void Map(WebApplication app)
     {
diff --git a/src/WebUI/TodoLists/ExportTodos.cs b/src/WebUI/TodoLists/ExportTodos.cs
index a42a809ec..56216ba08 100644
--- a/src/WebUI/TodoLists/ExportTodos.cs
+++ b/src/WebUI/TodoLists/ExportTodos.cs
@@ -2,7 +2,7 @@
 
 namespace CleanArchitecture.WebUI.TodoLists;
 
-public class ExportTodos : AbstractEndpoint
+public class ExportTodos : EndPointBase
 {
     public override void Map(WebApplication app)
     {
diff --git a/src/WebUI/TodoLists/GetTodoLists.cs b/src/WebUI/TodoLists/GetTodoLists.cs
index e7c5e4a2b..b2b9e30d1 100644
--- a/src/WebUI/TodoLists/GetTodoLists.cs
+++ b/src/WebUI/TodoLists/GetTodoLists.cs
@@ -2,7 +2,7 @@
 
 namespace CleanArchitecture.WebUI.TodoLists;
 
-public class GetTodoLists : AbstractEndpoint
+public class GetTodoLists : EndPointBase
 {
     public override void Map(WebApplication app)
     {
diff --git a/src/WebUI/TodoLists/UpdateTodoList.cs b/src/WebUI/TodoLists/UpdateTodoList.cs
index 413d67454..937e0a15f 100644
--- a/src/WebUI/TodoLists/UpdateTodoList.cs
+++ b/src/WebUI/TodoLists/UpdateTodoList.cs
@@ -2,7 +2,7 @@
 
 namespace CleanArchitecture.WebUI.TodoLists;
 
-public class UpdateTodoList : AbstractEndpoint
+public class UpdateTodoList : EndPointBase
 {
     public override void Map(WebApplication app)
     {
diff --git a/src/WebUI/WeatherForecasts/GetWeatherForecasts.cs b/src/WebUI/WeatherForecasts/GetWeatherForecasts.cs
index 7802dd2a4..d5919bfa0 100644
--- a/src/WebUI/WeatherForecasts/GetWeatherForecasts.cs
+++ b/src/WebUI/WeatherForecasts/GetWeatherForecasts.cs
@@ -2,7 +2,7 @@
 
 namespace CleanArchitecture.WebUI.WeatherForecasts;
 
-public class GetWeatherForecasts : AbstractEndpoint
+public class GetWeatherForecasts : EndPointBase
 {
     public override void Map(WebApplication app)
     {
diff --git a/src/WebUI/WebUI.csproj b/src/WebUI/WebUI.csproj
index daa193f77..73c9de70e 100644
--- a/src/WebUI/WebUI.csproj
+++ b/src/WebUI/WebUI.csproj
@@ -26,6 +26,7 @@
         <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0-preview.5.23302.2" />
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0-preview.5.23302.2" />
         <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.0-preview.5.23302.2" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0-preview.5.23302.2" />
         <PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.0-preview.5.23302.2">
             <!-- The SPA Proxy is only used at development time -->
             <Publish>false</Publish>
diff --git a/src/WebUI/wwwroot/api/specification.json b/src/WebUI/wwwroot/api/specification.json
index 2f761cfe5..0fa8b49e5 100644
--- 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",
@@ -26,12 +26,7 @@
               }
             }
           }
-        },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        }
       }
     },
     "/api/TodoLists": {
@@ -65,12 +60,7 @@
               }
             }
           }
-        },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        }
       },
       "get": {
         "tags": [
@@ -88,12 +78,7 @@
               }
             }
           }
-        },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        }
       }
     },
     "/api/TodoLists/{id}": {
@@ -118,12 +103,7 @@
           "200": {
             "description": ""
           }
-        },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        }
       },
       "put": {
         "tags": [
@@ -159,12 +139,7 @@
           "200": {
             "description": ""
           }
-        },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        }
       }
     },
     "/api/TodoLists/Export/{id}": {
@@ -189,12 +164,7 @@
           "200": {
             "description": ""
           }
-        },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        }
       }
     },
     "/api/TodoItems": {
@@ -228,12 +198,7 @@
               }
             }
           }
-        },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        }
       }
     },
     "/api/TodoItems/{id}": {
@@ -258,12 +223,7 @@
           "200": {
             "description": ""
           }
-        },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        }
       },
       "put": {
         "tags": [
@@ -299,12 +259,7 @@
           "200": {
             "description": ""
           }
-        },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        }
       }
     },
     "/api/TodoItems/UpdateDetail/{id}": {
@@ -342,12 +297,7 @@
           "200": {
             "description": ""
           }
-        },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        }
       }
     }
   },
@@ -392,7 +342,7 @@
           "priorityLevels": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/PriorityLevelDto"
+              "$ref": "#/components/schemas/LookupDto"
             }
           },
           "lists": {
@@ -403,15 +353,15 @@
           }
         }
       },
-      "PriorityLevelDto": {
+      "LookupDto": {
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "value": {
+          "id": {
             "type": "integer",
             "format": "int32"
           },
-          "name": {
+          "title": {
             "type": "string",
             "nullable": true
           }
@@ -552,19 +502,6 @@
           3
         ]
       }
-    },
-    "securitySchemes": {
-      "JWT": {
-        "type": "apiKey",
-        "description": "Type into the textbox: Bearer {your JWT token}.",
-        "name": "Authorization",
-        "in": "header"
-      }
-    }
-  },
-  "security": [
-    {
-      "JWT": []
     }
-  ]
+  }
 }
\ No newline at end of file

From 98d505a5d63333a61091a719e2f254038e964ba2 Mon Sep 17 00:00:00 2001
From: Jason Taylor <jasongt@outlook.com>
Date: Tue, 27 Jun 2023 19:40:55 +1000
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=93=A6=20Upgrade=20Acceptance=20Tests?=
 =?UTF-8?q?=20to=20.NET=208?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigurationHelper.cs                    |  3 ++
 .../Features/Login.feature.cs                 | 47 +++++--------------
 .../WebUI.AcceptanceTests/Pages/LoginPage.cs  |  4 +-
 .../StepDefinitions/LoginStepDefinitions.cs   |  2 +-
 .../WebUI.AcceptanceTests.csproj              | 18 +++----
 5 files changed, 28 insertions(+), 46 deletions(-)

diff --git a/tests/WebUI.AcceptanceTests/ConfigurationHelper.cs b/tests/WebUI.AcceptanceTests/ConfigurationHelper.cs
index 938ef4ca3..8c939637f 100644
--- a/tests/WebUI.AcceptanceTests/ConfigurationHelper.cs
+++ b/tests/WebUI.AcceptanceTests/ConfigurationHelper.cs
@@ -21,6 +21,9 @@ public static string GetBaseUrl()
         if (_baseUrl == null)
         {
             _baseUrl = _configuration["BaseUrl"];
+
+            ArgumentNullException.ThrowIfNull(_baseUrl);
+
             _baseUrl = _baseUrl.TrimEnd('/');
         }
 
diff --git a/tests/WebUI.AcceptanceTests/Features/Login.feature.cs b/tests/WebUI.AcceptanceTests/Features/Login.feature.cs
index 94e3431ab..69e40ad4f 100644
--- a/tests/WebUI.AcceptanceTests/Features/Login.feature.cs
+++ b/tests/WebUI.AcceptanceTests/Features/Login.feature.cs
@@ -27,7 +27,7 @@ public partial class LoginFeature
         
         private TechTalk.SpecFlow.ITestRunner testRunner;
         
-        private string[] _featureTags = new string[] {
+        private static string[] featureTags = new string[] {
                 "Login"};
         
 #line 1 "Login.feature"
@@ -37,8 +37,7 @@ public partial class LoginFeature
         public virtual void FeatureSetup()
         {
             testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
-            TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Features", "Login", "    User can log in", ProgrammingLanguage.CSharp, new string[] {
-                        "Login"});
+            TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Features", "Login", "    User can log in", ProgrammingLanguage.CSharp, featureTags);
             testRunner.OnFeatureStart(featureInfo);
         }
         
@@ -50,53 +49,43 @@ public virtual void FeatureTearDown()
         }
         
         [NUnit.Framework.SetUpAttribute()]
-        public virtual void TestInitialize()
+        public void TestInitialize()
         {
         }
         
         [NUnit.Framework.TearDownAttribute()]
-        public virtual void TestTearDown()
+        public void TestTearDown()
         {
             testRunner.OnScenarioEnd();
         }
         
-        public virtual void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
+        public void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
         {
             testRunner.OnScenarioInitialize(scenarioInfo);
             testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs<NUnit.Framework.TestContext>(NUnit.Framework.TestContext.CurrentContext);
         }
         
-        public virtual void ScenarioStart()
+        public void ScenarioStart()
         {
             testRunner.OnScenarioStart();
         }
         
-        public virtual void ScenarioCleanup()
+        public void ScenarioCleanup()
         {
             testRunner.CollectScenarioErrors();
         }
         
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("User can log in with valid credentials")]
-        public virtual void UserCanLogInWithValidCredentials()
+        public void UserCanLogInWithValidCredentials()
         {
             string[] tagsOfScenario = ((string[])(null));
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("User can log in with valid credentials", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("User can log in with valid credentials", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 5
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -118,25 +107,15 @@ public virtual void UserCanLogInWithValidCredentials()
         
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("User cannot log in with invalid credentials")]
-        public virtual void UserCannotLogInWithInvalidCredentials()
+        public void UserCannotLogInWithInvalidCredentials()
         {
             string[] tagsOfScenario = ((string[])(null));
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("User cannot log in with invalid credentials", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("User cannot log in with invalid credentials", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 10
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
diff --git a/tests/WebUI.AcceptanceTests/Pages/LoginPage.cs b/tests/WebUI.AcceptanceTests/Pages/LoginPage.cs
index 6b128569d..72aa9ed40 100644
--- a/tests/WebUI.AcceptanceTests/Pages/LoginPage.cs
+++ b/tests/WebUI.AcceptanceTests/Pages/LoginPage.cs
@@ -8,7 +8,7 @@ public LoginPage(IBrowser browser, IPage page)
         Page = page;
     }
 
-    public override string PagePath => $"{BaseUrl}/authentication/login";
+    public override string PagePath => $"{BaseUrl}/Identity/Account/Login";
 
     public override IBrowser Browser { get; }
 
@@ -24,7 +24,7 @@ public Task ClickLogin()
         => Page.Locator("#login-submit").ClickAsync();
 
     public Task<string?> ProfileLinkText()
-        => Page.Locator("a[href='/authentication/profile']").TextContentAsync();
+        => Page.Locator("a[href='/Identity/Account/Manage']").TextContentAsync();
 
     public Task<bool> InvalidLoginAttemptMessageVisible()
         => Page.Locator("text=Invalid login attempt.").IsVisibleAsync();
diff --git a/tests/WebUI.AcceptanceTests/StepDefinitions/LoginStepDefinitions.cs b/tests/WebUI.AcceptanceTests/StepDefinitions/LoginStepDefinitions.cs
index a007a83f6..90879b93b 100644
--- a/tests/WebUI.AcceptanceTests/StepDefinitions/LoginStepDefinitions.cs
+++ b/tests/WebUI.AcceptanceTests/StepDefinitions/LoginStepDefinitions.cs
@@ -53,7 +53,7 @@ public async Task TheyLogInSuccessfully()
         var profileLinkText = await _loginPage.ProfileLinkText();
 
         profileLinkText.Should().NotBeNull();
-        profileLinkText.Should().Be("Hello administrator@localhost");
+        profileLinkText.Should().Be("Account");
     }
 
     [When("the user logs in with invalid credentials")]
diff --git a/tests/WebUI.AcceptanceTests/WebUI.AcceptanceTests.csproj b/tests/WebUI.AcceptanceTests/WebUI.AcceptanceTests.csproj
index 41b3fb256..871e7269e 100644
--- a/tests/WebUI.AcceptanceTests/WebUI.AcceptanceTests.csproj
+++ b/tests/WebUI.AcceptanceTests/WebUI.AcceptanceTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
       <RootNamespace>CleanArchitecture.WebUI.AcceptanceTests</RootNamespace>
       <AssemblyName>CleanArchitecture.WebUI.AcceptanceTests</AssemblyName>
       <Nullable>enable</Nullable>
@@ -19,16 +19,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-preview.5.23280.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0-preview.5.23280.8" />
 
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Microsoft.Playwright" Version="1.22.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Microsoft.Playwright" Version="1.35.0" />
     <PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />
-    <PackageReference Include="SpecFlow.NUnit" Version="3.9.40" />
-    <PackageReference Include="nunit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Include="FluentAssertions" Version="6.2.0" />
+    <PackageReference Include="SpecFlow.NUnit" Version="3.9.74" />
+    <PackageReference Include="nunit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="FluentAssertions" Version="6.11.0" />
   </ItemGroup>
 
 </Project>