Metar overhaul, added footer, updated schemas

api/src/account/auth.rs

@@ -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.user_id).await {
+          match User::select(&api_key.username).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.user_id)).into()),
+            None => Err(Error::new(404, format!("User {} not found", api_key.username)).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.user_id).await {
+        Ok(session) => match User::select(&session.username).await {
           Some(user) => Ok(Auth {
             session_id: Some(session_id),
             api_key: None,
             user,
           }),
-          None => Err(Error::new(404, format!("User {} not found", session.user_id)).into()),
+          None => Err(Error::new(404, format!("User {} not found", session.username)).into()),
         },
         Err(err) => Err(err.into()),
       }