si/iistwin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix(push.routes): req.user!.userId -> req.user!.id

Browse Source 
У объекта пользователя из authenticateToken поле id, а не userId.

Это чинит 500 на /api/devices/active-chat и других device-эндпоинтах.
This commit is contained in:
Ильяс Султанов
2026-07-16 20:42:55 +03:00
parent 7672dd98df
commit 0a5f4516ef
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/routes/push.routes.ts
View File

@@ -60,7 +60,7 @@ export function registerPushRoutes(app: import("express").Express): void {
return res.status(400).json({ error: 'Неверная платформа. Допустимые значения: android, ios, web' });
}
const userId = req.user!.userId;
const userId = req.user!.id;
const organizationId = req.user!.organizationId;
await storage.registerDeviceToken(userId, organizationId, token, platform, deviceInfo);
@@ -82,7 +82,7 @@ export function registerPushRoutes(app: import("express").Express): void {
return res.status(400).json({ error: 'Токен обязателен' });
}
const userId = req.user!.userId;
const userId = req.user!.id;
const organizationId = req.user!.organizationId;
await storage.unregisterDeviceToken(userId, organizationId, token);
@@ -97,7 +97,7 @@ export function registerPushRoutes(app: import("express").Express): void {
// Heartbeat endpoint to update presence
app.post('/api/devices/heartbeat', authenticateToken, async (req: AuthenticatedRequest, res) => {
try {
const userId = req.user!.userId;
const userId = req.user!.id;
const organizationId = req.user!.organizationId;
await storage.heartbeatUserPresence(userId, organizationId);
@@ -113,7 +113,7 @@ export function registerPushRoutes(app: import("express").Express): void {
// Used by the server to suppress push notifications for active chats.
app.post('/api/devices/active-chat', authenticateToken, async (req: AuthenticatedRequest, res) => {
try {
const userId = req.user!.userId;
const userId = req.user!.id;
const organizationId = req.user!.organizationId;
const { type, id, visible } = req.body;
@@ -132,7 +132,7 @@ export function registerPushRoutes(app: import("express").Express): void {
// Clear active chat when the user leaves the chat page.
app.delete('/api/devices/active-chat', authenticateToken, async (req: AuthenticatedRequest, res) => {
try {
const userId = req.user!.userId;
const userId = req.user!.id;
const organizationId = req.user!.organizationId;
await storage.clearUserActiveChat(userId, organizationId);
@@ -146,7 +146,7 @@ export function registerPushRoutes(app: import("express").Express): void {
// Get user's registered devices
app.get('/api/devices', authenticateToken, async (req: AuthenticatedRequest, res) => {
try {
const userId = req.user!.userId;
const userId = req.user!.id;
const organizationId = req.user!.organizationId;
const tokens = await storage.getDeviceTokensByUser(userId, organizationId);