Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 4 additions & 1 deletion crates/keystone/src/api/v3/auth/token/delete.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use axum::{
use serde_json::{Value, json, to_value};
use tracing::error;

use openstack_keystone_api_types::v3::auth::token::TokenBuilder;
use openstack_keystone_core::auth::ExecutionContext;

use crate::api::{auth::Auth, error::KeystoneApiError};
Expand Down Expand Up @@ -76,13 +77,15 @@ pub(super) async fn delete(
identifier: String::new(),
})?;

let token = TokenBuilder::try_from(&vsc)?.build()?;

state
.policy_enforcer
.enforce(
"identity/auth/token/revoke",
&user_auth,
Value::Null,
Some(to_value(json!({"token": &vsc.token()?}))?),
Some(to_value(json!({"token": &token}))?),
)
.await?;

Expand Down
8 changes: 4 additions & 4 deletions crates/keystone/src/api/v3/auth/token/show.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,19 @@ pub(super) async fn show(
identifier: String::new(),
})?;

let token = TokenBuilder::try_from(&vsc)?.build()?;

state
.policy_enforcer
.enforce(
"identity/auth/token/show",
&user_auth,
Value::Null,
Some(to_value(json!({"token": &vsc.token()?}))?),
Some(to_value(json!({"token": &token}))?),
)
.await?;

let mut response_token = TokenResponse {
token: TokenBuilder::try_from(&vsc)?.build()?,
};
let mut response_token = TokenResponse { token };

if !query.nocatalog.is_some_and(|x| x) {
let catalog: Catalog = Catalog(
Expand Down
Loading