alma/NeahFront7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

widget parole 18

Browse Source
This commit is contained in:
Alma 2025-04-13 01:05:07 +02:00
parent 5f41d9ed8d
commit 1a7bdddac0
1 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/api/rocket-chat/messages/route.ts
View File

@ -98,40 +98,23 @@ export async function GET(request: Request) {
id: currentUser._id id: currentUser._id
}); });
// Step 3: Login as the user to get their token // Step 3: Use admin token to get messages
const loginResponse = await fetch(`${baseUrl}/api/v1/login`, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
user: currentUser.username,
password: process.env.ROCKET_CHAT_USER_PASSWORD // This should be the user's password or a shared password
})
});
if (!loginResponse.ok) {
console.error('Failed to login as user:', loginResponse.status);
const errorText = await loginResponse.text();
console.error('Login error details:', errorText);
return NextResponse.json({ messages: [] }, { status: 200 });
}
const loginData = await loginResponse.json();
const userHeaders = { const userHeaders = {
'X-Auth-Token': loginData.data.authToken, 'X-Auth-Token': process.env.ROCKET_CHAT_TOKEN!,
'X-User-Id': loginData.data.userId, 'X-User-Id': process.env.ROCKET_CHAT_USER_ID!,
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}; };
// Step 4: Get user's subscriptions using user token // Step 4: Get user's subscriptions using admin token
const subscriptionsResponse = await fetch(`${baseUrl}/api/v1/subscriptions.get`, { const subscriptionsResponse = await fetch(`${baseUrl}/api/v1/subscriptions.get?userId=${currentUser._id}`, {
method: 'GET', method: 'GET',
headers: userHeaders headers: userHeaders
}); });
if (!subscriptionsResponse.ok) { if (!subscriptionsResponse.ok) {
console.error('Failed to get subscriptions:', subscriptionsResponse.status); console.error('Failed to get subscriptions:', subscriptionsResponse.status);
const errorText = await subscriptionsResponse.text();
console.error('Subscriptions error details:', errorText);
return NextResponse.json({ messages: [] }, { status: 200 }); return NextResponse.json({ messages: [] }, { status: 200 });
} }
@ -155,8 +138,8 @@ export async function GET(request: Request) {
if (sub.t === 'd') { if (sub.t === 'd') {
return sub.rid.includes(currentUser._id); return sub.rid.includes(currentUser._id);
} }
// For channels (t: 'c'), include if user has unread messages or mentions // For channels (t: 'c'), include all channels
return sub.t === 'c' && (sub.unread > 0 || sub.userMentions > 0 || sub.alert); return sub.t === 'c';
}); });
console.log('Filtered subscriptions:', { console.log('Filtered subscriptions:', {
@ -173,7 +156,7 @@ export async function GET(request: Request) {
const messages: any[] = []; const messages: any[] = [];
const processedRooms = new Set(); const processedRooms = new Set();
// Step 5: Fetch messages using user token // Step 5: Fetch messages using admin token
for (const subscription of userSubscriptions) { for (const subscription of userSubscriptions) {
if (messages.length >= 7 || processedRooms.has(subscription._id)) continue; if (messages.length >= 7 || processedRooms.has(subscription._id)) continue;
processedRooms.add(subscription._id); processedRooms.add(subscription._id);