SSO Update :)

models/CommentModel.php

@@ -7,44 +7,58 @@ class CommentModel {
     }
     
     public function getCommentsByTicketId($ticketId) {
-        $sql = "SELECT * FROM ticket_comments WHERE ticket_id = ? ORDER BY created_at DESC";
+        $sql = "SELECT tc.*, u.display_name, u.username
+                FROM ticket_comments tc
+                LEFT JOIN users u ON tc.user_id = u.user_id
+                WHERE tc.ticket_id = ?
+                ORDER BY tc.created_at DESC";
         $stmt = $this->conn->prepare($sql);
         $stmt->bind_param("s", $ticketId); // Changed to string since ticket_id is varchar
         $stmt->execute();
         $result = $stmt->get_result();
-        
+
         $comments = [];
         while ($row = $result->fetch_assoc()) {
+            // Use display_name from users table if available, fallback to user_name field
+            if (!empty($row['display_name'])) {
+                $row['display_name_formatted'] = $row['display_name'];
+            } else {
+                $row['display_name_formatted'] = $row['user_name'] ?? 'Unknown User';
+            }
             $comments[] = $row;
         }
-        
+
         return $comments;
     }
     
-    public function addComment($ticketId, $commentData) {
-        $sql = "INSERT INTO ticket_comments (ticket_id, user_name, comment_text, markdown_enabled) 
-                VALUES (?, ?, ?, ?)";
-                
+    public function addComment($ticketId, $commentData, $userId = null) {
+        $sql = "INSERT INTO ticket_comments (ticket_id, user_id, user_name, comment_text, markdown_enabled)
+                VALUES (?, ?, ?, ?, ?)";
+
         $stmt = $this->conn->prepare($sql);
-        
-        // Set default username
+
+        // Set default username (kept for backward compatibility)
         $username = $commentData['user_name'] ?? 'User';
         $markdownEnabled = isset($commentData['markdown_enabled']) && $commentData['markdown_enabled'] ? 1 : 0;
-        
+
         // Preserve line breaks in the comment text
         $commentText = $commentData['comment_text'];
-        
+
         $stmt->bind_param(
-            "sssi",
+            "sissi",
             $ticketId,
+            $userId,
             $username,
             $commentText,
             $markdownEnabled
         );
-        
+
         if ($stmt->execute()) {
+            $commentId = $this->conn->insert_id;
+
             return [
                 'success' => true,
+                'comment_id' => $commentId,
                 'user_name' => $username,
                 'created_at' => date('M d, Y H:i'),
                 'markdown_enabled' => $markdownEnabled,