Merge remote-tracking branch 'origin/main' into quenting/admin-api/optional-count

Author: sandhose

.github/workflows/build.yaml

@@ -268,7 +268,7 @@ jobs:
               mirrors = ["mirror.gcr.io"]
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.5.0
+        uses: docker/login-action@v3.6.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}

Cargo.lock

@@ -88,19 +88,19 @@ version = "0.1.89"
 
 # High-level error handling
 [workspace.dependencies.anyhow]
-version = "1.0.99"
+version = "1.0.100"
 
 # Assert that a value matches a pattern
 [workspace.dependencies.assert_matches]
 version = "1.5.0"
 
 # HTTP router
 [workspace.dependencies.axum]
-version = "0.8.4"
+version = "0.8.5"
 
 # Extra utilities for Axum
 [workspace.dependencies.axum-extra]
-version = "0.10.1"
+version = "0.10.2"
 features = ["cookie-private", "cookie-key-expansion", "typed-header"]
 
 # Axum macros
@@ -137,7 +137,7 @@ version = "1.10.1"
 
 # UTF-8 paths
 [workspace.dependencies.camino]
-version = "1.2.0"
+version = "1.2.1"
 features = ["serde1"]
 
 # ChaCha20Poly1305 AEAD
@@ -167,7 +167,7 @@ features = ["serde", "clock"]
 
 # CLI argument parsing
 [workspace.dependencies.clap]
-version = "4.5.47"
+version = "4.5.48"
 features = ["derive"]
 
 # Object Identifiers (OIDs) as constants
@@ -476,7 +476,7 @@ features = ["std", "pkcs5", "encryption"]
 
 # Public Suffix List
 [workspace.dependencies.psl]
-version = "2.1.141"
+version = "2.1.145"
 
 # High-precision clock
 [workspace.dependencies.quanta]
@@ -582,7 +582,7 @@ version = "0.42.0"
 
 # Serialization and deserialization
 [workspace.dependencies.serde]
-version = "1.0.225"
+version = "1.0.228"
 features = ["derive"] # Most of the time, if we need serde, we need derive
 
 # JSON serialization and deserialization
@@ -652,7 +652,7 @@ version = "0.1.17"
 
 # Tokio rustls integration
 [workspace.dependencies.tokio-rustls]
-version = "0.26.3"
+version = "0.26.4"
 
 # Tokio test utilities
 [workspace.dependencies.tokio-test]

Cargo.toml

@@ -390,9 +390,10 @@ impl Options {
                 info!("The following users can request admin privileges ({total} total):");
                 loop {
                     let page = repo.user().list(filter, cursor).await?;
-                    for user in page.edges {
+                    for edge in page.edges {
+                        let user = edge.node;
                         info!(%user.id, username = %user.username);
-                        cursor = cursor.after(user.id);
+                        cursor = cursor.after(edge.cursor);
                     }
 
                     if !page.has_next_page {

crates/cli/src/commands/manage.rs

@@ -132,7 +132,8 @@ pub async fn config_sync(
         let mut existing_enabled_ids = BTreeSet::new();
         let mut existing_disabled = BTreeMap::new();
         // Process the existing providers
-        for provider in page.edges {
+        for edge in page.edges {
+            let provider = edge.node;
             if provider.enabled() {
                 if config_ids.contains(&provider.id) {
                     existing_enabled_ids.insert(provider.id);

crates/cli/src/sync.rs

@@ -6,7 +6,7 @@
 
 #![allow(clippy::module_name_repetitions)]
 
-use mas_storage::Pagination;
+use mas_storage::{Pagination, pagination::Edge};
 use schemars::JsonSchema;
 use serde::Serialize;
 use ulid::Ulid;
@@ -119,22 +119,26 @@ impl<T: Resource> PaginatedResponse<T> {
                     base,
                     current_pagination
                         .clear_before()
-                        .after(page.edges.last().unwrap().id()),
+                        .after(page.edges.last().unwrap().cursor),
                 )
             }),
             prev: if page.has_previous_page {
                 Some(url_with_pagination(
                     base,
                     current_pagination
                         .clear_after()
-                        .before(page.edges.first().unwrap().id()),
+                        .before(page.edges.first().unwrap().cursor),
                 ))
             } else {
                 None
             },
         };
 
-        let data = page.edges.into_iter().map(SingleResource::new).collect();
+        let data = page
+            .edges
+            .into_iter()
+            .map(SingleResource::from_edge)
+            .collect();
 
         Self {
             meta: PaginationMeta { count },
@@ -176,6 +180,31 @@ struct SingleResource<T> {
 
     /// Related links
     links: SelfLinks,
+
+    /// Metadata about the resource
+    #[serde(skip_serializing_if = "SingleResourceMeta::is_empty")]
+    meta: SingleResourceMeta,
+}
+
+/// Metadata associated with a resource
+#[derive(Serialize, JsonSchema)]
+struct SingleResourceMeta {
+    /// Information about the pagination of the resource
+    #[serde(skip_serializing_if = "Option::is_none")]
+    page: Option<SingleResourceMetaPage>,
+}
+
+impl SingleResourceMeta {
+    fn is_empty(&self) -> bool {
+        self.page.is_none()
+    }
+}
+
+/// Pagination metadata for a resource
+#[derive(Serialize, JsonSchema)]
+struct SingleResourceMetaPage {
+    /// The cursor of this resource in the paginated result
+    cursor: String,
 }
 
 impl<T: Resource> SingleResource<T> {
@@ -186,8 +215,16 @@ impl<T: Resource> SingleResource<T> {
             id: resource.id(),
             attributes: resource,
             links: SelfLinks { self_ },
+            meta: SingleResourceMeta { page: None },
         }
     }
+
+    fn from_edge<C: ToString>(edge: Edge<T, C>) -> Self {
+        let cursor = edge.cursor.to_string();
+        let mut resource = Self::new(edge.node);
+        resource.meta.page = Some(SingleResourceMetaPage { cursor });
+        resource
+    }
 }
 
 /// Related links