finish

kitsune-soc · Apr 7, 2024 · 0691c5a · 0691c5a
1 parent a624c50
commit 0691c5a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/kitsune/src/http/handler/oauth/authorize.rs b/kitsune/src/http/handler/oauth/authorize.rs
@@ -25,6 +25,9 @@ use oxide_auth_axum::{OAuthRequest, OAuthResponse};
 use serde::Deserialize;
 use speedy_uuid::Uuid;
 
+const UNCONFIRMED_EMAIL_ADDRESS: &str = "Email address is unconfirmed. Check your inbox!";
+const WRONG_EMAIL_OR_PASSWORD: &str = "Entered wrong email or password";
+
 #[cfg(feature = "oidc")]
 use {
     axum::extract::Query,
@@ -129,14 +132,14 @@ pub async fn post(
 
     let Some(user) = user else {
         return Ok(Either::E2((
-            flash.error(Error::PasswordMismatch.to_string()),
+            flash.error(WRONG_EMAIL_OR_PASSWORD),
             Redirect::to(redirect_to),
         )));
     };
 
     if user.confirmed_at.is_none() {
         return Ok(Either::E2((
-            flash.error(Error::UnconfirmedEmailAddress.to_string()),
+            flash.error(UNCONFIRMED_EMAIL_ADDRESS),
             Redirect::to(redirect_to),
         )));
     }
@@ -155,7 +158,7 @@ pub async fn post(
 
     if !is_valid {
         return Ok(Either::E2((
-            flash.error(Error::PasswordMismatch.to_string()),
+            flash.error(WRONG_EMAIL_OR_PASSWORD),
             Redirect::to(redirect_to),
         )));
     }

diff --git a/kitsune/src/http/handler/oauth/token.rs b/kitsune/src/http/handler/oauth/token.rs
@@ -33,7 +33,10 @@ pub async fn post(
             let mut flow = RefreshFlow::prepare(oauth_endpoint)?;
             RefreshFlow::execute(&mut flow, oauth_req).await
         }
-        _ => Err(OAuth2Error::UnknownGrantType),
+        _ => Err(kitsune_error!(
+            type = ErrorType::BadRequest(Some("unknown grant type".into())),
+            format!("unknown grant type: {grant_type}")
+        )),
     }
     .map_err(Error::from)
 }