mirror of
https://github.com/meilisearch/MeiliSearch
synced 2024-11-26 06:44:27 +01:00
Bug(auth): Parse YMD date
Use NaiveDate to parse YMD date instead of NaiveDatetime fix #2017
This commit is contained in:
parent
eaff393c76
commit
37329e0784
@ -1,7 +1,7 @@
|
|||||||
use crate::action::Action;
|
use crate::action::Action;
|
||||||
use crate::error::{AuthControllerError, Result};
|
use crate::error::{AuthControllerError, Result};
|
||||||
use crate::store::{KeyId, KEY_ID_LENGTH};
|
use crate::store::{KeyId, KEY_ID_LENGTH};
|
||||||
use chrono::{DateTime, NaiveDateTime, Utc};
|
use chrono::{DateTime, NaiveDate, NaiveDateTime, Utc};
|
||||||
use rand::Rng;
|
use rand::Rng;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_json::{from_value, Value};
|
use serde_json::{from_value, Value};
|
||||||
@ -142,8 +142,8 @@ fn parse_expiration_date(value: &Value) -> Result<Option<DateTime<Utc>>> {
|
|||||||
.map(|naive| DateTime::from_utc(naive, Utc))
|
.map(|naive| DateTime::from_utc(naive, Utc))
|
||||||
})
|
})
|
||||||
.or_else(|_| {
|
.or_else(|_| {
|
||||||
NaiveDateTime::parse_from_str(string, "%Y-%m-%d")
|
NaiveDate::parse_from_str(string, "%Y-%m-%d")
|
||||||
.map(|naive| DateTime::from_utc(naive, Utc))
|
.map(|naive| DateTime::from_utc(naive.and_hms(0, 0, 0), Utc))
|
||||||
})
|
})
|
||||||
.map_err(|_| AuthControllerError::InvalidApiKeyExpiresAt(value.clone()))
|
.map_err(|_| AuthControllerError::InvalidApiKeyExpiresAt(value.clone()))
|
||||||
// check if the key is already expired.
|
// check if the key is already expired.
|
||||||
|
@ -62,6 +62,65 @@ async fn add_valid_api_key() {
|
|||||||
assert_eq!(code, 201);
|
assert_eq!(code, 201);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[actix_rt::test]
|
||||||
|
async fn add_valid_api_key_expired_at() {
|
||||||
|
let mut server = Server::new_auth().await;
|
||||||
|
server.use_api_key("MASTER_KEY");
|
||||||
|
|
||||||
|
let content = json!({
|
||||||
|
"description": "Indexing API key",
|
||||||
|
"indexes": ["products"],
|
||||||
|
"actions": [
|
||||||
|
"search",
|
||||||
|
"documents.add",
|
||||||
|
"documents.get",
|
||||||
|
"documents.delete",
|
||||||
|
"indexes.create",
|
||||||
|
"indexes.get",
|
||||||
|
"indexes.update",
|
||||||
|
"indexes.delete",
|
||||||
|
"tasks.get",
|
||||||
|
"settings.get",
|
||||||
|
"settings.update",
|
||||||
|
"stats.get",
|
||||||
|
"dumps.create",
|
||||||
|
"dumps.get"
|
||||||
|
],
|
||||||
|
"expiresAt": "2050-11-13"
|
||||||
|
});
|
||||||
|
|
||||||
|
let (response, code) = server.add_api_key(content).await;
|
||||||
|
assert!(response["key"].is_string(), "{:?}", response);
|
||||||
|
assert!(response["expiresAt"].is_string());
|
||||||
|
assert!(response["createdAt"].is_string());
|
||||||
|
assert!(response["updatedAt"].is_string());
|
||||||
|
|
||||||
|
let expected_response = json!({
|
||||||
|
"description": "Indexing API key",
|
||||||
|
"indexes": ["products"],
|
||||||
|
"actions": [
|
||||||
|
"search",
|
||||||
|
"documents.add",
|
||||||
|
"documents.get",
|
||||||
|
"documents.delete",
|
||||||
|
"indexes.create",
|
||||||
|
"indexes.get",
|
||||||
|
"indexes.update",
|
||||||
|
"indexes.delete",
|
||||||
|
"tasks.get",
|
||||||
|
"settings.get",
|
||||||
|
"settings.update",
|
||||||
|
"stats.get",
|
||||||
|
"dumps.create",
|
||||||
|
"dumps.get"
|
||||||
|
],
|
||||||
|
"expiresAt": "2050-11-13T00:00:00Z"
|
||||||
|
});
|
||||||
|
|
||||||
|
assert_json_include!(actual: response, expected: expected_response);
|
||||||
|
assert_eq!(code, 201);
|
||||||
|
}
|
||||||
|
|
||||||
#[actix_rt::test]
|
#[actix_rt::test]
|
||||||
async fn add_valid_api_key_no_description() {
|
async fn add_valid_api_key_no_description() {
|
||||||
let mut server = Server::new_auth().await;
|
let mut server = Server::new_auth().await;
|
||||||
|
Loading…
Reference in New Issue
Block a user