From: Dessalines <dessalines@users.noreply.github.com>
Date: Tue, 19 Apr 2022 10:48:59 +0000 (-0400)
Subject: Show deny reason to users after a failed login. Fixes #2191 (#2206)
X-Git-Url: http://these/git/%7B%60https:/%7B%24%7B%60data:application/static/%7B%7D/%24%7Bargs.pageFn.jump%20n%7D?a=commitdiff_plain;h=24be9f2cd5afefc2bb1f88021b6e73ffe9ffacf0;p=lemmy.git

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.
---

diff --git a/crates/api_common/src/lib.rs b/crates/api_common/src/lib.rs
index c37d40e9..330c75bd 100644
--- a/crates/api_common/src/lib.rs
+++ b/crates/api_common/src/lib.rs
@@ -485,8 +485,10 @@ pub async fn check_registration_application(
       RegistrationApplication::find_by_local_user_id(conn, local_user_id)
     })
     .await??;
-    if registration.deny_reason.is_some() {
-      return Err(LemmyError::from_message("registration_denied"));
+    if let Some(deny_reason) = registration.deny_reason {
+      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 {
       return Err(LemmyError::from_message("registration_application_pending"));
     }
diff --git a/crates/utils/src/lib.rs b/crates/utils/src/lib.rs
index c993779b..1dbfb25b 100644
--- a/crates/utils/src/lib.rs
+++ b/crates/utils/src/lib.rs
@@ -51,50 +51,54 @@ macro_rules! location_info {
 
 #[derive(serde::Serialize)]
 struct ApiError {
-  error: &'static str,
+  error: String,
 }
 
 pub struct LemmyError {
-  pub message: Option<&'static str>,
+  pub message: Option<String>,
   pub inner: anyhow::Error,
   pub context: SpanTrace,
 }
 
 impl LemmyError {
   /// 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);
     LemmyError {
-      message: Some(message),
+      message: Some(message.into()),
       inner,
       context: SpanTrace::capture(),
     }
   }
 
   /// 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
     E: Into<anyhow::Error>,
   {
     LemmyError {
-      message: Some(message),
+      message: Some(message.into()),
       inner: error.into(),
       context: SpanTrace::capture(),
     }
   }
 
   /// 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 {
-      message: Some(message),
+      message: Some(message.into()),
       ..self
     }
   }
 
   pub fn to_json(&self) -> Result<String, Self> {
-    let api_error = match self.message {
-      Some(error) => ApiError { error },
-      None => ApiError { error: "Unknown" },
+    let api_error = match &self.message {
+      Some(error) => ApiError {
+        error: error.into(),
+      },
+      None => ApiError {
+        error: "Unknown".into(),
+      },
     };
 
     Ok(serde_json::to_string(&api_error)?)
@@ -126,7 +130,7 @@ impl std::fmt::Debug for LemmyError {
 
 impl Display for LemmyError {
   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)?;
     }
     writeln!(f, "{}", self.inner)?;
@@ -144,7 +148,9 @@ impl actix_web::error::ResponseError for LemmyError {
 
   fn error_response(&self) -> HttpResponse {
     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 {
       HttpResponse::build(self.status_code())
         .content_type("text/plain")
diff --git a/crates/utils/translations b/crates/utils/translations
index ad40feba..3f86b5c4 160000
--- a/crates/utils/translations
+++ b/crates/utils/translations
@@ -1 +1 @@
-Subproject commit ad40feba4263a850f135946847d3ddd1a890a6e7
+Subproject commit 3f86b5c40796fa83054e2226e36effff3b93198a