Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GET /me/tokens: Add crate_scopes and endpoint_scopes fields #6310

Merged
merged 4 commits into from
Apr 12, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
ApiToken: Serialize crate_scopes and endpoint_scopes fields
Turbo87 committed Apr 12, 2023

Verified

This commit was signed with the committer’s verified signature.
Turbo87 Tobias Bieniek
commit ad8d6c3db15b01084ceb616c440d98a58aec193c
2 changes: 0 additions & 2 deletions src/models/token.rs
Original file line number Diff line number Diff line change
@@ -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>>,
}

12 changes: 11 additions & 1 deletion src/tests/routes/me/tokens/list.rs
Original file line number Diff line number Diff line change
@@ -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])
)),
]
});

Original file line number Diff line number Diff line change
@@ -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