Fix-[Web]: Guard timesheet report proxy routes and forward the access token

apps/web/app/api/timesheet/activity/report/route.ts

@@ -1,4 +1,5 @@
-import { NextRequest } from 'next/server';
+import { NextRequest, NextResponse } from 'next/server';
+import { authenticatedGuard } from '@/core/services/server/guards/authenticated-guard-app';
 import { getActivityReportRequest } from '@/core/services/server/requests/timesheet';
 import { IActivityRequestParams } from '@/core/services/server/requests/timesheet';
 import { ETimeLogType } from '@/core/types/generics/enums/timer';
@@ -11,7 +12,14 @@ export const runtime = 'nodejs';
  * Fetches activity report data based on provided query parameters
  */
 export async function GET(req: NextRequest) {
+	const res = new NextResponse();
+
 	try {
+		// Authenticate before reading parameters so anonymous callers always get 401
+		const guard = await authenticatedGuard(req, res);
+		if (!guard.user) return guard.deny();
+		const { access_token } = guard;
+
 		const searchParams = req.nextUrl.searchParams;
 
 		const params: Partial<IActivityRequestParams> = {
@@ -63,7 +71,7 @@ export async function GET(req: NextRequest) {
 		}
 
 		// Fetch activity report data
-		const data = await getActivityReportRequest(params as IActivityRequestParams);
+		const { data } = await getActivityReportRequest(params as IActivityRequestParams, access_token);
 
 		return new Response(JSON.stringify(data), {
 			status: 200,

apps/web/app/api/timesheet/time-log/report/daily/route.ts

@@ -1,12 +1,20 @@
-import { NextRequest } from 'next/server';
+import { NextRequest, NextResponse } from 'next/server';
+import { authenticatedGuard } from '@/core/services/server/guards/authenticated-guard-app';
 import { getTimeLogReportDailyRequest } from '@/core/services/server/requests/timesheet';
 import { ITimeLogRequestParams } from '@/core/services/server/requests/timesheet';
 
 export const dynamic = 'force-dynamic';
 export const runtime = 'nodejs';
 
 export async function GET(req: NextRequest) {
+	const res = new NextResponse();
+
 	try {
+		// Authenticate before reading parameters so anonymous callers always get 401
+		const guard = await authenticatedGuard(req, res);
+		if (!guard.user) return guard.deny();
+		const { access_token } = guard;
+
 		const searchParams = req.nextUrl.searchParams;
 
 		const params: Partial<ITimeLogRequestParams> = {
@@ -53,9 +61,9 @@ export async function GET(req: NextRequest) {
 			};
 		}
 
-		const response = await getTimeLogReportDailyRequest(params as ITimeLogRequestParams);
+		const { data } = await getTimeLogReportDailyRequest(params as ITimeLogRequestParams, access_token);
 
-		return new Response(JSON.stringify(response), {
+		return new Response(JSON.stringify(data), {
 			status: 200,
 			headers: {
 				'Content-Type': 'application/json'

apps/web/core/services/server/guards/authenticated-guard-app.ts

@@ -17,14 +17,30 @@
 	const taskId = getActiveTaskIdCookie({ req, res });
 	const projectId = getActiveProjectIdCookie({ req, res });
 
+	// serverFetch rejects a non-2xx answer with Promise.reject(data), so Gauzy's status code sits inside
+	// that promise; a network failure rejects with a plain error that carries no status code.
+	let rejectedStatus: number | undefined;
 	const r_res = await currentAuthenticatedUserRequest({
 		bearer_token: access_token?.toString() || ''
-	}).catch(console.error);
+	}).catch(async (error: unknown) => {
+		const reason = error instanceof Promise ? await error.catch((data) => data) : error;
+		rejectedStatus = (reason as { statusCode?: number } | undefined)?.statusCode;
+		console.error(reason);
+	});
 
 	if (!r_res || (r_res.data as any).statusCode === 401) {
+		// True when Gauzy rejected the token itself; false when the check could not be completed.
+		const unauthorized = rejectedStatus === 401 || (r_res?.data as any)?.statusCode === 401;
 		return {
 			$res: (data: any) => NextResponse.json({ statusCode: 401, message: data }),
-			user: null
+			user: null,
+			unauthorized,
+			// 401 only when the token was rejected: answering 401 to a failed check would make the
+			// client log the user out during a Gauzy outage.
+			deny: () =>
+				unauthorized
+					? NextResponse.json({ message: 'Unauthorized' }, { status: 401 })
+					: NextResponse.json({ message: 'Session check unavailable, retry later' }, { status: 503 })
 		};
 	}