fix more redirects

alexvdvalk · Mar 5, 2024 · 464b071 · 464b071
1 parent e4a2f62
commit 464b071
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 67 deletions.
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
@@ -1,12 +1,8 @@
+import { redirect } from "@sveltejs/kit";
 import type { PageServerLoad } from "./$types";
-// import { checkPing } from "$lib/checkPing";
-// import { redirect } from "@sveltejs/kit";
 
 export const load = (async ({ locals, url }) => {
-  // let ping;
-  // try {
-  //   ping = await checkPing(locals.restUrl, locals.BhRestToken);
-  // } catch (err) {}
-  // if (ping) redirect(302, "/add");
+  if (locals.BhRestToken && locals.restUrl) redirect(302, "/add");
+
   return { url: url.origin };
 }) satisfies PageServerLoad;
diff --git a/src/routes/add/+page.server.ts b/src/routes/add/+page.server.ts
@@ -11,73 +11,75 @@ import type { BullhornMetaResponse } from "$lib/Responses";
 import type { FieldMap } from "$lib/FieldMap";
 import { faker } from "@faker-js/faker";
 import type { EntityTitleResponse } from "$lib/interfaces";
-export const load = (async ({ locals }) => {
-  const instance = axios.create({
-    baseURL: locals.restUrl,
-    params: { BhRestToken: locals.BhRestToken },
-  });
-  const settings = await getSettings(instance);
+export const load = (async ({ locals, cookies }) => {
+  try {
+    const instance = axios.create({
+      baseURL: locals.restUrl,
+      params: { BhRestToken: locals.BhRestToken },
+    });
+    const settings = await getSettings(instance);
 
-  const entityCounts = mainEntities.map((ent) => {
-    let label = (settings as any)[`entityTitle${ent}Many`] || ent;
-    return {
-      entity: ent,
-      label,
-      total: getTotal(
-        ent,
-        locals.restUrl as string,
-        locals.BhRestToken as string
-      ),
-    };
-  });
+    const entityCounts = mainEntities.map((ent) => {
+      let label = (settings as any)[`entityTitle${ent}Many`] || ent;
+      return {
+        entity: ent,
+        label,
+        total: getTotal(
+          ent,
+          locals.restUrl as string,
+          locals.BhRestToken as string
+        ),
+      };
+    });
 
-  const entities = mainEntities.map((ent) => {
+    const entities = mainEntities.map((ent) => {
+      return {
+        entity: ent,
+        label: (settings as any)[`entityTitle${ent}`] || ent,
+      };
+    });
     return {
-      entity: ent,
-      label: (settings as any)[`entityTitle${ent}`] || ent,
+      totals: entityCounts,
+      corporationDetails: {
+        corporationName: settings.corporationName,
+        corporationId: settings.corporationId,
+      },
+      entities,
+      restUrl: locals.restUrl,
+      BhRestToken: locals.BhRestToken,
     };
-  });
-  return {
-    totals: entityCounts,
-    corporationDetails: {
-      corporationName: settings.corporationName,
-      corporationId: settings.corporationId,
-    },
-    entities,
-    restUrl: locals.restUrl,
-    BhRestToken: locals.BhRestToken,
-  };
+  } catch (er) {
+    cookies.delete("BhRestToken", { path: "/" });
+    cookies.delete("restUrl", { path: "/" });
+    redirect(302, "/");
+  }
 }) satisfies PageServerLoad;
 
 const getSettings = async (instance: AxiosInstance) => {
-  try {
-    const entities = [
-      "entityTitleCandidate",
-      "entityTitleCandidateMany",
-      "entityTitleClientContact",
-      "entityTitleClientContactMany",
-      "entityTitleJobOrder",
-      "entityTitleJobOrderMany",
-      "entityTitlePlacement",
-      "entityTitlePlacementMany",
-      "entityTitleSendout",
-      "entityTitleSendoutMany",
-      "entityTitleJobSubmission",
-      "entityTitleJobSubmissionMany",
-      "entityTitleClientCorporation",
-      "entityTitleClientCorporationMany",
-      "entityTitleLead",
-      "entityTitleLeadMany",
-      "entityTitleOpportunity",
-      "entityTitleOpportunityMany",
-    ];
-    let { data } = await instance.get<EntityTitleResponse>(
-      `settings/${entities.join(",")},corporationName,corporationId`
-    );
-    return data;
-  } catch (err) {
-    redirect(302, "/");
-  }
+  const entities = [
+    "entityTitleCandidate",
+    "entityTitleCandidateMany",
+    "entityTitleClientContact",
+    "entityTitleClientContactMany",
+    "entityTitleJobOrder",
+    "entityTitleJobOrderMany",
+    "entityTitlePlacement",
+    "entityTitlePlacementMany",
+    "entityTitleSendout",
+    "entityTitleSendoutMany",
+    "entityTitleJobSubmission",
+    "entityTitleJobSubmissionMany",
+    "entityTitleClientCorporation",
+    "entityTitleClientCorporationMany",
+    "entityTitleLead",
+    "entityTitleLeadMany",
+    "entityTitleOpportunity",
+    "entityTitleOpportunityMany",
+  ];
+  let { data } = await instance.get<EntityTitleResponse>(
+    `settings/${entities.join(",")},corporationName,corporationId`
+  );
+  return data;
 };
 
 export const actions = {