change password and username

4 files changed, 56 insertions, 4 deletions

diff --git a/README.md b/README.md
index 08a806e..eafa655 100644
--- a/README.md
+++ b/README.md
@@ -89,4 +89,13 @@
   - Response
     - 200 Ok
     - 500 Internal Server Error
-      - JSON `"Could not complete transaction"`
\ No newline at end of file
+      - JSON `"Could not complete transaction"`
+- POST `/user/update/info`
+  - Request
+    - JSON `{"id": "ID", "session": "SESSION_KEY", "name": "USERNAME", "old_password": "PASSWORD", "new_password": "PASSWORD"}`
+  - Response
+    - 200 Ok
+    - 401 Unauthorized
+      - JSON `"Not Authenticated"`
+    - 400 Bad Request
+    - 500 Internal Server Error`
\ No newline at end of file
diff --git a/TODO b/TODO
index e28adb8..0a26a28 100644
--- a/TODO
+++ b/TODO
@@ -2,5 +2,7 @@ Need to make a proper http status code thingy
 Token Values
 Token Stock Prices (Values)
 Config
-Change passwords
-Trade Requests
\ No newline at end of file
+Trade Requests
+Admin
+Admin create registration key
+Registration keys
\ No newline at end of file
diff --git a/src/db.rs b/src/db.rs
index c655cf7..ba86b91 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -60,6 +60,19 @@ impl User {
         User { name, hashed_password, id, tokovec: base_tokens, sessions: HashMap::new() }
     }
 
+    fn update_name(&mut self, new_name: String) {
+        self.name = new_name;
+    }
+
+    fn update_password(&mut self, old_password: String, new_password: String) -> Result<(), String> {
+        if User::hash(&old_password) == self.hashed_password {
+            self.hashed_password = User::hash(&new_password);
+            return Ok(());
+        } else {
+            return Err("Old Password is Incorrect".into())
+        }
+    }
+
     fn hash(t: &String) -> String {
         let hashed = Sha256::digest(&t);
         let hashed = base16ct::lower::encode_string(&hashed);
@@ -189,6 +202,17 @@ impl DB {
         Err("User Not Found".into())
     }
 
+    pub async fn update_user(&mut self, id: UID, session: &String, name: String, old_password: String, new_password: String) -> Result<(), String> {
+        self.get_user_authenticated(id, session).await?;
+        let user = self.get_mut_user(id).await?;
+        user.update_name(name);
+        user.update_password(old_password, new_password)?;
+
+        self.save().await?;
+
+        Ok(())
+    }
+
     pub async fn get_user_authenticated(&self, id: UID, session: &String) -> Result<&User, String> {
         match self.get_user(id) {
             Ok(u) => {
diff --git a/src/main.rs b/src/main.rs
index 7edc01c..6b0ecec 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -183,6 +183,23 @@ async fn delete(data: Json<LogoutForm>, db: &State<Mutex<DB>>) -> (Status, Resul
     }
 }
 
+#[derive(Deserialize)]
+struct UpdateForm {
+    id: UID,
+    session: String,
+    name: String,
+    old_password: String,
+    new_password: String,
+}
+#[post("/update/info", data="<data>", format="json")]
+async fn update_user(data: Json<UpdateForm>, db: &State<Mutex<DB>>) -> (Status, Result<(), Json<String>>) {
+    let mut db = db.lock().await;
+    match db.update_user(data.id, &data.session, data.name.clone(), data.old_password.clone(), data.new_password.clone()).await {
+        Ok(_) => (Status::Ok, Ok(())),
+        Err(n) => (Status::InternalServerError, Err(n.into()))
+    }
+}
+
 #[derive(Deserialize, Debug)]
 struct TransferForm {
     id: UID,
@@ -217,7 +234,7 @@ fn rocket() -> _ {
 
     rocket::build().manage(Mutex::new(DB::load(Config::new())))
     .mount("/", routes![index])
-    .mount("/user", routes![login, get_users_by_name, get_user_authenticated, get_user, new_user, get_all_users, logout, logout_all, get_sessions, delete])
+    .mount("/user", routes![login, get_users_by_name, get_user_authenticated, get_user, new_user, get_all_users, logout, logout_all, get_sessions, delete, update_user])
     .mount("/transfer", routes![transfer_out])
     .attach(cors)
 }
\ No newline at end of file