diff --git a/src/api/v1/pow/verify_pow.rs b/src/api/v1/pow/verify_pow.rs index e7b612ff..5f443fb3 100644 --- a/src/api/v1/pow/verify_pow.rs +++ b/src/api/v1/pow/verify_pow.rs @@ -55,8 +55,8 @@ mod tests { const NAME: &str = "powverifyusr"; const PASSWORD: &str = "testingpas"; const EMAIL: &str = "verifyuser@a.com"; - const VERIFY_URL: &str = "/api/v1/mcaptcha/pow/verify"; - const GET_URL: &str = "/api/v1/mcaptcha/pow/config"; + const VERIFY_URL: &str = "/api/v1/pow/verify"; + const GET_URL: &str = "/api/v1/pow/config"; // const UPDATE_URL: &str = "/api/v1/mcaptcha/domain/token/duration/update"; { diff --git a/src/api/v1/pow/verify_token.rs b/src/api/v1/pow/verify_token.rs index cadaf6a8..f64b37fc 100644 --- a/src/api/v1/pow/verify_token.rs +++ b/src/api/v1/pow/verify_token.rs @@ -29,7 +29,7 @@ pub struct CaptchaValidateResp { // API keys are mcaptcha actor names -#[post("/api/v1/pow/siteverify")] +#[post("/siteverify")] pub async fn validate_captcha_token( payload: web::Json, data: web::Data, @@ -61,8 +61,8 @@ mod tests { const NAME: &str = "enterprisetken"; const PASSWORD: &str = "testingpas"; const EMAIL: &str = "verifyuser@enter.com"; - const VERIFY_CAPTCHA_URL: &str = "/api/v1/mcaptcha/pow/verify"; - const GET_URL: &str = "/api/v1/mcaptcha/pow/config"; + const VERIFY_CAPTCHA_URL: &str = "/api/v1/pow/verify"; + const GET_URL: &str = "/api/v1/pow/config"; const VERIFY_TOKEN_URL: &str = "/api/v1/pow/siteverify"; // const UPDATE_URL: &str = "/api/v1/mcaptcha/domain/token/duration/update"; diff --git a/src/settings.rs b/src/settings.rs index c90a4a3a..35853ab8 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -48,7 +48,7 @@ impl Server { if let Some(prefix) = self.url_prefix.clone() { self.url_prefix = Some(prefix.trim().into()); if prefix.trim().is_empty() { - panic!("URL prefix is set to empty string") + self.url_prefix = None; } } } @@ -183,13 +183,8 @@ mod tests { assert!(settings.server.url_prefix.is_none()); settings.server.url_prefix = Some("test".into()); settings.server.check_url_prefix(); - } - - #[test] - #[should_panic] - fn url_prefix_panic_test() { - let mut settings = Settings::new().unwrap(); settings.server.url_prefix = Some(" ".into()); settings.server.check_url_prefix(); + assert!(settings.server.url_prefix.is_none()); } }