Merge pull request #2247 from ever-co/feat/static-build-support-15

Tiny Fixes

apps/web/app/api/auth/verify/resend-link/route.ts

@@ -11,7 +11,9 @@ export async function POST(req: Request) {
 
 	const { $res, user, access_token, tenantId } = await authenticatedGuard(req, res);
 
-	if (!user) return $res('Unauthorized');
+	if (!user) {
+		return $res('Unauthorized');
+	}
 
 	const { data } = await resentVerifyUserLinkRequest({
 		bearer_token: access_token,

apps/web/app/api/employee/working/route.ts

@@ -5,9 +5,12 @@ import { NextResponse } from 'next/server';
 export async function GET(req: Request) {
 	const res = new NextResponse();
 	const { $res, user, access_token, tenantId, organizationId } = await authenticatedGuard(req, res);
-	if (!user) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+
+	if (!user) {
+		return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+	}
 
 	const { data } = await getOrganizationEmployees(access_token, tenantId, organizationId);
 
-	$res(data);
+	return $res(data);
 }

apps/web/app/api/invite/emails/route.ts

@@ -65,5 +65,5 @@ export async function POST(req: Request) {
 		access_token
 	);
 
-	$res(data);
+	return $res(data);
 }

apps/web/app/api/invite/resend/route.ts

@@ -32,5 +32,5 @@ export async function POST(req: Request) {
 		access_token
 	);
 
-	$res(data);
+	return $res(data);
 }

apps/web/app/api/invite/route.ts

@@ -5,7 +5,9 @@ import { NextResponse } from 'next/server';
 export async function GET(req: Request) {
 	const res = new NextResponse();
 	const { $res, user, access_token, tenantId, organizationId, teamId } = await authenticatedGuard(req, res);
-	if (!user) return NextResponse.json({ error: 'Unauthorized' });
+	if (!user) {
+		return NextResponse.json({ error: 'Unauthorized' });
+	}
 
 	const { data } = await getTeamInvitationsRequest(
 		{
@@ -17,5 +19,5 @@ export async function GET(req: Request) {
 		access_token
 	);
 
-	$res(data);
+	return $res(data);
 }

apps/web/app/api/invite/validate-by-code/route.ts

@@ -15,5 +15,5 @@ export async function POST(req: Request) {
 
 	const { data } = await verifyInviteCodeRequest(body);
 
-	NextResponse.json(data, { status: 200 });
+	return NextResponse.json(data, { status: 200 });
 }

apps/web/app/api/organization-projects/setting/[id]/route.ts

@@ -12,7 +12,10 @@ export async function PUT(req: Request, { params }: INextParams) {
 	}
 
 	const { $res, user, access_token, tenantId } = await authenticatedGuard(req, res);
-	if (!user) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+
+	if (!user) {
+		return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+	}
 
 	const body = await req.json();
 
@@ -23,5 +26,5 @@ export async function PUT(req: Request, { params }: INextParams) {
 		tenantId
 	});
 
-	$res(response.data);
+	return $res(response.data);
 }

apps/web/app/api/tasks/team/route.ts

@@ -1,6 +1,6 @@
 import { getActiveTeamIdCookie } from '@app/helpers/cookies';
 import { authenticatedGuard } from '@app/services/server/guards/authenticated-guard-app';
-import { createTaskRequest, getTeamTasksRequest } from '@app/services/server/requests';
+import { createTaskRequest, getTeamTasksIRequest, getTeamTasksRequest } from '@app/services/server/requests';
 import { NextResponse } from 'next/server';
 
 export async function POST(req: Request) {
@@ -52,3 +52,22 @@ export async function POST(req: Request) {
 
 	return $res(tasks);
 }
+
+export async function GET(req: Request) {
+	const res = new NextResponse();
+	const { $res, user, tenantId, access_token } = await authenticatedGuard(req, res);
+
+	const query = new URL(req.url);
+
+	if (!user) {
+		return $res('Unauthorized');
+	}
+
+	const { data: tasks } = await getTeamTasksIRequest({
+		tenantId,
+		bearer_token: access_token,
+		query: query.searchParams.toString()
+	});
+
+	return $res(tasks);
+}

apps/web/app/services/client/api/auth.ts

@@ -83,7 +83,9 @@ export const resentVerifyUserLinkAPI = (user: IUser) => {
 		appEmailConfirmationUrl: VERIFY_EMAIL_CALLBACK_URL || appEmailConfirmationUrl
 	};
 
-	return post<ISuccessResponse>(`/auth/verify/resend-link`, body);
+	const endpoint = GAUZY_API_BASE_SERVER_URL.value ? '/auth/email/verify/resend-link' : `/auth/verify/resend-link`;
+
+	return post<ISuccessResponse>(endpoint, body);
 };
 
 export const signInEmailAPI = (email: string) => {

apps/web/app/services/server/requests/tasks.ts

@@ -54,6 +54,23 @@ export function getTeamTasksRequest({
 	});
 }
 
+export function getTeamTasksIRequest({
+	tenantId,
+	bearer_token,
+	query
+}: {
+	tenantId: string;
+	bearer_token: string;
+	query: string;
+}) {
+	return serverFetch<PaginationResponse<ITeamTask>>({
+		path: `/tasks/team?${query}`,
+		method: 'GET',
+		bearer_token,
+		tenantId
+	});
+}
+
 export function getTaskByIdRequest({
 	tenantId,
 	organizationId,