sr2/link-stack
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CSRF refresh fixes

Browse source
This commit is contained in:
Darren Clarke 2024-08-14 13:03:50 +02:00
parent a8dc0b3647
commit f0e8e20c24
15 changed files with 12111 additions and 51665 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/link/app/(main)/overview/[overview]/_components/TicketCreateDialog.tsx
View file

@ -50,7 +50,6 @@ export const TicketCreateDialog: FC<TicketCreateDialogProps> = ({
);
const [liveFormState, setLiveFormState] = useState(formState);
const updateFormState = (field: string, value: any) => {
console.log({ value });
const newState = { ...liveFormState };
newState.values[field] = value;
setLiveFormState(newState);
@ -68,7 +67,6 @@ export const TicketCreateDialog: FC<TicketCreateDialogProps> = ({
useEffect(() => {
const fetchGroups = async () => {
const result = await getGroupsAction();
console.log({ result });
setGroups(result);
};

2
apps/link/app/_actions/groups.ts
View file

@ -15,7 +15,7 @@ export const getGroupsAction = async () => {
return formattedGroups;
} catch (e) {
console.error(e);
console.error(e.message);
return [];
}
};

4
apps/link/app/_actions/overviews.ts
View file

@ -36,7 +36,7 @@ export const getOverviewTicketCountsAction = async () => {
return counts;
} catch (e) {
console.error(e);
console.error(e.message);
return {};
}
};
@ -91,7 +91,7 @@ export const getOverviewTicketsAction = async (name: string) => {
return { tickets: sortedTickets };
} catch (e) {
console.error(e);
console.error(e.message);
return { tickets, message: e.message ?? "" };
}
};

2
apps/link/app/_actions/search.ts
View file

@ -11,7 +11,7 @@ export const searchAllAction = async (query: string, limit: number) => {
return result?.search;
} catch (e) {
console.error(e);
console.error(e.message);
return [];
}
};

16
apps/link/app/_actions/tickets.ts
View file

@ -36,7 +36,7 @@ export const createTicketAction = async (
success: true,
};
} catch (e: any) {
console.log({ e });
console.error(e.message);
return {
success: false,
values: {},
@ -63,7 +63,7 @@ export const createTicketArticleAction = async (
success: true,
};
} catch (e: any) {
console.log({ e });
console.error(e.message);
return {
success: false,
message: e?.message ?? "Unknown error",
@ -117,7 +117,7 @@ export const updateTicketAction = async (
success: true,
};
} catch (e: any) {
console.log({ e });
console.error(e.message);
return {
success: false,
message: e?.message ?? "Unknown error",
@ -134,7 +134,7 @@ export const getTicketAction = async (id: string) => {
return ticketData?.ticket;
} catch (e) {
console.error(e);
console.error(e.message);
return {};
}
};
@ -148,7 +148,7 @@ export const getTicketArticlesAction = async (id: string) => {
return ticketData?.ticketArticles;
} catch (e) {
console.error(e);
console.error(e.message);
return {};
}
};
@ -167,7 +167,7 @@ export const getTicketStatesAction = async () => {
return formattedStates;
} catch (e) {
console.error(e);
console.error(e.message);
return [];
}
};
@ -180,7 +180,7 @@ export const getTagsAction = async () => {
return tags;
} catch (e) {
console.error(e);
console.error(e.message);
return [];
}
};
@ -199,7 +199,7 @@ export const getTicketPrioritiesAction = async () => {
return formattedPriorities;
} catch (e) {
console.error(e);
console.error(e.message);
return [];
}
};

6
apps/link/app/_actions/users.ts
View file

@ -18,7 +18,7 @@ export const getAgentsAction = async () => {
return formattedAgents;
} catch (e) {
console.error(e);
console.error(e.message);
return [];
}
};
@ -39,7 +39,7 @@ export const getCustomersAction = async () => {
return formattedCustomers;
} catch (e) {
console.error(e);
console.error(e.message);
return [];
}
};
@ -59,7 +59,7 @@ export const getUsersAction = async () => {
return formattedUsers;
} catch (e) {
console.error(e);
console.error(e.message);
return [];
}
};

24
apps/link/app/_components/CSRFProvider.tsx
View file

@ -1,33 +1,33 @@
"use client";
import { FC, PropsWithChildren, useState, useEffect } from "react";
import { FC, PropsWithChildren, useEffect } from "react";
import { useRouter } from "next/navigation";
import { useSession } from "next-auth/react";
export const CSRFProvider: FC<PropsWithChildren> = ({ children }) => {
const { data: session, status, update } = useSession();
const router = useRouter();
const [redirectCount, setRedirectCount] = useState(0);
useEffect(() => {
const interval = setInterval(async () => {
const checkSession = async () => {
console.log("Checking session status...");
console.log(status);
if (status === "authenticated") {
const response = await fetch("/api/v1/users/me");
console.log(response.ok);
console.log(!!router);
if (!response.ok && !!router) {
const response = await fetch("/api/v1/users/me", {
method: "GET",
});
if (response.status !== 200 && !!router) {
console.log("redirecting");
setRedirectCount(redirectCount + 1);
router.push("/setup");
window.location.href = "/auth/sso";
} else {
setRedirectCount(0);
const token = response.headers.get("CSRF-Token");
update({ csrfToken: token });
update({ zammadCsrfToken: token });
}
}
}, 15000);
};
const interval = setInterval(checkSession, 15000);
return () => clearInterval(interval);
}, [session, status, update, router]);

2
apps/link/app/_lib/authentication.ts
View file

@ -123,7 +123,7 @@ export const authOptions: NextAuthOptions = {
}
if (session && trigger === "update") {
token.zammadCsrfToken = session.csrfToken;
token.zammadCsrfToken = session.zammadCsrfToken;
}
return token;
},

1
apps/link/app/_lib/zammad.ts
View file

@ -10,6 +10,7 @@ const getHeaders = async () => {
Accept: "application/json",
// @ts-ignore
"X-CSRF-Token": session.user.zammadCsrfToken,
"X-Browser-Fingerprint": `${session.expires}`,
Cookie: allCookies
.map((cookie: any) => `${cookie.name}=${cookie.value}`)
.join("; "),