more level boilerplate

readme.md

@@ -34,7 +34,7 @@ _these features are implemented_
 
 ## todo
 
-- clean auth function (wtf is that!)
+- probably work on the code warnings we get hehe
-- add udid auth to auth function
+- <small>green name users...</small> (add udid auth to auth function, use userName instead of accountID in uploading levels, and it goes on and on and on <small>and on...</small>)
 - add level parsing
 - maybe swap to timestamp type instead of `(TO_CHAR(CURRENT_TIMESTAMP, 'YYYY-MM-DD HH24:MI:SS.MS'))` (thats REALLY ugly!!)

src/endpoints/levels/upload_level.rs

@@ -1,51 +1,36 @@
-// use password_auth::verify_password;
+use password_auth::verify_password;
-// use rocket::form::Form;
+use rocket::form::Form;
-// use rocket::http::Status;
+use rocket::http::Status;
-// use rocket::response::status;
+use rocket::response::status;
 
-// use diesel::prelude::*;
+use diesel::prelude::*;
 
-// use crate::helpers;
+use crate::helpers;
-// use crate::db;
+use crate::db;
 
-// #[derive(FromForm)]
+#[derive(FromForm)]
-// pub struct FromLoginAccount {
+pub struct FormUploadLevel {
-//     accountID: i32,
+    accountID: i32,
-//     gjp: String
-// }
-
-// #[post("/accounts/loginGJAccount.php", data = "<input>")]
-// pub fn login_account(input: Form<FromLoginAccount>) -> status::Custom<&'static str> {
-//     let connection = &mut db::establish_connection_pg();
     
-//     // account verification
+    password: Option<String>,
-//     let (user_id, account_id): (i32, i32);
+    gjp: Option<String>,
+    gjp2: Option<String>,
+}
 
-//     {
+#[post("/uploadGJLevel21.php", data = "<input>")]
-//         use crate::schema::accounts::dsl::*;
+pub fn upload_level(input: Form<FormUploadLevel>) -> status::Custom<&'static str> {
+    let connection = &mut db::establish_connection_pg();
     
-//         let query_result = accounts
+    // account verification
-//             .select((id, password))
+    let (user_id_val, account_id_val): (i32, i32);
-//             .filter(username.eq(input.userName.clone()))
-//             .get_result::<(i32, String)>(connection);
-    
-//         match query_result {
-//             Ok((
-//                 account_id_val,
-//                 password_val
-//             )) => {
-//                 user_id = helpers::accounts::get_user_id_from_account_id(account_id_val);
-    
-//                 match verify_password(input.password.clone().as_bytes(), password_val.as_str()) {
-//                     Ok(_) => return status::Custom(Status::Ok, 
-//                         Box::leak(format!("{},{}", account_id_val, user_id).into_boxed_str())
-//                     ),
-//                     Err(_) => return status::Custom(Status::Ok, "-11")
-//                 };
-//             },
-//             Err(_) => return status::Custom(Status::Ok, "-1")
-//         }
-//     }
 
-//     return status::Custom(Status::Ok, "1")
+    match helpers::accounts::auth(input.accountID.clone(), input.password.clone(), input.gjp.clone(), input.gjp2.clone()) {
-// }
+        Ok((user_id, account_id)) => {
+            user_id_val = user_id;
+            account_id_val = account_id;
+        },
+        Err(_) => return status::Custom(Status::Ok, "-1")
+    };
+
+    return status::Custom(Status::Ok, "1")
+}

src/main.rs

@@ -32,6 +32,8 @@ fn rocket() -> _ {
             endpoints::accounts::login_account::login_account,
             endpoints::accounts::register_account::register_account,
 
-            endpoints::users::get_users::get_users
+            endpoints::users::get_users::get_users,
+
+            endpoints::levels::upload_level::upload_level
         ])
 }