ApiToken: Serialize crate_scopes and endpoint_scopes fields

Author: Turbo87

src/models/token.rs

@@ -27,10 +27,8 @@ pub struct ApiToken {
     #[serde(skip)]
     pub revoked: bool,
     /// `None` or a list of crate scope patterns (see RFC #2947)
-    #[serde(skip)]
     pub crate_scopes: Option<Vec<CrateScope>>,
     /// A list of endpoint scopes or `None` for the `legacy` endpoint scope (see RFC #2947)
-    #[serde(skip)]
     pub endpoint_scopes: Option<Vec<EndpointScope>>,
 }
 

src/tests/routes/me/tokens/list.rs

@@ -1,5 +1,6 @@
 use crate::util::insta::{self, assert_yaml_snapshot};
 use crate::util::{RequestHelper, TestApp};
+use cargo_registry::models::token::{CrateScope, EndpointScope};
 use cargo_registry::models::ApiToken;
 use http::StatusCode;
 
@@ -32,7 +33,16 @@ fn list_tokens() {
     app.db(|conn| {
         vec![
             assert_ok!(ApiToken::insert(conn, id, "bar")),
-            assert_ok!(ApiToken::insert(conn, id, "baz")),
+            assert_ok!(ApiToken::insert_with_scopes(
+                conn,
+                id,
+                "baz",
+                Some(vec![
+                    CrateScope::try_from("serde").unwrap(),
+                    CrateScope::try_from("serde-*").unwrap()
+                ]),
+                Some(vec![EndpointScope::PublishUpdate])
+            )),
         ]
     });
 

src/tests/routes/me/tokens/snapshots/all__routes__me__tokens__list__list_tokens.snap

@@ -3,11 +3,18 @@ source: src/tests/routes/me/tokens/list.rs
 expression: response.into_json()
 ---
 api_tokens:
-  - created_at: "[datetime]"
+  - crate_scopes: ~
+    created_at: "[datetime]"
+    endpoint_scopes: ~
     id: "[id]"
     last_used_at: "[datetime]"
     name: bar
-  - created_at: "[datetime]"
+  - crate_scopes:
+      - serde
+      - serde-*
+    created_at: "[datetime]"
+    endpoint_scopes:
+      - publish-update
     id: "[id]"
     last_used_at: "[datetime]"
     name: baz