Make secret more logsafe, implement add and edit for links

shared/src/apirequests/general.rs

@@ -39,6 +39,12 @@ impl Default for EditMode {
 }
 
 #[derive(Clone, Deserialize, Serialize, Debug)]
-pub struct SuccessMessage {
+pub struct Message {
     pub message: String,
 }
+
+#[derive(Clone, Deserialize, Serialize, Debug)]
+pub enum Status {
+    Success(Message),
+    Error(Message),
+}

shared/src/apirequests/links.rs

@@ -1,7 +1,9 @@
 use enum_map::{Enum, EnumMap};
 use serde::{Deserialize, Serialize};
 
-use super::general::{Filter, Operation, Ordering};
+use crate::datatypes::{FullLink, Link};
+
+use super::general::{EditMode, Filter, Operation, Ordering};
 
 /// A generic list returntype containing the User and a Vec containing e.g. Links or Users
 #[derive(Clone, Deserialize, Serialize, Debug)]
@@ -21,6 +23,48 @@ impl Default for LinkRequestForm {
     }
 }
 
+/// The Struct that is responsible for creating and editing users.
+#[derive(Default, Debug, Clone, Serialize, Deserialize)]
+pub struct LinkDelta {
+    pub edit: EditMode,
+    pub id: Option<i64>,
+    pub title: String,
+    pub target: String,
+    pub code: String,
+    pub author: i64,
+    pub created_at: Option<chrono::NaiveDateTime>,
+}
+
+impl From<Link> for LinkDelta {
+    /// Automatically create a `UserDelta` from a User.
+    fn from(l: Link) -> Self {
+        Self {
+            edit: EditMode::Edit,
+            id: Some(l.id),
+            title: l.title,
+            target: l.target,
+            code: l.code,
+            author: l.author,
+            created_at: Some(l.created_at),
+        }
+    }
+}
+
+impl From<FullLink> for LinkDelta {
+    /// Automatically create a `UserDelta` from a User.
+    fn from(l: FullLink) -> Self {
+        Self {
+            edit: EditMode::Edit,
+            id: Some(l.link.id),
+            title: l.link.title,
+            target: l.link.target,
+            code: l.link.code,
+            author: l.link.author,
+            created_at: Some(l.link.created_at),
+        }
+    }
+}
+
 #[derive(Clone, Deserialize, Serialize, Debug, PartialEq, Eq, Hash, Enum)]
 pub enum LinkOverviewColumns {
     Code,

shared/src/datatypes.rs

@@ -1,4 +1,4 @@
-use serde::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize, Serializer};
 /// A generic list returntype containing the User and a Vec containing e.g. Links or Users
 #[derive(Clone, Deserialize, Serialize)]
 pub struct ListWithOwner<T> {
@@ -19,7 +19,7 @@ pub struct User {
     pub id: i64,
     pub username: String,
     pub email: String,
-    pub password: String,
+    pub password: Secret,
     pub role: i64,
     pub language: String,
 }
@@ -44,3 +44,45 @@ pub struct Click {
     pub link: i64,
     pub created_at: chrono::NaiveDateTime,
 }
+
+#[derive(PartialEq, Clone, Deserialize)]
+#[serde(from = "String")]
+pub struct Secret {
+    pub secret: Option<String>,
+}
+
+impl From<String> for Secret {
+    fn from(_: String) -> Self {
+        Self { secret: None }
+    }
+}
+
+impl Serialize for Secret {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str("*****SECRET*****")
+    }
+}
+
+impl Secret {
+    #[must_use]
+    pub const fn new(secret: String) -> Self {
+        Self {
+            secret: Some(secret),
+        }
+    }
+}
+
+impl std::fmt::Debug for Secret {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str("*****SECRET*****")
+    }
+}
+
+impl std::fmt::Display for Secret {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str("*****SECRET*****")
+    }
+}