removed library remains, add helper usage in hooks
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import { BASE_API_URI } from "$lib/utils/constants.js";
|
||||
import { refreshCookie, userDatesFromRFC3339 } from "$lib/utils/helpers";
|
||||
|
||||
/** @type {import('@sveltejs/kit').Handle} */
|
||||
export async function handle({ event, resolve }) {
|
||||
@@ -30,52 +31,29 @@ export async function handle({ event, resolve }) {
|
||||
|
||||
// Check if the server sent a new token
|
||||
const newToken = response.headers.get("Set-Cookie");
|
||||
if (newToken) {
|
||||
const match = newToken.match(/jwt=([^;]+)/);
|
||||
if (match) {
|
||||
event.cookies.set("jwt", match[1], {
|
||||
path: "/",
|
||||
httpOnly: true,
|
||||
secure: process.env.NODE_ENV === "production", // Secure in production
|
||||
sameSite: "lax",
|
||||
maxAge: 5 * 24 * 60 * 60, // 5 days in seconds
|
||||
});
|
||||
}
|
||||
}
|
||||
refreshCookie(newToken, event);
|
||||
|
||||
event.locals.subscriptions = data.subscriptions;
|
||||
userDatesFromRFC3339(data.user);
|
||||
|
||||
const [subscriptionsResponse, licenceCategoriesResponse] = await Promise.all([
|
||||
fetch(`${BASE_API_URI}/backend/membership/subscriptions`, {
|
||||
credentials: "include",
|
||||
headers: { Cookie: `jwt=${jwt}` },
|
||||
}),
|
||||
fetch(`${BASE_API_URI}/backend/licence/categories`, {
|
||||
credentials: "include",
|
||||
headers: { Cookie: `jwt=${jwt}` },
|
||||
}),
|
||||
]);
|
||||
const [subscriptionsData, licence_categoriesData] = await Promise.all([
|
||||
subscriptionsResponse.json(),
|
||||
licenceCategoriesResponse.json(),
|
||||
]);
|
||||
event.locals.user = data.user;
|
||||
event.locals.licence_categories = data.licence_categories;
|
||||
console.dir(event.locals.user);
|
||||
if (event.locals.user.date_of_birth) {
|
||||
event.locals.user.date_of_birth =
|
||||
event.locals.user.date_of_birth.split("T")[0];
|
||||
}
|
||||
if (event.locals.user.membership) {
|
||||
if (event.locals.user.membership.start_date) {
|
||||
event.locals.user.membership.start_date =
|
||||
event.locals.user.membership.start_date.split("T")[0];
|
||||
}
|
||||
if (event.locals.user.membership.end_date) {
|
||||
event.locals.user.membership.end_date =
|
||||
event.locals.user.membership.end_date.split("T")[0];
|
||||
}
|
||||
}
|
||||
if (event.locals.user.licence?.issued_date) {
|
||||
event.locals.user.licence.issued_date =
|
||||
event.locals.user.licence.issued_date.split("T")[0];
|
||||
}
|
||||
if (event.locals.user.licence?.expiration_date) {
|
||||
event.locals.user.licence.expiration_date =
|
||||
event.locals.user.licence.expiration_date.split("T")[0];
|
||||
}
|
||||
if (
|
||||
event.locals.user.bank_account &&
|
||||
event.locals.user.bank_account.mandate_date_signed
|
||||
) {
|
||||
event.locals.user.bank_account.mandate_date_signed =
|
||||
event.locals.user.bank_account.mandate_date_signed.split("T")[0];
|
||||
}
|
||||
event.locals.subscriptions = subscriptionsData.subscriptions;
|
||||
event.locals.licence_categories = licence_categoriesData.licence_categories;
|
||||
// console.log("hooks.server: Printing locals:");
|
||||
// console.dir(event.locals);
|
||||
|
||||
// load page as normal
|
||||
return await resolve(event);
|
||||
|
||||
Reference in New Issue
Block a user