From 0aa16dd3b1eddfda51a06e60d9c6c68decdb7e6b Mon Sep 17 00:00:00 2001 From: Quentin de Quelen Date: Tue, 7 Apr 2020 19:10:32 +0200 Subject: [PATCH] add key endpoint --- meilisearch-http/src/main.rs | 1 + meilisearch-http/src/routes/key.rs | 18 ++++++++---------- meilisearch-http/src/routes/mod.rs | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/meilisearch-http/src/main.rs b/meilisearch-http/src/main.rs index 6217c40e5..34baae454 100644 --- a/meilisearch-http/src/main.rs +++ b/meilisearch-http/src/main.rs @@ -63,6 +63,7 @@ async fn main() -> Result<(), MainError> { .service(routes::document::update_documents) .service(routes::document::delete_documents) .service(routes::document::clear_all_documents) + .service(routes::key::list) .service(routes::health::get_health) .service(routes::health::change_healthyness) ) diff --git a/meilisearch-http/src/routes/key.rs b/meilisearch-http/src/routes/key.rs index fe0feacf4..52265bc2f 100644 --- a/meilisearch-http/src/routes/key.rs +++ b/meilisearch-http/src/routes/key.rs @@ -1,17 +1,15 @@ -use crate::error::SResult; -use crate::helpers::tide::RequestExt; -use crate::helpers::tide::ACL::*; use crate::Data; use serde_json::json; -use tide::{Request, Response}; +use actix_web::*; -pub async fn list(ctx: Request) -> SResult { - ctx.is_allowed(Admin)?; +#[get("/keys")] +pub async fn list( + data: web::Data, +) -> Result { + let keys = &data.api_keys; - let keys = &ctx.state().api_keys; - - Ok(tide::Response::new(200).body_json(&json!({ + HttpResponse::Ok().json(&json!({ "private": keys.private, "public": keys.public, - }))?) + })).await } diff --git a/meilisearch-http/src/routes/mod.rs b/meilisearch-http/src/routes/mod.rs index b518517cc..8851d26f3 100644 --- a/meilisearch-http/src/routes/mod.rs +++ b/meilisearch-http/src/routes/mod.rs @@ -5,7 +5,7 @@ use serde::Serialize; pub mod document; pub mod health; // pub mod index; -// pub mod key; +pub mod key; // pub mod search; // pub mod setting; // pub mod stats;