Show deny reason to users after a failed login. Fixes #2191 (#2206)

* Show deny reason to users after a failed login. Fixes #2191

* Updating translations.

* Adding registration_denied translated string.
default-require-application
Dessalines 2022-04-19 06:48:59 -04:00 committed by GitHub
parent 0a36b16e29
commit 24be9f2cd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 16 deletions

View File

@ -485,8 +485,10 @@ pub async fn check_registration_application(
RegistrationApplication::find_by_local_user_id(conn, local_user_id) RegistrationApplication::find_by_local_user_id(conn, local_user_id)
}) })
.await??; .await??;
if registration.deny_reason.is_some() { if let Some(deny_reason) = registration.deny_reason {
return Err(LemmyError::from_message("registration_denied")); let lang = get_user_lang(local_user_view);
let registration_denied_message = format!("{}: {}", lang.registration_denied(), &deny_reason);
return Err(LemmyError::from_message(&registration_denied_message));
} else { } else {
return Err(LemmyError::from_message("registration_application_pending")); return Err(LemmyError::from_message("registration_application_pending"));
} }

View File

@ -51,50 +51,54 @@ macro_rules! location_info {
#[derive(serde::Serialize)] #[derive(serde::Serialize)]
struct ApiError { struct ApiError {
error: &'static str, error: String,
} }
pub struct LemmyError { pub struct LemmyError {
pub message: Option<&'static str>, pub message: Option<String>,
pub inner: anyhow::Error, pub inner: anyhow::Error,
pub context: SpanTrace, pub context: SpanTrace,
} }
impl LemmyError { impl LemmyError {
/// Create LemmyError from a message, including stack trace /// Create LemmyError from a message, including stack trace
pub fn from_message(message: &'static str) -> Self { pub fn from_message(message: &str) -> Self {
let inner = anyhow::anyhow!("{}", message); let inner = anyhow::anyhow!("{}", message);
LemmyError { LemmyError {
message: Some(message), message: Some(message.into()),
inner, inner,
context: SpanTrace::capture(), context: SpanTrace::capture(),
} }
} }
/// Create a LemmyError from error and message, including stack trace /// Create a LemmyError from error and message, including stack trace
pub fn from_error_message<E>(error: E, message: &'static str) -> Self pub fn from_error_message<E>(error: E, message: &str) -> Self
where where
E: Into<anyhow::Error>, E: Into<anyhow::Error>,
{ {
LemmyError { LemmyError {
message: Some(message), message: Some(message.into()),
inner: error.into(), inner: error.into(),
context: SpanTrace::capture(), context: SpanTrace::capture(),
} }
} }
/// Add message to existing LemmyError (or overwrite existing error) /// Add message to existing LemmyError (or overwrite existing error)
pub fn with_message(self, message: &'static str) -> Self { pub fn with_message(self, message: &str) -> Self {
LemmyError { LemmyError {
message: Some(message), message: Some(message.into()),
..self ..self
} }
} }
pub fn to_json(&self) -> Result<String, Self> { pub fn to_json(&self) -> Result<String, Self> {
let api_error = match self.message { let api_error = match &self.message {
Some(error) => ApiError { error }, Some(error) => ApiError {
None => ApiError { error: "Unknown" }, error: error.into(),
},
None => ApiError {
error: "Unknown".into(),
},
}; };
Ok(serde_json::to_string(&api_error)?) Ok(serde_json::to_string(&api_error)?)
@ -126,7 +130,7 @@ impl std::fmt::Debug for LemmyError {
impl Display for LemmyError { impl Display for LemmyError {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
if let Some(message) = self.message { if let Some(message) = &self.message {
write!(f, "{}: ", message)?; write!(f, "{}: ", message)?;
} }
writeln!(f, "{}", self.inner)?; writeln!(f, "{}", self.inner)?;
@ -144,7 +148,9 @@ impl actix_web::error::ResponseError for LemmyError {
fn error_response(&self) -> HttpResponse { fn error_response(&self) -> HttpResponse {
if let Some(message) = &self.message { if let Some(message) = &self.message {
HttpResponse::build(self.status_code()).json(ApiError { error: message }) HttpResponse::build(self.status_code()).json(ApiError {
error: message.into(),
})
} else { } else {
HttpResponse::build(self.status_code()) HttpResponse::build(self.status_code())
.content_type("text/plain") .content_type("text/plain")

@ -1 +1 @@
Subproject commit ad40feba4263a850f135946847d3ddd1a890a6e7 Subproject commit 3f86b5c40796fa83054e2226e36effff3b93198a