Add rocket chat user id field and show messages from linked user id on non-admin accounts

inventory-server/auth/routes.js

@@ -34,10 +34,12 @@ const authenticate = async (req, res, next) => {
     
     // Get user from database
     const result = await pool.query(
-      'SELECT id, username, is_admin FROM users WHERE id = $1',
+      'SELECT id, username, email, is_admin, rocket_chat_user_id FROM users WHERE id = $1',
       [decoded.userId]
     );
     
+    console.log('Database query result for user', decoded.userId, ':', result.rows[0]);
+    
     if (result.rows.length === 0) {
       return res.status(401).json({ error: 'User not found' });
     }
@@ -58,7 +60,7 @@ router.post('/login', async (req, res) => {
     
     // Get user from database
     const result = await pool.query(
-      'SELECT id, username, password, is_admin, is_active FROM users WHERE username = $1',
+      'SELECT id, username, password, is_admin, is_active, rocket_chat_user_id FROM users WHERE username = $1',
       [username]
     );
     
@@ -101,6 +103,7 @@ router.post('/login', async (req, res) => {
         id: user.id,
         username: user.username,
         is_admin: user.is_admin,
+        rocket_chat_user_id: user.rocket_chat_user_id,
         permissions
       }
     });
@@ -119,8 +122,13 @@ router.get('/me', authenticate, async (req, res) => {
     res.json({
       id: req.user.id,
       username: req.user.username,
+      email: req.user.email,
       is_admin: req.user.is_admin,
-      permissions
+      rocket_chat_user_id: req.user.rocket_chat_user_id,
+      permissions,
+      // Debug info
+      _debug_raw_user: req.user,
+      _server_identifier: "INVENTORY_AUTH_SERVER_MODIFIED"
     });
   } catch (error) {
     console.error('Error getting current user:', error);
@@ -132,7 +140,7 @@ router.get('/me', authenticate, async (req, res) => {
 router.get('/users', authenticate, requirePermission('view:users'), async (req, res) => {
   try {
     const result = await pool.query(`
-      SELECT id, username, email, is_admin, is_active, created_at, last_login
+      SELECT id, username, email, is_admin, is_active, rocket_chat_user_id, created_at, last_login
       FROM users
       ORDER BY username
     `);
@@ -151,7 +159,7 @@ router.get('/users/:id', authenticate, requirePermission('view:users'), async (r
     
     // Get user details
     const userResult = await pool.query(`
-      SELECT id, username, email, is_admin, is_active, created_at, last_login
+      SELECT id, username, email, is_admin, is_active, rocket_chat_user_id, created_at, last_login
       FROM users
       WHERE id = $1
     `, [userId]);
@@ -187,13 +195,14 @@ router.post('/users', authenticate, requirePermission('create:users'), async (re
   const client = await pool.connect();
   
   try {
-    const { username, email, password, is_admin, is_active, permissions } = req.body;
+    const { username, email, password, is_admin, is_active, rocket_chat_user_id, permissions } = req.body;
     
     console.log("Create user request:", {
       username,
       email,
       is_admin,
       is_active,
+      rocket_chat_user_id,
       permissions: permissions || []
     });
     
@@ -221,10 +230,10 @@ router.post('/users', authenticate, requirePermission('create:users'), async (re
     
     // Insert new user
     const userResult = await client.query(`
-      INSERT INTO users (username, email, password, is_admin, is_active, created_at)
-      VALUES ($1, $2, $3, $4, $5, CURRENT_TIMESTAMP)
+      INSERT INTO users (username, email, password, is_admin, is_active, rocket_chat_user_id, created_at)
+      VALUES ($1, $2, $3, $4, $5, $6, CURRENT_TIMESTAMP)
       RETURNING id
-    `, [username, email || null, hashedPassword, !!is_admin, is_active !== false]);
+    `, [username, email || null, hashedPassword, !!is_admin, is_active !== false, rocket_chat_user_id || null]);
     
     const userId = userResult.rows[0].id;
     
@@ -299,7 +308,7 @@ router.put('/users/:id', authenticate, requirePermission('edit:users'), async (r
   
   try {
     const userId = req.params.id;
-    const { username, email, password, is_admin, is_active, permissions } = req.body;
+    const { username, email, password, is_admin, is_active, rocket_chat_user_id, permissions } = req.body;
     
     console.log("Update user request:", {
       userId,
@@ -307,6 +316,7 @@ router.put('/users/:id', authenticate, requirePermission('edit:users'), async (r
       email,
       is_admin,
       is_active,
+      rocket_chat_user_id,
       permissions: permissions || []
     });
     
@@ -348,6 +358,11 @@ router.put('/users/:id', authenticate, requirePermission('edit:users'), async (r
       updateValues.push(!!is_active);
     }
     
+    if (rocket_chat_user_id !== undefined) {
+      updateFields.push(`rocket_chat_user_id = $${paramIndex++}`);
+      updateValues.push(rocket_chat_user_id || null);
+    }
+    
     // Update password if provided
     if (password) {
       const saltRounds = 10;