Overhaul

api/src/account/email_token.rs

@@ -1,12 +1,12 @@
 use crate::account::{csprng, hash};
-use crate::db::redis_async_connection;
 use crate::error::{ApiResult, Error};
 use crate::smtp;
 use chrono::{Datelike, Utc};
-use redis::{AsyncCommands, RedisResult};
 use serde::{Deserialize, Serialize};
 use std::path::Path;
 use std::{env, fs};
+use redis::aio::ConnectionManager;
+use crate::state::AppState;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct EmailToken {
@@ -24,37 +24,25 @@ impl EmailToken {
     }
   }
 
-  pub async fn store(&self, ttl_secs: i64) -> ApiResult<()> {
-    let mut conn = redis_async_connection().await?;
+  pub async fn store(&self, state: &AppState, ttl_secs: i64) -> ApiResult<()> {
     let key = self.token.clone();
     let value = serde_json::to_string(self)?;
     let now = Utc::now();
     let expires_at = now + chrono::Duration::seconds(ttl_secs);
     let ttl = expires_at.timestamp() - now.timestamp();
-    let result: RedisResult<()> = conn.set_ex(key, &value, ttl as u64).await;
+    state.set_ex(&key, &value, ttl as u64).await
+  }
+
+  pub async fn get(state: &AppState, token: &str) -> ApiResult<Self> {
+    let result: Option<String> = state.get(token).await?;
     match result {
-      Ok(_) => Ok(()),
-      Err(err) => Err(err.into()),
+      Some(value) => Ok(serde_json::from_str(&value)?),
+      None => Err(Error::new(404, format!("Missing email token {}", token))),
     }
   }
 
-  pub async fn get(token: &str) -> ApiResult<Self> {
-    let mut conn = redis_async_connection().await?;
-    let result: RedisResult<Option<String>> = conn.get(token).await;
-    match result {
-      Ok(Some(value)) => Ok(serde_json::from_str(&value)?),
-      Ok(None) => Err(Error::new(404, format!("Missing email token {}", token))),
-      Err(err) => Err(err.into()),
-    }
-  }
-
-  pub async fn delete(token: &str) -> ApiResult<()> {
-    let mut conn = redis_async_connection().await?;
-    let result: RedisResult<()> = conn.del(token).await;
-    match result {
-      Ok(_) => Ok(()),
-      Err(err) => Err(err.into()),
-    }
+  pub async fn delete(state: &AppState, token: &str) -> ApiResult<()> {
+    state.del(token).await
   }
 }
 
@@ -113,10 +101,10 @@ pub async fn send_password_reset_email(
   }
 }
 
-pub async fn send_confirm_email(email: &str, ip_address: &str) -> ApiResult<()> {
+pub async fn send_confirm_email(state: &AppState, email: &str, ip_address: &str) -> ApiResult<()> {
   let token = csprng(128);
   let email_token = EmailToken::new(email.to_string(), token, &ip_address);
-  email_token.store(86400).await?;
+  email_token.store(state, 86400).await?;
 
   let base_url = env::var("EXTERNAL_URL")?;
   let link = format!("{base_url}/profile/confirm?token={}", email_token.token);
@@ -153,7 +141,7 @@ pub async fn send_confirm_email(email: &str, ip_address: &str) -> ApiResult<()>
       ip_address,
       err
     );
-    let _ = EmailToken::delete(&email_token.token);
+    let _ = EmailToken::delete(state, &email_token.token);
     return Err(err);
   }