refactor (#327)

7 files changed, 57 insertions, 6 deletions

diff --git a/atuin-server/Cargo.toml b/atuin-server/Cargo.toml
index 33f5f7cd..c1342bfb 100644
--- a/atuin-server/Cargo.toml
+++ b/atuin-server/Cargo.toml
@@ -17,8 +17,7 @@ eyre = "0.6"
 uuid = { version = "0.8", features = ["v4"] }
 whoami = "1.1.2"
 config = "0.13"
-serde_derive = "1.0.125"
-serde = "1.0.126"
+serde = { version = "1.0.126", features = ["derive"] }
 serde_json = "1.0.75"
 sodiumoxide = "0.2.6"
 base64 = "0.13.0"
diff --git a/atuin-server/src/calendar.rs b/atuin-server/src/calendar.rs
index d576f1a7..7c05dce3 100644
--- a/atuin-server/src/calendar.rs
+++ b/atuin-server/src/calendar.rs
@@ -1,5 +1,7 @@
 // Calendar data
 
+use serde::{Deserialize, Serialize};
+
 pub enum TimePeriod {
     YEAR,
     MONTH,
diff --git a/atuin-server/src/handlers/history.rs b/atuin-server/src/handlers/history.rs
index b7112526..aca9ecc6 100644
--- a/atuin-server/src/handlers/history.rs
+++ b/atuin-server/src/handlers/history.rs
@@ -10,6 +10,8 @@ use atuin_common::api::*;
 
 use crate::calendar::{TimePeriod, TimePeriodInfo};
 
+use super::{ErrorResponse, ErrorResponseStatus};
+
 #[instrument(skip_all, fields(user.id = user.id))]
 pub async fn count(
     user: User,
diff --git a/atuin-server/src/handlers/mod.rs b/atuin-server/src/handlers/mod.rs
index 83c2d0c3..9e6659e2 100644
--- a/atuin-server/src/handlers/mod.rs
+++ b/atuin-server/src/handlers/mod.rs
@@ -1,6 +1,41 @@
+use axum::{response::IntoResponse, Json};
+use serde::{Deserialize, Serialize};
+use std::borrow::Cow;
+
 pub mod history;
 pub mod user;
 
 pub async fn index() -> &'static str {
     "\"Through the fathomless deeps of space swims the star turtle Great A\u{2019}Tuin, bearing on its back the four giant elephants who carry on their shoulders the mass of the Discworld.\"\n\t-- Sir Terry Pratchett"
 }
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ErrorResponse<'a> {
+    pub reason: Cow<'a, str>,
+}
+
+impl<'a> IntoResponse for ErrorResponseStatus<'a> {
+    fn into_response(self) -> axum::response::Response {
+        (self.status, Json(self.error)).into_response()
+    }
+}
+
+pub struct ErrorResponseStatus<'a> {
+    pub error: ErrorResponse<'a>,
+    pub status: http::StatusCode,
+}
+
+impl<'a> ErrorResponse<'a> {
+    pub fn with_status(self, status: http::StatusCode) -> ErrorResponseStatus<'a> {
+        ErrorResponseStatus {
+            error: self,
+            status,
+        }
+    }
+
+    pub fn reply(reason: &'a str) -> ErrorResponse {
+        Self {
+            reason: reason.into(),
+        }
+    }
+}
diff --git a/atuin-server/src/handlers/user.rs b/atuin-server/src/handlers/user.rs
index a9a48fdc..862f228c 100644
--- a/atuin-server/src/handlers/user.rs
+++ b/atuin-server/src/handlers/user.rs
@@ -1,7 +1,6 @@
 use std::borrow::Borrow;
 
 use atuin_common::api::*;
-use atuin_common::utils::hash_secret;
 use axum::extract::Path;
 use axum::{Extension, Json};
 use http::StatusCode;
@@ -13,6 +12,8 @@ use crate::database::{Database, Postgres};
 use crate::models::{NewSession, NewUser};
 use crate::settings::Settings;
 
+use super::{ErrorResponse, ErrorResponseStatus};
+
 pub fn verify_str(secret: &str, verify: &str) -> bool {
     sodiumoxide::init().unwrap();
 
@@ -139,3 +140,17 @@ pub async fn login(
         session: session.token,
     }))
 }
+
+fn hash_secret(secret: &str) -> String {
+    sodiumoxide::init().unwrap();
+    let hash = argon2id13::pwhash(
+        secret.as_bytes(),
+        argon2id13::OPSLIMIT_INTERACTIVE,
+        argon2id13::MEMLIMIT_INTERACTIVE,
+    )
+    .unwrap();
+    let texthash = std::str::from_utf8(&hash.0).unwrap().to_string();
+
+    // postgres hates null chars. don't do that to postgres
+    texthash.trim_end_matches('\u{0}').to_string()
+}
diff --git a/atuin-server/src/lib.rs b/atuin-server/src/lib.rs
index 8811986e..7be54e58 100644
--- a/atuin-server/src/lib.rs
+++ b/atuin-server/src/lib.rs
@@ -8,9 +8,6 @@ use eyre::{Context, Result};
 
 use crate::settings::Settings;
 
-#[macro_use]
-extern crate serde_derive;
-
 pub mod auth;
 pub mod calendar;
 pub mod database;
diff --git a/atuin-server/src/settings.rs b/atuin-server/src/settings.rs
index 251e6d7e..6f4d36b4 100644
--- a/atuin-server/src/settings.rs
+++ b/atuin-server/src/settings.rs
@@ -1,4 +1,5 @@
 use fs_err::{create_dir_all, File};
+use serde::{Deserialize, Serialize};
 use std::io::prelude::*;
 use std::path::PathBuf;