mirror of
https://github.com/fawney19/Aether.git
synced 2026-10-03 16:07:46 +08:00
fix(admin): return user API key IP rules
This commit is contained in:
@@ -64,6 +64,7 @@ pub(crate) async fn build_admin_list_user_api_keys_response(
|
|||||||
"rate_limit": record.rate_limit,
|
"rate_limit": record.rate_limit,
|
||||||
"concurrent_limit": record.concurrent_limit,
|
"concurrent_limit": record.concurrent_limit,
|
||||||
"feature_settings": record.feature_settings,
|
"feature_settings": record.feature_settings,
|
||||||
|
"ip_rules": record.ip_rules,
|
||||||
"expires_at": format_optional_unix_secs_iso8601(record.expires_at_unix_secs),
|
"expires_at": format_optional_unix_secs_iso8601(record.expires_at_unix_secs),
|
||||||
"last_used_at": format_optional_unix_secs_iso8601(record.last_used_at_unix_secs),
|
"last_used_at": format_optional_unix_secs_iso8601(record.last_used_at_unix_secs),
|
||||||
"created_at": format_optional_unix_secs_iso8601(record.created_at_unix_secs),
|
"created_at": format_optional_unix_secs_iso8601(record.created_at_unix_secs),
|
||||||
|
|||||||
@@ -2732,7 +2732,9 @@ async fn gateway_lists_admin_user_api_keys_locally_with_trusted_admin_principal(
|
|||||||
Some(1_711_000_100),
|
Some(1_711_000_100),
|
||||||
Some(1_711_000_101),
|
Some(1_711_000_101),
|
||||||
)
|
)
|
||||||
.expect("export activity timestamps should build")]),
|
.expect("export activity timestamps should build")
|
||||||
|
.with_ip_rules(Some(json!(["203.0.113.0/24"])))
|
||||||
|
.expect("export IP rules should build")]),
|
||||||
);
|
);
|
||||||
let user_repository = Arc::new(InMemoryUserReadRepository::seed_auth_users(vec![
|
let user_repository = Arc::new(InMemoryUserReadRepository::seed_auth_users(vec![
|
||||||
sample_admin_user("user-1"),
|
sample_admin_user("user-1"),
|
||||||
@@ -2769,6 +2771,10 @@ async fn gateway_lists_admin_user_api_keys_locally_with_trusted_admin_principal(
|
|||||||
assert_eq!(payload["api_keys"][0]["key_display"], "sk...-1");
|
assert_eq!(payload["api_keys"][0]["key_display"], "sk...-1");
|
||||||
assert_eq!(payload["api_keys"][0]["is_active"], true);
|
assert_eq!(payload["api_keys"][0]["is_active"], true);
|
||||||
assert_eq!(payload["api_keys"][0]["is_locked"], false);
|
assert_eq!(payload["api_keys"][0]["is_locked"], false);
|
||||||
|
assert_eq!(
|
||||||
|
payload["api_keys"][0]["ip_rules"],
|
||||||
|
json!(["203.0.113.0/24"])
|
||||||
|
);
|
||||||
assert_eq!(payload["api_keys"][0]["total_requests"], 9);
|
assert_eq!(payload["api_keys"][0]["total_requests"], 9);
|
||||||
assert_eq!(payload["api_keys"][0]["total_cost_usd"], 1.5);
|
assert_eq!(payload["api_keys"][0]["total_cost_usd"], 1.5);
|
||||||
assert_eq!(payload["api_keys"][0]["rate_limit"], 60);
|
assert_eq!(payload["api_keys"][0]["rate_limit"], 60);
|
||||||
|
|||||||
Reference in New Issue
Block a user