Working on email templating, updating with swagger

api/src/account/auth.rs

@@ -1,10 +1,10 @@
 use std::future::Future;
 use std::pin::Pin;
 
-use actix_web::{FromRequest, Error as ActixError, HttpRequest, dev::Payload, http};
-use serde::{Serialize, Deserialize};
+use super::{SESSION_COOKIE_NAME, Session};
 use crate::{error::Error, users::User};
-use super::{Session, SESSION_COOKIE_NAME};
+use actix_web::{Error as ActixError, FromRequest, HttpRequest, dev::Payload, http};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Auth {
@@ -34,13 +34,13 @@ impl FromRequest for Auth {
               return Err(Error::new(401, "API Key does not exist".to_string()).into());
             }
           };
-          match User::select(&api_key.id).await {
+          match User::select(&api_key.user_id).await {
             Some(user) => Ok(Auth {
               session_id: None,
               api_key: Some(key_id),
               user,
             }),
-            None => Err(Error::new(404, format!("User {} not found", api_key.id)).into()),
+            None => Err(Error::new(404, format!("User {} not found", api_key.user_id)).into()),
           }
         };
         return Box::pin(fut);
@@ -79,13 +79,13 @@ impl FromRequest for Auth {
     // Verify the session
     let fut = async move {
       match Session::verify(&session_id, &ip_address).await {
-        Ok(session) => match User::select(&session.id).await {
+        Ok(session) => match User::select(&session.user_id).await {
           Some(user) => Ok(Auth {
             session_id: Some(session_id),
             api_key: None,
             user,
           }),
-          None => Err(Error::new(404, format!("User {} not found", session.id)).into()),
+          None => Err(Error::new(404, format!("User {} not found", session.user_id)).into()),
         },
         Err(err) => Err(err.into()),
       }