id

Author: Swaggeroo

routes/users.js

@@ -49,26 +49,7 @@ router.post('/', async (req, res) => {
 });
 
 router.get('/me', auth, async (req, res) => {
-    //TODO get user from database
-    let user = {
-        id: 3,
-        username: "||",
-        email: "email@example.com",
-        num_credits: 69,
-        first_name: "Name",
-        last_name: "Name",
-        birth_date: "2023-10-28",
-        password: "coolerHash",
-        address: "Too lazy 4, 36912 This",
-        organization: false,
-        region: 6,
-        join_date: "2023-10-27",
-        email_confirmed: true,
-        totp_secret: "32 Zeichen",
-        totp_confirmed: true,
-        banned: true,
-        last_security_change: Date.now()
-    }
+    let user = await dbAdapter.getUserById(req.user.sub);
     user = _.pick(user, ['id', 'username', 'email', 'num_credits', 'first_name', 'last_name', 'birth_date', 'address', 'organization', 'region', 'join_date', 'email_confirmed', 'totp_confirmed', 'banned', 'last_security_change']);
     res.send(user);
 });
@@ -94,21 +75,18 @@ router.put('/me/password', auth, async (req, res) => {
         return res.status(400).send(error.details[0].message);
     }
 
-    req.user.sub
-    //TODO get user from database
-    //const validPassword = await bcrypt.compare(req.body.oldPassword, user.password);
-    //if(!validPassword) {
-    //    debugRoute("PUT /api/users/me/password - 400 - Invalid old password");
-    //    return res.status(400).send("Invalid old password");
-    //}
+    let user = await dbAdapter.getUserById(req.user.sub);
+    const validPassword = await bcrypt.compare(req.body.oldPassword, user.password);
+    if(!validPassword) {
+        debugRoute("PUT /api/users/me/password - 400 - Invalid old password");
+        return res.status(400).send("Invalid old password");
+    }
 
     const salt = bcrypt.genSaltSync(10);
-    let user = {}; //TODO remove it
-    user.sub = 1234
     user.password = await bcrypt.hash(req.body.newPassword, salt);
     user.lastSecurityUpdate = Date.now();
 
-    //TODO upload to server
+    await dbAdapter.updateUser(user);
 
     debugRoute("PUT /api/users/me/password - 200 - Password changed");
 
@@ -177,4 +155,18 @@ router.put('/password/reset/:code', async (req, res) => {
     return res.status(200).send("Password updated");
 });
 
+router.get('/id/:id', auth,async (req, res) => {
+    let user = await dbAdapter.getUserById(req.params.id);
+
+    if (!user){
+        debugRoute("GET /api/users/user/:id - 404 - User not found");
+        return res.status(404).send("User not found");
+    }
+
+    debugRoute("GET /api/users/user/:id - 200 - User found");
+
+    user = _.pick(user, ['id', 'username', 'num_credits', 'organization', 'region', 'join_date', 'banned']);
+    res.send(user);
+});
+
 module.exports = router;