diff --git a/src/routes/admin/statistiche/+page.server.ts b/src/routes/admin/statistiche/+page.server.ts
index 116570d..9499e0d 100644
--- a/src/routes/admin/statistiche/+page.server.ts
+++ b/src/routes/admin/statistiche/+page.server.ts
@@ -1,7 +1,12 @@
import { error } from '@sveltejs/kit';
import type { PageServerLoad } from './$types';
+import { logger } from '$lib/utils/logger';
export const load: PageServerLoad = async ({ fetch, cookies, url }) => {
+ logger.info('Loading admin statistics page');
const token = cookies.get('token');
- if (!token) throw error(401, 'Autenticazione richiesta');
+ if (!token){
+ logger.error('Token not found, redirecting to /login');
+ throw error(401, 'Autenticazione richiesta');
+ }
};
diff --git a/src/routes/admin/statistiche/+page.svelte b/src/routes/admin/statistiche/+page.svelte
index 4b06cae..7c99403 100644
--- a/src/routes/admin/statistiche/+page.svelte
+++ b/src/routes/admin/statistiche/+page.svelte
@@ -3,13 +3,22 @@
import BottomNavBar from '$lib/components/BottomNavBar.svelte';
import HeaderPages from '$lib/components/HeaderPages.svelte';
import { goto } from '$app/navigation';
+ import { logger } from '$lib/utils/logger';
+
+ let { data }:{
+ data: {
+ theme: string;
+ title: string;
+ subtitle: string;
+ }
+ } = $props();
- let { data } = $props();
let stats = $state([]);
let startDate = $state('');
let endDate = $state('');
async function getStats() {
+ logger.log('Richiesta statistiche...');
const res = await fetch('/api/get_stats', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
@@ -18,13 +27,15 @@
endDate: endDate
})
});
+ logger.log('Risposta ricevuta:', res);
const data_json = await res.json();
if (!data_json.error) {
+ logger.log('Statistiche ricevute:', data_json.stats);
stats = data_json.stats;
- console.log('Statistiche:', data_json.stats);
+ logger.log('Statistiche:', data_json.stats);
} else {
- console.error('Errore nella richiesta delle statistiche:', data_json.error);
+ logger.error('Errore nella richiesta delle statistiche:', data_json.error);
}
}
diff --git a/src/routes/api/documents/+server.ts b/src/routes/api/documents/+server.ts
index 7049001..d264b72 100644
--- a/src/routes/api/documents/+server.ts
+++ b/src/routes/api/documents/+server.ts
@@ -1,16 +1,21 @@
import type { RequestHandler } from './$types';
import { json } from '@sveltejs/kit';
import { env } from '$env/dynamic/public';
+import { logger } from '$lib/utils/logger';
const DATABASE_URL = env.PUBLIC_DATABASE_URL;
const LLM_URL = env.PUBLIC_LLM_URL;
export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
+ logger.info('POST /api/documents');
try {
const token = cookies.get('token');
+
const formData = await request.formData();
+ logger.debug('Form data:', formData);
if (!token) {
+ logger.error('Token non trovato');
return json({ error: 'Unauthorized' }, { status: 401 });
}
@@ -20,6 +25,7 @@ export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
});
if (!tokenResponse.ok) {
const errorData = await tokenResponse.json();
+ logger.error('Token non valido', errorData);
cookies.delete('token', { path: '/' });
return json(
{ error: 'Token non valido', details: errorData },
@@ -27,12 +33,11 @@ export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
);
}
- console.log('form data', formData);
-
+ logger.log('form data', formData);
const files = formData.getAll('files');
if (!files || files.length === 0 || !(files[0] instanceof File)) {
- console.error("Nessun file valido trovato nel FormData ricevuto con chiave 'files'");
+ logger.error("Nessun file valido trovato nel FormData ricevuto con chiave 'files'");
return json({ error: "Nessun file valido inviato con chiave 'files'" }, { status: 400 });
}
@@ -42,6 +47,7 @@ export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
llmFormData.append('files', file, file.name);
}
});
+ logger.debug('llmFormData', llmFormData);
const response = await fetch(`http://${LLM_URL}/documents?token=${token}`, {
method: 'POST',
@@ -51,9 +57,11 @@ export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
body: llmFormData
});
- console.log('upload LLM response', response);
+ logger.log('upload LLM response', response);
if (!response.ok) {
+ const errorData = await response.json();
+ logger.error('Errore durante l\'upload del file:', errorData);
if (response.status === 400) {
return json({ error: 'File già caricato o formato errato!' }, { status: 400 });
} else {
@@ -64,40 +72,45 @@ export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
}
}
const data = await response.json();
- console.log('data', data);
+ logger.log('data', data);
return json({
success: true,
message: 'Document added successfully'
});
} catch (error) {
- console.error("Errore durante l'aggiunta del documento:", error);
+ logger.error("Errore durante l'aggiunta del documento:", error);
return json({ error: 'Internal server error' }, { status: 500 });
}
};
export const DELETE: RequestHandler = async ({ request, cookies }) => {
+ logger.info('DELETE /api/documents');
try {
const token = cookies.get('token');
const req = await request.json();
if (!token) {
+ logger.error('Token non trovato');
return json({ error: 'Unauthorized' }, { status: 401 });
}
const tokenResponse = await fetch(`http://${DATABASE_URL}/auth/verify?token=${token}`, {
method: 'GET'
});
+ logger.log('tokenResponse', tokenResponse);
if (!tokenResponse.ok) {
const errorData = await tokenResponse.json();
+ logger.error('Token non valido', errorData);
return json(
{ error: 'Token non valido', details: errorData },
{ status: tokenResponse.status }
);
}
- console.log('req delete document', req);
- const response = await fetch(`http://${LLM_URL}/documents?token=${token}`, {
+ logger.log('req delete document', req);
+ const response = await fetch(`http://${LLM_URL}/documents`, {
+
method: 'DELETE',
headers: {
Authorization: 'Bearer ' + token,
@@ -110,8 +123,11 @@ export const DELETE: RequestHandler = async ({ request, cookies }) => {
current_password: req.current_password
})
});
+ logger.log('response delete document', response);
if (!response.ok) {
+ const errorData = await response.json();
+ logger.error('Errore durante l\'eliminazione del file:', errorData);
if (response.status === 401) {
return json({ error: 'Unauthorized', details: 'Unauthorized' }, { status: 401 });
}
@@ -121,12 +137,13 @@ export const DELETE: RequestHandler = async ({ request, cookies }) => {
{ status: response.status }
);
}
+ logger.log('data delete document success');
return json({
success: true,
- message: 'User deleted successfully'
+ message: 'Document deleted successfully'
});
} catch (error) {
- console.error("Errore durante l'eliminazione dell'utente:", error);
+ logger.error("Errore durante l'eliminazione dell'utente:", error);
return json({ error: 'Internal server error' }, { status: 500 });
}
};
diff --git a/src/routes/api/faqs/+server.ts b/src/routes/api/faqs/+server.ts
index fb34798..ceae94a 100644
--- a/src/routes/api/faqs/+server.ts
+++ b/src/routes/api/faqs/+server.ts
@@ -1,16 +1,20 @@
import type { RequestHandler } from './$types';
import { json } from '@sveltejs/kit';
import { env } from '$env/dynamic/public';
+import { logger } from '$lib/utils/logger';
const DATABASE_URL = env.PUBLIC_DATABASE_URL;
const LLM_URL = env.PUBLIC_LLM_URL;
export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
+ logger.info('POST /api/faqs');
try {
const token = cookies.get('token');
const req = await request.json();
+ logger.debug('req', req);
if (!token) {
+ logger.error('Token non trovato');
return json({ error: 'Unauthorized' }, { status: 401 });
}
@@ -20,6 +24,7 @@ export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
});
if (!tokenResponse.ok) {
const errorData = await tokenResponse.json();
+ logger.error('Token non valido', errorData);
cookies.delete('token', { path: '/' });
return json(
{ error: 'Token non valido', details: errorData },
@@ -28,6 +33,7 @@ export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
}
if (!req.title || !req.question || !req.answer) {
+ logger.error('Dati non validi', req);
return json(
{ error: 'Dati non validi', details: 'Title, question and answer are required' },
{ status: 400 }
@@ -48,33 +54,37 @@ export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
});
if (!response.ok) {
+
const errorData = await response.json();
+
+ logger.error('Errore durante l\'aggiunta della faq', errorData);
+
return json(
{ error: "Errore durante l'aggiunta della faq", details: errorData },
{ status: response.status }
);
}
const data = await response.json();
- console.log('data', data);
-
+ logger.info('FAQ aggiunta con successo', data);
return json({
success: true,
- faq: { _id: data.id, title: req.title, question: req.question, answer: req.answer },
+ faq: { id: data.faq.id, title: req.title, question: req.question, answer: req.answer },
message: 'FAQ added successfully'
});
} catch (error) {
- console.error('Errore durante la creazione della nuova chat:', error);
+ logger.error('Errore durante la creazione della nuova chat:', error);
return json({ error: 'Internal server error' }, { status: 500 });
}
};
export const PUT: RequestHandler = async ({ request, cookies }) => {
+ logger.info('PUT /api/faqs');
try {
const token = cookies.get('token');
const req = await request.json();
- console.log('req put faq', req);
-
+ logger.debug('req', req);
if (!token) {
+ logger.error('Token non trovato');
return json({ error: 'Unauthorized' }, { status: 401 });
}
@@ -88,8 +98,10 @@ export const PUT: RequestHandler = async ({ request, cookies }) => {
{ status: tokenResponse.status }
);
}
+ logger.log('req update faq', req);
if (!req.title || !req.question || !req.answer) {
+ logger.error('Dati non validi', req);
return json(
{ error: 'Dati non validi', details: 'Title, question and answer are required' },
{ status: 400 }
@@ -97,6 +109,7 @@ export const PUT: RequestHandler = async ({ request, cookies }) => {
}
const response = await fetch(`http://${LLM_URL}/faqs?token=${token}`, {
method: 'PUT',
+
headers: {
'Content-Type': 'application/json',
Authorization: `Bearer ${token}`
@@ -108,11 +121,15 @@ export const PUT: RequestHandler = async ({ request, cookies }) => {
id: req.id,
})
});
+ logger.log('response update faq', response);
if (!response.ok) {
- console.log('response', response);
- let errorMessage = await response.json();
- console.error('Error response:', errorMessage);
+
+ logger.error('Errore durante l\'aggiornamento della faq', response);
+
+ logger.log('response', response);
+ const errorMessage = await response.json();
+ logger.error('Error response:', errorMessage);
if (errorMessage.detail.includes('FAQ data is already up to date')) {
return json(
{ error: 'Nessuna modifica apportata', details: errorMessage },
@@ -124,24 +141,26 @@ export const PUT: RequestHandler = async ({ request, cookies }) => {
{ status: response.status }
);
}
-
+ logger.info('FAQ aggiornata con successo');
return json({
success: true,
faq: { title: req.title, question: req.question, answer: req.answer },
message: 'FAQ updated successfully'
});
} catch (error) {
- console.error("Errore durante l'aggiornamento della FAQ:", error);
+ logger.error("Errore durante l'aggiornamento della FAQ:", error);
return json({ error: 'Internal server error' }, { status: 500 });
}
};
export const DELETE: RequestHandler = async ({ request, cookies }) => {
+ logger.info('DELETE /api/faqs');
try {
const token = cookies.get('token');
const req = await request.json();
if (!token) {
+ logger.error('Token non trovato');
return json({ error: 'Unauthorized' }, { status: 401 });
}
@@ -150,14 +169,17 @@ export const DELETE: RequestHandler = async ({ request, cookies }) => {
});
if (!tokenResponse.ok) {
const errorData = await tokenResponse.json();
+ logger.error('Token non valido', errorData);
return json(
{ error: 'Token non valido', details: errorData },
{ status: tokenResponse.status }
);
}
- console.log('req delete faq', req);
- const response = await fetch(`http://${LLM_URL}/faqs?token=${token}`, {
+
+ logger.log('req delete faq', req);
+ const response = await fetch(`http://${DATABASE_URL}/faqs/${req.id}`, {
+
method: 'DELETE',
headers: {
Authorization: 'Bearer ' + token,
@@ -165,11 +187,12 @@ export const DELETE: RequestHandler = async ({ request, cookies }) => {
},
body: JSON.stringify({
id: req.id,
- admin_password: req.current_password
+ current_password: req.current_password
})
});
if (!response.ok) {
+ logger.error('Errore durante l\'eliminazione della faq', response);
if (response.status === 401) {
return json({ error: 'Password errata', details: 'Password errata' }, { status: 401 });
}
@@ -179,12 +202,14 @@ export const DELETE: RequestHandler = async ({ request, cookies }) => {
{ status: response.status }
);
}
+ logger.log('data delete faq success');
return json({
success: true,
message: 'FAQ deleted successfully'
});
} catch (error) {
- console.error("Errore durante l'eliminazione della faq:", error);
+
+ logger.error("Errore durante l'eliminazione della faq:", error);
return json({ error: 'Internal server error' }, { status: 500 });
}
};
diff --git a/src/routes/api/get_stats/+server.ts b/src/routes/api/get_stats/+server.ts
index 8aac8db..73f0b0f 100644
--- a/src/routes/api/get_stats/+server.ts
+++ b/src/routes/api/get_stats/+server.ts
@@ -1,13 +1,16 @@
import type { RequestHandler } from './$types';
import { env } from '$env/dynamic/public';
import { json } from '@sveltejs/kit';
+import { logger } from '$lib/utils/logger';
const DATABASE_URL = env.PUBLIC_DATABASE_URL;
export const POST: RequestHandler = async ({ request, cookies }) => {
- const requestData = await request.json();
+ logger.info('POST /api/get_stats');
+ const requestData = await request.json();
if (!requestData) {
+ logger.error('No request data');
throw new Error('No request data');
}
@@ -24,14 +27,17 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
'Content-Type': 'application/json'
}
});
+ logger.info('Response from database:', response);
- if (!response.ok) {
+ if (!response.ok) {
+ const err = await response.json().catch(() => ({}));
+ logger.error('Error from database:', err);
return json({ error: response.status }, { status: response.status });
}
- const stats = await response.json();
+ const stats = await response.json();
- console.log("stats", stats);
+ logger.log('stats', stats);
- return json({ stats });
+ return json({ stats });
};
diff --git a/src/routes/api/new_chat/+server.ts b/src/routes/api/new_chat/+server.ts
index fccfde3..ac19815 100644
--- a/src/routes/api/new_chat/+server.ts
+++ b/src/routes/api/new_chat/+server.ts
@@ -1,14 +1,17 @@
import type { RequestHandler } from './$types';
import { json } from '@sveltejs/kit';
import { env } from '$env/dynamic/public';
+import { logger } from '$lib/utils/logger';
const DATABASE_URL = env.PUBLIC_DATABASE_URL;
export const GET: RequestHandler = async ({ cookies }) => {
+ logger.info('GET /api/new_chat');
try {
const token = cookies.get('token');
if (!token) {
+ logger.error('Token non trovato');
return json({ error: 'Unauthorized' }, { status: 401 });
}
@@ -23,15 +26,17 @@ export const GET: RequestHandler = async ({ cookies }) => {
if (!response.ok) {
const errorData = await response.json();
+ logger.error('Errore durante la creazione della nuova chat', errorData);
return json(
{ error: 'Errore durante la creazione della nuova chat', details: errorData },
{ status: response.status }
);
}
const data = await response.json();
+ logger.info('Nuova chat creata con successo', data);
return json({ success: true , chat_id: data.chat_id});
} catch (error) {
- console.error('Errore durante la creazione della nuova chat:', error);
+ logger.error('Errore durante la creazione della nuova chat:', error);
return json({ error: 'Internal server error' }, { status: 500 });
}
};
diff --git a/src/routes/api/rate_message/+server.ts b/src/routes/api/rate_message/+server.ts
index 082ee91..fb8c93f 100644
--- a/src/routes/api/rate_message/+server.ts
+++ b/src/routes/api/rate_message/+server.ts
@@ -1,20 +1,23 @@
import type { RequestHandler } from './$types';
import { json } from '@sveltejs/kit';
import { env } from '$env/dynamic/public';
+import { logger } from '$lib/utils/logger';
const DATABASE_URL = env.PUBLIC_DATABASE_URL;
export const POST: RequestHandler = async ({ request, cookies }) => {
+ logger.info('POST /api/rate_message');
try {
const req = await request.json();
const token = cookies.get('token');
-
+ logger.debug('req', req);
if (!token) {
+ logger.error('Token non trovato');
return json({ error: 'Unauthorized' }, { status: 401 });
}
// Aggiorna la valutazione del messaggio del bot nel database
- console.log('making request to', `http://${DATABASE_URL}/chats/${req.chat_id}/messages/${req.message_id}/rating`);
+ logger.log('making request to', `http://${DATABASE_URL}/chats/${req.chat_id}/messages/${req.message_id}/rating`);
const response = await fetch(`http://${DATABASE_URL}/chats/${req.chat_id}/messages/${req.message_id}/rating`, {
method: 'PATCH',
headers: {
@@ -28,15 +31,16 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
if (!response.ok) {
const errorData = await response.json();
+ logger.error('Errore durante l\'aggiornamento del rating', errorData);
return json(
{ error: 'Failed to update rating', details: errorData },
{ status: response.status }
);
}
-
+ logger.info('Rating aggiornato con successo', req.rating);
return json({ success: true });
} catch (error) {
- console.error('Errore durante l\'aggiornamento del rating:', error);
+ logger.error('Errore durante l\'aggiornamento del rating:', error);
return json({ error: 'Internal server error' }, { status: 500 });
}
};
diff --git a/src/routes/api/save_bot_message/+server.ts b/src/routes/api/save_bot_message/+server.ts
index a32da96..2f10cbb 100644
--- a/src/routes/api/save_bot_message/+server.ts
+++ b/src/routes/api/save_bot_message/+server.ts
@@ -1,15 +1,19 @@
import type { RequestHandler } from './$types';
import { json } from '@sveltejs/kit';
import { env } from '$env/dynamic/public';
+import { logger } from '$lib/utils/logger';
const DATABASE_URL = env.PUBLIC_DATABASE_URL;
export const POST: RequestHandler = async ({ request, cookies }) => {
+ logger.info('POST /api/save_bot_message');
try {
const req = await request.json();
const token = cookies.get('token');
+ logger.debug('req', req);
if (!token) {
+ logger.error('Token non trovato');
return json({ error: 'Unauthorized' }, { status: 401 });
}
@@ -28,6 +32,7 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
if (!response.ok) {
const errorData = await response.json();
+ logger.error('Errore durante il salvataggio del messaggio del bot', errorData);
return json(
{ error: 'Failed to save bot message', details: errorData },
{ status: response.status }
@@ -35,10 +40,11 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
}
const data = await response.json();
+ logger.info('Messaggio del bot salvato con successo', data);
return json({ success: true, data: data });
} catch (error) {
- console.error('Errore durante il salvataggio del messaggio del bot:', error);
+ logger.error('Errore durante il salvataggio del messaggio del bot:', error);
return json({ error: 'Internal server error' }, { status: 500 });
}
};
diff --git a/src/routes/api/stream_chat/+server.ts b/src/routes/api/stream_chat/+server.ts
index 77d7dea..88b592b 100644
--- a/src/routes/api/stream_chat/+server.ts
+++ b/src/routes/api/stream_chat/+server.ts
@@ -1,11 +1,12 @@
import type { RequestHandler } from './$types';
-import { json } from '@sveltejs/kit';
import { env } from '$env/dynamic/public';
-
+import { logger } from '$lib/utils/logger';
const LLM_URL = env.PUBLIC_LLM_URL;
export const POST: RequestHandler = async ({ request, cookies }) => {
+ logger.info('POST /api/stream_chat');
const requestData = await request.json();
+ logger.debug('Request data:', requestData);
if (!requestData) {
throw new Error('No request data');
@@ -22,11 +23,12 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
messages: requestData['messages']
})
});
+ logger.info('Response from LLM:', chatResponse);
if (!chatResponse.ok) {
- const err = await chatResponse.json();
- throw new Error(err.error.message);
+ const err = await chatResponse.json().catch(() => ({}));
+ logger.error('Error from LLM:', err);
+ throw new Error(err.detail || 'Unknown error');
}
-
return chatResponse;
};
diff --git a/src/routes/api/update_chat_name/+server.ts b/src/routes/api/update_chat_name/+server.ts
index 30f5af0..b36f0f6 100644
--- a/src/routes/api/update_chat_name/+server.ts
+++ b/src/routes/api/update_chat_name/+server.ts
@@ -2,18 +2,20 @@ import type { RequestHandler } from './$types';
import { json } from '@sveltejs/kit';
import type { MessageContext } from '$lib/types';
import { env } from '$env/dynamic/public';
+import { logger } from '$lib/utils/logger';
const DATABASE_URL = env.PUBLIC_DATABASE_URL;
const LLM_URL = env.PUBLIC_LLM_URL;
export const POST: RequestHandler = async ({ request, cookies }) => {
+ logger.info('POST /api/update_chat_name');
const requestData = await request.json();
-
+ logger.debug('Request data:', requestData);
if (!requestData) {
throw new Error('No request data');
}
- console.log(requestData['messages']);
+ logger.log(requestData['messages']);
const messagesString = requestData['messages'].map((message: MessageContext) => message.content).join(' ');
const response = await fetch(`http://${LLM_URL}/chat_name`, {
@@ -28,6 +30,8 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
});
if (!response.ok) {
+ const err = await response.json().catch(() => ({}));
+ logger.error('Error from LLM:', err);
return json({ error: response.status }, { status: response.status });
}
@@ -42,6 +46,11 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
'Content-Type': 'application/json'
}
});
-
+ if (!response2.ok) {
+ const err = await response2.json().catch(() => ({}));
+ logger.error('Error from database:', err);
+ return json({ error: response2.status }, { status: response2.status });
+ }
+ logger.info('Chat name updated successfully:', title);
return json({ title });
};
\ No newline at end of file
diff --git a/src/routes/api/update_settings/+server.ts b/src/routes/api/update_settings/+server.ts
index a6e152e..9120656 100644
--- a/src/routes/api/update_settings/+server.ts
+++ b/src/routes/api/update_settings/+server.ts
@@ -2,10 +2,12 @@ import type { RequestHandler } from './$types';
import fs from 'fs/promises';
import path from 'path';
import { env } from '$env/dynamic/public';
+import { logger } from '$lib/utils/logger';
const DATABASE_URL = env.PUBLIC_DATABASE_URL;
export const POST: RequestHandler = async ({ request, cookies }) => {
+ logger.info('POST /api/update_settings');
try {
const { color_primary, color_primary_hover, color_primary_text, chat_history } = await request.json();
@@ -15,7 +17,7 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
color_primary_text,
message_history: chat_history
};
-
+ logger.debug('Request data:', settings);
const response = await fetch(`http://${DATABASE_URL}/settings`, {
method: 'PATCH',
headers: {
@@ -24,20 +26,23 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
},
body: JSON.stringify(settings)
});
-
- if (!response.ok) {
+ logger.debug('Response from database:', response);
+ if (!response.ok){
+ const errorData = await response.json();
+ logger.error('Error from database:', errorData);
throw new Error(`Failed to update settings: ${response.statusText}`);
}
-
- return response;
+ logger.info('Settings updated successfully');
+ return {ok: true, message: 'Settings updated successfully'};
} catch (error) {
- console.error('Errore nel salvataggio dei colori:', error);
+ logger.error('Errore nel salvataggio dei colori:', error);
return new Response(JSON.stringify({ error: 'Errore nel salvataggio' }), { status: 500 });
}
};
export const GET: RequestHandler = async ({ }) => {
+ logger.info('GET /api/get_settings');
try {
const response = await fetch(`http://${DATABASE_URL}/settings`, {
method: 'GET',
@@ -45,15 +50,17 @@ export const GET: RequestHandler = async ({ }) => {
if (!response.ok) {
const errorData = await response.json();
+ logger.error('Error from database:', errorData);
return new Response(JSON.stringify({ error: 'Failed to fetch settings', details: errorData }), {
status: response.status
});
}
const data = await response.json();
+ logger.info('Settings fetched successfully', JSON.stringify(data));
return new Response(JSON.stringify(data), { status: 200 });
} catch (error) {
- console.error('Errore nel recupero dei colori:', error);
+ logger.error('Errore nel recupero dei colori:', error);
return new Response(JSON.stringify({ error: 'Errore nel recupero' }), { status: 500 });
}
}
diff --git a/src/routes/api/upload_image/+server.ts b/src/routes/api/upload_image/+server.ts
index 6265643..71ecea6 100644
--- a/src/routes/api/upload_image/+server.ts
+++ b/src/routes/api/upload_image/+server.ts
@@ -1,6 +1,7 @@
import { error, json, type RequestHandler } from '@sveltejs/kit';
import fs from 'fs/promises';
import path from 'path';
+import { logger } from '$lib/utils/logger';
const UPLOAD_DIR = path.resolve('static/img');
@@ -9,6 +10,7 @@ const MAX_FILE_SIZE_MB = 5;
const MAX_FILE_SIZE_BYTES = MAX_FILE_SIZE_MB * 1024 * 1024;
export const POST: RequestHandler = async ({ request }) => {
+ logger.info('POST /api/upload_image');
let requestedName: string | undefined;
let file: File | null = null;
@@ -16,27 +18,33 @@ export const POST: RequestHandler = async ({ request }) => {
const formData = await request.formData();
const nameValue = formData.get('name');
const fileValue = formData.get('file');
+ logger.debug('Form data:', formData);
if (typeof nameValue !== 'string' || !nameValue) {
+ logger.error('Nome file mancante o non valido nel form data.');
throw error(400, 'Nome file mancante o non valido nel form data.');
}
requestedName = nameValue;
if (!(fileValue instanceof File)) {
+ logger.error('File mancante o non valido nel form data.');
throw error(400, 'File mancante o non valido nel form data.');
}
file = fileValue;
const sanitizedName = path.basename(requestedName);
if (sanitizedName !== requestedName || !/^[a-zA-Z0-9_\-\.]+$/.test(sanitizedName)) {
+ logger.error(`Nome file "${requestedName}" non valido. Contiene caratteri non permessi o tentativi di path traversal.`);
throw error(400, `Nome file "${requestedName}" non valido. Contiene caratteri non permessi o tentativi di path traversal.`);
}
// Opzionale: Validazione tipo MIME e dimensione
if (!ALLOWED_MIME_TYPES.includes(file.type)) {
+ logger.error(`Tipo file non consentito: ${file.type}`);
throw error(400, `Tipo file non consentito: ${file.type}`);
}
if (file.size > MAX_FILE_SIZE_BYTES) {
+ logger.error(`File troppo grande: ${Math.round(file.size / 1024 / 1024 * 100) / 100}MB (max ${MAX_FILE_SIZE_MB}MB)`);
throw error(400, `File troppo grande: ${Math.round(file.size / 1024 / 1024 * 100) / 100}MB (max ${MAX_FILE_SIZE_MB}MB)`);
}
@@ -44,8 +52,10 @@ export const POST: RequestHandler = async ({ request }) => {
// Assicura che la directory di upload esista
try {
await fs.access(UPLOAD_DIR);
+ logger.log(`Directory di upload esistente: ${UPLOAD_DIR}`);
} catch (e) {
// Se non esiste, prova a crearla
+ logger.log(`Directory di upload non trovata, creazione in corso: ${UPLOAD_DIR}`);
await fs.mkdir(UPLOAD_DIR, { recursive: true });
}
@@ -56,11 +66,11 @@ export const POST: RequestHandler = async ({ request }) => {
await fs.writeFile(filePath, buffer);
- console.log(`File salvato con successo: ${filePath}`);
+ logger.log(`File salvato con successo: ${filePath}`);
return json({ message: `File ${sanitizedName} salvato con successo.` }, { status: 200 });
} catch (err: any) {
- console.error('Errore durante l\'upload del file:', err);
+ logger.error('Errore durante l\'upload del file:', err);
if (err.status && err.body) {
throw err;
diff --git a/src/routes/api/users/+server.ts b/src/routes/api/users/+server.ts
index d864eac..90be121 100644
--- a/src/routes/api/users/+server.ts
+++ b/src/routes/api/users/+server.ts
@@ -1,16 +1,20 @@
import type { RequestHandler } from './$types';
import { json } from '@sveltejs/kit';
import { env } from '$env/dynamic/public';
+import { logger } from '$lib/utils/logger';
const DATABASE_URL = env.PUBLIC_DATABASE_URL;
export const POST: RequestHandler = async ({ request, cookies }) => {
+ logger.info('POST /api/users');
try {
const token = cookies.get('token');
const req = await request.json();
+ logger.debug('Request data:', req);
- console.log('Request body:', req);
+ logger.log('Request body:', req);
if (!token) {
+ logger.error('Token non trovato');
return json({ error: 'Unauthorized' }, { status: 401 });
}
@@ -18,8 +22,12 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
const tokenResponse = await fetch(`http://${DATABASE_URL}/auth/verify?token=${token}`, {
method: 'GET'
});
+
+ logger.debug('Token response:', tokenResponse);
+
if (!tokenResponse.ok) {
- const errorData = await tokenResponse.json();
+ const errorData = await tokenResponse.json().catch(() => {});
+ logger.error('Token non valido:', errorData);
cookies.delete('token', { path: '/' });
return json(
{ error: 'Token non valido', details: errorData },
@@ -40,8 +48,11 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
scopes: [req.role]
})
});
+
+ logger.debug('Response from user creation:', response);
+
if (response.status === 400) {
- let errorMessage = await response.json();
+ const errorMessage = await response.json();
return json(
{
error: errorMessage.detail
@@ -49,8 +60,8 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
{ status: response.status }
);
} else if (response.status === 422) {
- let errorMessage = await response.json();
- console.log('Error message:', errorMessage);
+ const errorMessage = await response.json();
+ logger.log('Error message:', errorMessage);
return json(
{
error: 'Dati inseriti non validi'
@@ -58,46 +69,66 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
{ status: response.status }
);
}
+
if (!response.ok) {
+ const errorMessage = await response.json().catch(() => {});
+ logger.error('Errore durante l\'aggiunta dell\'utente:', errorMessage);
return json(
- { error: "Errore durante l'aggiunta dell'utente", details: response },
+ { error: "Errore durante l'aggiunta dell'utente", details: errorMessage },
{ status: response.status }
);
}
-
+ logger.info('Utente creato con successo:', req);
return json({
success: true,
- user: { name: req.name, email: req.email, role: req.scope },
+ user: {
+ name: req.name,
+ email: req.email,
+ role: req.role
+ },
message: 'User added successfully'
});
} catch (error) {
- console.error("Errore durante la creazione dell'utente:", error);
+ logger.error('Errore durante la creazione della nuova chat:', error);
return json({ error: 'Internal server error' }, { status: 500 });
}
};
-export const PATCH: RequestHandler = async ({ request, cookies }) => {
+export const PUT: RequestHandler = async ({ request, cookies }) => {
+ logger.info('PUT /api/users');
+
try {
const token = cookies.get('token');
const req = await request.json();
+ logger.debug('Request data:', req);
if (!token) {
+ logger.error('Token non trovato');
+ return json({ error: 'Unauthorized' }, { status: 401 });
+ }
+
+ if(!req.admin_password) {
+ logger.error('Admin Password non trovata');
return json({ error: 'Unauthorized' }, { status: 401 });
}
const tokenResponse = await fetch(`http://${DATABASE_URL}/auth/verify?token=${token}`, {
method: 'GET'
});
+ logger.debug('Token response:', tokenResponse);
if (!tokenResponse.ok) {
- const errorData = await tokenResponse.json();
+ const errorData = await tokenResponse.json().catch(() => {});
+ logger.error('Token non valido:', errorData);
cookies.delete('token', { path: '/' });
return json(
{ error: 'Token non valido', details: errorData },
{ status: tokenResponse.status }
);
}
+
+
+ const response = await fetch(`http://${DATABASE_URL}/users/`, {
- const response = await fetch(`http://${DATABASE_URL}/users`, {
method: 'PATCH',
headers: {
'Content-Type': 'application/json',
@@ -110,9 +141,11 @@ export const PATCH: RequestHandler = async ({ request, cookies }) => {
admin_password: req.admin_password
})
});
- console.log('Response status:', response);
+ logger.debug('Response from user update:', response);
if (!response.ok) {
+ const errorMessage = await response.json().catch(() => {});
+ logger.error('Errore durante l\'aggiornamento dell\'utente:', errorMessage);
if (response.status === 304) {
return json({ error: 'Nessuna modifica fatta', details: 'No changes made' });
}
@@ -124,21 +157,24 @@ export const PATCH: RequestHandler = async ({ request, cookies }) => {
{ status: response.status }
);
}
+ logger.info('Utente aggiornato con successo:', req);
return json({
success: true,
user: { name: req.name, email: req.email, role: req.scope },
message: 'User updated successfully'
});
} catch (error) {
- console.error('Errore durante la creazione della nuova chat:', error);
+ logger.error('Errore durante la creazione della nuova chat:', error);
return json({ error: 'Internal server error' }, { status: 500 });
}
};
export const DELETE: RequestHandler = async ({ request, cookies }) => {
+ logger.info('DELETE /api/users');
try {
const token = cookies.get('token');
const req = await request.json();
+ logger.debug('Request data:', req);
if (!token) {
return json({ error: 'Unauthorized' }, { status: 401 });
@@ -147,8 +183,10 @@ export const DELETE: RequestHandler = async ({ request, cookies }) => {
const tokenResponse = await fetch(`http://${DATABASE_URL}/auth/verify?token=${token}`, {
method: 'GET'
});
+ logger.debug('Token response:', tokenResponse);
if (!tokenResponse.ok) {
- const errorData = await tokenResponse.json();
+ const errorData = await tokenResponse.json().catch(() => {});
+ logger.error('Token non valido:', errorData);
cookies.delete('token', { path: '/' });
return json(
{ error: 'Token non valido', details: errorData },
@@ -171,23 +209,27 @@ export const DELETE: RequestHandler = async ({ request, cookies }) => {
}
})
});
+ logger.debug('Response from user deletion:', response);
if (!response.ok) {
+ const errorMessage = await response.json().catch(() => {});
+ logger.error('Errore durante l\'eliminazione dell\'utente:', errorMessage);
if (response.status === 401) {
return json({ error: 'Unauthorized', details: 'Unauthorized' }, { status: 401 });
}
-
+
return json(
{ error: "Errore durante l'eliminazione dell'utente", details: response },
{ status: response.status }
);
}
+ logger.info('Utente eliminato con successo:', req);
return json({
success: true,
message: 'User deleted successfully'
});
} catch (error) {
- console.error("Errore durante l'eliminazione dell'utente:", error);
+ logger.error("Errore durante l'eliminazione dell'utente:", error);
return json({ error: 'Internal server error' }, { status: 500 });
}
};
diff --git a/src/routes/cambio-password/+page.server.ts b/src/routes/cambio-password/+page.server.ts
index 64e9c6f..b5b4375 100644
--- a/src/routes/cambio-password/+page.server.ts
+++ b/src/routes/cambio-password/+page.server.ts
@@ -1,88 +1,104 @@
-import type { Actions, ActionFailure } from '@sveltejs/kit';
+import type { Actions } from '@sveltejs/kit';
import { fail, redirect } from '@sveltejs/kit';
import { env } from '$env/dynamic/public';
+import { logger } from '$lib/utils/logger';
const DATABASE_URL = env.PUBLIC_DATABASE_URL;
//Questa pagina viene usata sia per il recupero password che per il primo cambio password
export const load = async ({ cookies }) => {
const token = cookies.get('token');
-
if (!token) {
- return redirect(303, '/');
+ logger.error('Token not found, redirecting to /');
+ throw redirect(303, '/');
}
};
export const actions: Actions = {
default: async ({ cookies, request }) => {
const data = await request.formData();
-
+ logger.debug('Change password form:', data);
const currentPassword = data.get('currentPassword')?.toString();
const password = data.get('password')?.toString();
const passwordConfirm = data.get('passwordConfirm')?.toString();
if (!password || !passwordConfirm) {
+ logger.error('Password or password confirmation are missing');
return fail(400, { error: 'Entrambi i campi password sono obbligatori' });
}
if (password !== passwordConfirm) {
+ logger.error('Password and password confirmation do not match');
return fail(400, { error: 'La password deve essere uguale in entrambi i campi' });
}
// Password validation checks
- if (password.length < 8) {
- return fail(400, { error: 'La password deve essere lunga almeno 8 caratteri' });
- }
- if (!/[A-Z]/.test(password)) {
- return fail(400, { error: 'La password deve contenere almeno una lettera maiuscola' });
- }
- if (!/[a-z]/.test(password)) {
- return fail(400, { error: 'La password deve contenere almeno una lettera minuscola' });
- }
- if (!/\d/.test(password)) {
- return fail(400, { error: 'La password deve contenere almeno una cifra' });
- }
- // Define allowed special characters, adjust as needed. Example includes common ones.
- if (!/[!@#$%^&*(),.?":+{}|<>]/.test(password)) {
- return fail(400, { error: 'La password deve contenere almeno un carattere speciale (es. !@#$%^&*())' });
- }
-
+ const passwordRequirements = [
+ {
+ test: (pwd: string) => pwd.length >= 8,
+ error: 'La password deve essere lunga almeno 8 caratteri'
+ },
+ {
+ test: (pwd: string) => /[A-Z]/.test(pwd),
+ error: 'La password deve contenere almeno una lettera maiuscola'
+ },
+ {
+ test: (pwd: string) => /[a-z]/.test(pwd),
+ error: 'La password deve contenere almeno una lettera minuscola'
+ },
+ {
+ test: (pwd: string) => /\d/.test(pwd),
+ error: 'La password deve contenere almeno una cifra'
+ },
+ {
+ test: (pwd: string) => /[!@#$%^&*(),.?":+{}|<>]/.test(pwd),
+ error: 'La password deve contenere almeno un carattere speciale (es. !@#$%^&*())'
+ }
+ ];
- try {
- //Cambio di password
- const token = await cookies.get('token');
- if (!token) {
- return redirect(303, '/');
+ for (const requirement of passwordRequirements) {
+ if (!requirement.test(password)) {
+ logger.error(requirement.error);
+ return fail(400, { error: requirement.error });
}
+ }
- const payload = JSON.stringify({
- password: password,
- current_password: currentPassword
- });
+ //Cambio di password
+ const token = await cookies.get('token');
+ if (!token) {
+ logger.error('Token not found, redirecting to /');
+ return redirect(303, '/');
+ }
- // console.log('payload: ', payload);
- const response = await fetch(`http://${DATABASE_URL}/users/password`, {
- method: 'PATCH',
- headers: {
- 'Content-Type': 'application/json',
- Authorization: `Bearer ${token}`
- },
- body: payload
- });
+ const payload = JSON.stringify({
+ password: password,
+ current_password: currentPassword
+ });
+ logger.debug('Payload:', payload);
+ const response = await fetch(`http://${DATABASE_URL}/users/password`, {
+ method: 'PATCH',
+ headers: {
+ 'Content-Type': 'application/json',
+ Authorization: `Bearer ${token}`
+ },
+ body: payload
+ });
- if (!response.ok) {
- const errorResponse = await response.json();
- console.error('Errore: ', errorResponse);
- if (errorResponse.error === 'Invalid password') {
- return fail(400, { error: 'La password attuale non è corretta' });
- } else {
- return fail(500, { error: 'Errore nel cambio password' });
- }
+ if (!response.ok) {
+ const errorResponse = await response.json().catch(() => ({}));
+ logger.error('Error response:', errorResponse);
+
+ if (errorResponse.error === 'Invalid password') { //TODO: usare il codice di errore
+ logger.error('Invalid password');
+ return fail(400, { error: 'La password attuale non è corretta' });
+ } else {
+ logger.error('Server error:', errorResponse);
+ return fail(500, { error: 'Errore di connessione al server' });
}
- } catch (error) {
- console.error('Errore: ', error);
- return fail(500, { error: 'Errore di connessione al server' });
- }
+ }
+ const result = await response.json();
+ logger.debug('Response data:', result);
+ logger.info('Password changed successfully');
return { success: true };
}
};
diff --git a/src/routes/cambio-password/+page.svelte b/src/routes/cambio-password/+page.svelte
index 1211418..623faca 100644
--- a/src/routes/cambio-password/+page.svelte
+++ b/src/routes/cambio-password/+page.svelte
@@ -1,9 +1,8 @@
@@ -11,7 +10,7 @@
diff --git a/src/routes/login/+page.server.ts b/src/routes/login/+page.server.ts
index f2f1454..1decc74 100644
--- a/src/routes/login/+page.server.ts
+++ b/src/routes/login/+page.server.ts
@@ -1,12 +1,16 @@
-import type { Actions, ActionFailure } from '@sveltejs/kit';
+import { logger } from '$lib/utils/logger';
+
+
+import type { Actions } from '@sveltejs/kit';
import { fail, redirect } from '@sveltejs/kit';
import { env } from '$env/dynamic/public';
const DATABASE_URL = env.PUBLIC_DATABASE_URL;
export const load = async ({ cookies }) => {
+ logger.info('Loading login page');
+
const token = cookies.get('token');
-
if (token) {
return redirect(303, '/');
}
@@ -15,36 +19,35 @@ export const load = async ({ cookies }) => {
export const actions: Actions = {
default: async ({ request, cookies }) => {
const data = await request.formData();
+ const body = new URLSearchParams({
+ grant_type: 'password',
+ username: data.get('username')?.toString() || '',
+ password: data.get('password')?.toString() || '',
+ remember_me: data.get('remember_me')?.toString() === 'on' ? 'true' : 'false'
+ });
+ logger.debug('Login Post data:', body.toString());
- const username = data.get('username')?.toString();
- const password = data.get('password')?.toString();
- const remember_me = data.get('remember_me')?.toString() === 'on' ? 'true' : 'false';
- console.log("login data", data);
-
- if (!username || !password) {
+ if (!body.get('username') || !body.get('password')) {
+ logger.error('Username or password are missing');
return fail(400, { error: 'Username e password sono richiesti' });
}
try {
- const response = await fetch(`http://${DATABASE_URL}/auth/token?remember_me=${remember_me}`, {
+ const response = await fetch(`http://${DATABASE_URL}/auth/token?remember_me=${body.get('remember_me')}`, {
method: 'POST',
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
},
- body: new URLSearchParams({
- grant_type: 'password',
- username: username,
- password: password,
- })
+ body
});
if (!response.ok) {
const errorBody = await response.json().catch(() => ({}));
- console.error('Dettagli errore:', JSON.stringify(errorBody));
+ logger.error('Error detail:', JSON.stringify(errorBody));
return fail(403, { error: 'Credenziali non valide', dettagli: JSON.stringify(errorBody) });
}
-
const {access_token, expires_in} = await response.json();
+ logger.info('Login response:', { access_token, expires_in });
cookies.set('token', access_token, {
path: '/',
@@ -54,8 +57,9 @@ export const actions: Actions = {
maxAge: expires_in ? expires_in : undefined,
sameSite: 'strict'
});
+ logger.info('Login successful, token set:', access_token);
} catch (error) {
- console.error("Errore durante l'autenticazione:", error);
+ logger.error("Server error:", error);
return fail(500, { error: 'Errore di connessione al server' });
}
return redirect(303, '/');
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index 2fd33c4..7788fee 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -1,6 +1,5 @@
@@ -11,11 +10,11 @@
Login
- {#if $page.form?.error}
-
{$page.form.error}
+ {#if page.form?.error}
+
{page.form.error}
{/if}
-