From 060e9e60bff549b65cef12586c4fab0ec598a7fe Mon Sep 17 00:00:00 2001
From: Jimmy Vo <huynhmaivo82@gmail.com>
Date: Mon, 3 Feb 2025 14:55:57 -0500
Subject: [PATCH] [pm-337] Remove the continuation token from the
 ListResponseModel. (#5192)

---
 .../Public/Controllers/EventsController.cs             |  4 ++--
 src/Api/Models/Public/Response/ListResponseModel.cs    |  7 +------
 .../Models/Public/Response/PagedListResponseModel.cs   | 10 ++++++++++
 3 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 src/Api/Models/Public/Response/PagedListResponseModel.cs

diff --git a/src/Api/AdminConsole/Public/Controllers/EventsController.cs b/src/Api/AdminConsole/Public/Controllers/EventsController.cs
index d2e198de17..992b7453aa 100644
--- a/src/Api/AdminConsole/Public/Controllers/EventsController.cs
+++ b/src/Api/AdminConsole/Public/Controllers/EventsController.cs
@@ -36,7 +36,7 @@ public class EventsController : Controller
     /// If no filters are provided, it will return the last 30 days of event for the organization.
     /// </remarks>
     [HttpGet]
-    [ProducesResponseType(typeof(ListResponseModel<EventResponseModel>), (int)HttpStatusCode.OK)]
+    [ProducesResponseType(typeof(PagedListResponseModel<EventResponseModel>), (int)HttpStatusCode.OK)]
     public async Task<IActionResult> List([FromQuery] EventFilterRequestModel request)
     {
         var dateRange = request.ToDateRange();
@@ -65,7 +65,7 @@ public class EventsController : Controller
         }
 
         var eventResponses = result.Data.Select(e => new EventResponseModel(e));
-        var response = new ListResponseModel<EventResponseModel>(eventResponses, result.ContinuationToken);
+        var response = new PagedListResponseModel<EventResponseModel>(eventResponses, result.ContinuationToken);
         return new JsonResult(response);
     }
 }
diff --git a/src/Api/Models/Public/Response/ListResponseModel.cs b/src/Api/Models/Public/Response/ListResponseModel.cs
index 0865be3e8e..a55d6f62bb 100644
--- a/src/Api/Models/Public/Response/ListResponseModel.cs
+++ b/src/Api/Models/Public/Response/ListResponseModel.cs
@@ -4,10 +4,9 @@ namespace Bit.Api.Models.Public.Response;
 
 public class ListResponseModel<T> : IResponseModel where T : IResponseModel
 {
-    public ListResponseModel(IEnumerable<T> data, string continuationToken = null)
+    public ListResponseModel(IEnumerable<T> data)
     {
         Data = data;
-        ContinuationToken = continuationToken;
     }
 
     /// <summary>
@@ -21,8 +20,4 @@ public class ListResponseModel<T> : IResponseModel where T : IResponseModel
     /// </summary>
     [Required]
     public IEnumerable<T> Data { get; set; }
-    /// <summary>
-    /// A cursor for use in pagination.
-    /// </summary>
-    public string ContinuationToken { get; set; }
 }
diff --git a/src/Api/Models/Public/Response/PagedListResponseModel.cs b/src/Api/Models/Public/Response/PagedListResponseModel.cs
new file mode 100644
index 0000000000..b0f25cb4f8
--- /dev/null
+++ b/src/Api/Models/Public/Response/PagedListResponseModel.cs
@@ -0,0 +1,10 @@
+namespace Bit.Api.Models.Public.Response;
+
+public class PagedListResponseModel<T>(IEnumerable<T> data, string continuationToken) : ListResponseModel<T>(data)
+    where T : IResponseModel
+{
+    /// <summary>
+    /// A cursor for use in pagination.
+    /// </summary>
+    public string ContinuationToken { get; set; } = continuationToken;
+}