|
16 | 16 | * |
17 | 17 | */ |
18 | 18 |
|
| 19 | +use std::collections::HashMap; |
| 20 | + |
19 | 21 | use actix_web::{web, HttpRequest, Responder}; |
20 | 22 |
|
21 | 23 | use crate::{ |
@@ -43,19 +45,17 @@ pub async fn home_api(req: HttpRequest) -> Result<impl Responder, PrismHomeError |
43 | 45 | pub async fn home_search(req: HttpRequest) -> Result<impl Responder, PrismHomeError> { |
44 | 46 | let key = extract_session_key_from_req(&req) |
45 | 47 | .map_err(|err| PrismHomeError::Anyhow(anyhow::Error::msg(err.to_string())))?; |
46 | | - let query_string = req.query_string(); |
47 | | - if query_string.is_empty() { |
| 48 | + let query_map = web::Query::<HashMap<String, String>>::from_query(req.query_string()) |
| 49 | + .map_err(|_| PrismHomeError::InvalidQueryParameter(HOME_SEARCH_QUERY_PARAM.to_string()))?; |
| 50 | + |
| 51 | + if query_map.is_empty() { |
48 | 52 | return Ok(web::Json(serde_json::json!({}))); |
49 | 53 | } |
50 | | - // Validate query string format |
51 | | - let query_parts: Vec<&str> = query_string.split('=').collect(); |
52 | | - if query_parts.len() != 2 || query_parts[0] != HOME_SEARCH_QUERY_PARAM { |
53 | | - return Err(PrismHomeError::InvalidQueryParameter( |
54 | | - HOME_SEARCH_QUERY_PARAM.to_string(), |
55 | | - )); |
56 | | - } |
57 | 54 |
|
58 | | - let query_value = query_parts[1].to_lowercase(); |
| 55 | + let query_value = query_map |
| 56 | + .get(HOME_SEARCH_QUERY_PARAM) |
| 57 | + .ok_or_else(|| PrismHomeError::InvalidQueryParameter(HOME_SEARCH_QUERY_PARAM.to_string()))? |
| 58 | + .to_lowercase(); |
59 | 59 | let res = generate_home_search_response(&key, &query_value).await?; |
60 | 60 | let json_res = serde_json::to_value(res) |
61 | 61 | .map_err(|err| PrismHomeError::Anyhow(anyhow::Error::msg(err.to_string())))?; |
|
0 commit comments