Improve/api calls post requests

apps/web/app/hooks/features/useTeamInvitations.ts

@@ -21,8 +21,6 @@ import { useQuery } from '../useQuery';
 import { useAuthenticateUser } from './useAuthenticateUser';
 
 export function useTeamInvitations() {
-	const { user } = useAuthenticateUser();
-
 	const setTeamInvitations = useSetRecoilState(teamInvitationsState);
 	const [myInvitationsList, setMyInvitationsList] = useRecoilState(myInvitationsState);
 
@@ -48,14 +46,26 @@ export function useTeamInvitations() {
 	const { queryCall: acceptRejectMyInvitationsQueryCall, loading: acceptRejectMyInvitationsLoading } =
 		useQuery(acceptRejectMyInvitationsAPI);
 
+	const { user } = useAuthenticateUser();
+
 	const inviteUser = useCallback(
 		(email: string, name: string) => {
-			return inviteQueryCall({ email, name }).then((res) => {
-				setTeamInvitations(res.data?.items || []);
+			return inviteQueryCall(
+				{
+					email,
+					name,
+					organizationId: user?.employee.organizationId as string,
+					teamId: activeTeamId as string
+				},
+				user?.tenantId as string
+			).then((res) => {
+				console.log('invited!!!!:', res);
+
+				setTeamInvitations((prev) => [...prev, ...(res.data?.items || [])]);
 				return res;
 			});
 		},
-		[inviteQueryCall, setTeamInvitations]
+		[inviteQueryCall, setTeamInvitations, user?.tenantId, activeTeamId, user?.employee.organizationId]
 	);
 
 	useEffect(() => {

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

@@ -1,9 +1,63 @@
 import { PaginationResponse } from '@app/interfaces/IDataResponse';
-import { IInvitation, IInviteRequest, MyInvitationActionEnum, CreateResponse } from '@app/interfaces';
-import api, { get } from '../axios';
+import {
+	IInvitation,
+	//  IInviteRequest,
+	MyInvitationActionEnum,
+	CreateResponse,
+	IInviteCreate
+} from '@app/interfaces';
+import { INVITE_CALLBACK_URL } from '@app/constants';
+import api, { get, post } from '../axios';
+// import { getEmployeeRoleRequest } from '@app/services/server/requests';
+// import { getCookie } from 'cookies-next';
 
-export function inviteByEmailsAPI(data: IInviteRequest) {
-	return api.post<PaginationResponse<IInvitation>>('/invite/emails', data);
+// export function inviteByEmailsAPI(data: IInviteRequest) {
+// 	return api.post<PaginationResponse<IInvitation>>('/invite/emails', data);
+// }
+
+interface IIInviteRequest {
+	email: string;
+	name: string;
+	teamId: string;
+	organizationId: string;
+}
+
+export async function inviteByEmailsAPI(data: IIInviteRequest, tenantId: string) {
+	const endpoint = '/invite/emails';
+
+	// const authToken = getCookie('auth-token')?.toString();
+
+	const date = new Date();
+	date.setDate(date.getDate() - 1);
+
+	// console.log('authToken:', authToken);
+	// console.log('tenantId:', tenantId);
+
+	// const { data: employeeRole } = await getEmployeeRoleRequest({
+	// 	tenantId,
+	// 	role: 'EMPLOYEE',
+	// 	bearer_token: authToken as string
+	// });
+
+	const dataToInviteUser: IInviteCreate = {
+		emailIds: [data.email],
+		projectIds: [],
+		departmentIds: [],
+		organizationContactIds: [],
+		teamIds: [data.teamId],
+		roleId: 'b1d702d9-9380-4cda-a442-0e7d1ca7480e' || '',
+		invitationExpirationPeriod: 'Never',
+		inviteType: 'TEAM',
+		appliedDate: null,
+		fullName: data.name,
+		callbackUrl: INVITE_CALLBACK_URL,
+		organizationId: data.organizationId,
+		startedWorkOn: date.toISOString()
+	};
+
+	const fetchData = await post(endpoint, dataToInviteUser, true, { tenantId });
+
+	return process.env.NEXT_PUBLIC_GAUZY_API_SERVER_URL ? fetchData.data : fetchData;
 }
 
 export async function getTeamInvitationsAPI(tenantId: string, organizationId: string, role: string, teamId: string) {

apps/web/app/services/client/axios.ts

@@ -87,6 +87,24 @@ function get(
 		: api.get(endpoint);
 }
 
+function post(
+	endpoint: string,
+	data: any,
+	isDirect: boolean,
+	extras?: {
+		tenantId: string;
+	}
+) {
+	console.log('Post Request:', endpoint, data, isDirect, extras);
+	return isDirect && process.env.NEXT_PUBLIC_GAUZY_API_SERVER_URL
+		? apiDirect.post(endpoint, data, {
+				headers: {
+					...(extras?.tenantId ? { 'tenant-id': extras?.tenantId } : {})
+				}
+		  })
+		: api.post(endpoint, data);
+}
+
 export default api;
 
-export { apiDirect, get };
+export { apiDirect, get, post };

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

@@ -10,6 +10,8 @@ export function getEmployeeRoleRequest({
 	role: 'EMPLOYEE';
 	tenantId: string;
 }) {
+	console.log('authToken:', bearer_token);
+	console.log('tenantId:', tenantId);
 	return serverFetch<IRole>({
 		path: `/roles/options?name=${role}`,
 		method: 'GET',