@studentsphere/linkgor 0.0.1-alpha → 0.0.2-alpha

package/dist/index.js

@@ -185,11 +185,15 @@ async function getProfile(instanceId, token) {
     throw new Error(`Failed to parse cookie jar token: ${e}`);
   }
   const casUrl = getCASURL(instanceId);
+  const cookieHeader = serializeCookies(jar, casUrl);
+  const headers = {
+    "User-Agent": "linkgor"
+  };
+  if (cookieHeader) {
+    headers["Cookie"] = cookieHeader;
+  }
   const response = await fetch(casUrl, {
-    headers: {
-      "User-Agent": "linkgor",
-      Cookie: serializeCookies(jar, casUrl)
-    }
+    headers
   });
   if (!response.ok) {
     throw new Error(
@@ -234,7 +238,8 @@ async function loginWithCredentials(instanceId, username, password) {
   const getRes = await fetch(currentUrl, {
     headers: { "User-Agent": "wigor-papillon" }
   });
-  updateCookies(jar, currentUrl, getRes.headers.getSetCookie());
+  const initialCookies = getRes.headers.getSetCookie ? getRes.headers.getSetCookie() : getRes.headers.get("Set-Cookie") ? [getRes.headers.get("Set-Cookie")] : [];
+  updateCookies(jar, currentUrl, initialCookies);
   const html = await getRes.text();
   const extractHiddenFields = (htmlText) => {
     const fields = {};
@@ -252,13 +257,17 @@ async function loginWithCredentials(instanceId, username, password) {
     if (k !== "username" && k !== "password") form.append(k, v);
   }
   if (!form.has("_eventId")) form.append("_eventId", "submit");
+  const initialCookieHeader = serializeCookies(jar, currentUrl);
+  const postHeaders = {
+    "Content-Type": "application/x-www-form-urlencoded",
+    "User-Agent": "wigor-papillon"
+  };
+  if (initialCookieHeader) {
+    postHeaders["Cookie"] = initialCookieHeader;
+  }
   let response = await fetch(currentUrl, {
     method: "POST",
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded",
-      "User-Agent": "wigor-papillon",
-      Cookie: serializeCookies(jar, currentUrl)
-    },
+    headers: postHeaders,
     body: form.toString(),
     redirect: "manual"
   });
@@ -267,7 +276,8 @@ async function loginWithCredentials(instanceId, username, password) {
   const seenTickets = /* @__PURE__ */ new Set();
   let followUrl = currentUrl;
   while (true) {
-    updateCookies(jar, followUrl, response.headers.getSetCookie());
+    const redirectCookies = response.headers.getSetCookie ? response.headers.getSetCookie() : response.headers.get("Set-Cookie") ? [response.headers.get("Set-Cookie")] : [];
+    updateCookies(jar, followUrl, redirectCookies);
     if (response.status >= 300 && response.status < 400) {
       let location = response.headers.get("location");
       if (!location) break;
@@ -283,11 +293,14 @@ async function loginWithCredentials(instanceId, username, password) {
       }
       followUrl = new URL(location, followUrl).toString();
       const cookieHeader = serializeCookies(jar, followUrl);
+      const redirectHeaders = {
+        "User-Agent": "wigor-papillon"
+      };
+      if (cookieHeader) {
+        redirectHeaders["Cookie"] = cookieHeader;
+      }
       response = await fetch(followUrl, {
-        headers: {
-          "User-Agent": "wigor-papillon",
-          Cookie: cookieHeader
-        },
+        headers: redirectHeaders,
         redirect: "manual"
       });
       redirectCount++;
@@ -339,11 +352,15 @@ async function getPlanning(instanceId, token) {
     dateFin: to.toISOString()
   });
   const fullScheduleUrl = `${scheduleServer}?${params.toString()}`;
+  const scheduleCookieHeader = serializeCookies(jar, scheduleServer);
+  const scheduleHeaders = {
+    "User-Agent": "linkgor"
+  };
+  if (scheduleCookieHeader) {
+    scheduleHeaders["Cookie"] = scheduleCookieHeader;
+  }
   const response = await fetch(fullScheduleUrl, {
-    headers: {
-      "User-Agent": "linkgor",
-      Cookie: serializeCookies(jar, scheduleServer)
-    }
+    headers: scheduleHeaders
   });
   if (!response.ok || response.status === 302) {
     const text = await response.text();

package/dist/index.mjs

@@ -153,11 +153,15 @@ async function getProfile(instanceId, token) {
     throw new Error(`Failed to parse cookie jar token: ${e}`);
   }
   const casUrl = getCASURL(instanceId);
+  const cookieHeader = serializeCookies(jar, casUrl);
+  const headers = {
+    "User-Agent": "linkgor"
+  };
+  if (cookieHeader) {
+    headers["Cookie"] = cookieHeader;
+  }
   const response = await fetch(casUrl, {
-    headers: {
-      "User-Agent": "linkgor",
-      Cookie: serializeCookies(jar, casUrl)
-    }
+    headers
   });
   if (!response.ok) {
     throw new Error(
@@ -202,7 +206,8 @@ async function loginWithCredentials(instanceId, username, password) {
   const getRes = await fetch(currentUrl, {
     headers: { "User-Agent": "wigor-papillon" }
   });
-  updateCookies(jar, currentUrl, getRes.headers.getSetCookie());
+  const initialCookies = getRes.headers.getSetCookie ? getRes.headers.getSetCookie() : getRes.headers.get("Set-Cookie") ? [getRes.headers.get("Set-Cookie")] : [];
+  updateCookies(jar, currentUrl, initialCookies);
   const html = await getRes.text();
   const extractHiddenFields = (htmlText) => {
     const fields = {};
@@ -220,13 +225,17 @@ async function loginWithCredentials(instanceId, username, password) {
     if (k !== "username" && k !== "password") form.append(k, v);
   }
   if (!form.has("_eventId")) form.append("_eventId", "submit");
+  const initialCookieHeader = serializeCookies(jar, currentUrl);
+  const postHeaders = {
+    "Content-Type": "application/x-www-form-urlencoded",
+    "User-Agent": "wigor-papillon"
+  };
+  if (initialCookieHeader) {
+    postHeaders["Cookie"] = initialCookieHeader;
+  }
   let response = await fetch(currentUrl, {
     method: "POST",
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded",
-      "User-Agent": "wigor-papillon",
-      Cookie: serializeCookies(jar, currentUrl)
-    },
+    headers: postHeaders,
     body: form.toString(),
     redirect: "manual"
   });
@@ -235,7 +244,8 @@ async function loginWithCredentials(instanceId, username, password) {
   const seenTickets = /* @__PURE__ */ new Set();
   let followUrl = currentUrl;
   while (true) {
-    updateCookies(jar, followUrl, response.headers.getSetCookie());
+    const redirectCookies = response.headers.getSetCookie ? response.headers.getSetCookie() : response.headers.get("Set-Cookie") ? [response.headers.get("Set-Cookie")] : [];
+    updateCookies(jar, followUrl, redirectCookies);
     if (response.status >= 300 && response.status < 400) {
       let location = response.headers.get("location");
       if (!location) break;
@@ -251,11 +261,14 @@ async function loginWithCredentials(instanceId, username, password) {
       }
       followUrl = new URL(location, followUrl).toString();
       const cookieHeader = serializeCookies(jar, followUrl);
+      const redirectHeaders = {
+        "User-Agent": "wigor-papillon"
+      };
+      if (cookieHeader) {
+        redirectHeaders["Cookie"] = cookieHeader;
+      }
       response = await fetch(followUrl, {
-        headers: {
-          "User-Agent": "wigor-papillon",
-          Cookie: cookieHeader
-        },
+        headers: redirectHeaders,
         redirect: "manual"
       });
       redirectCount++;
@@ -307,11 +320,15 @@ async function getPlanning(instanceId, token) {
     dateFin: to.toISOString()
   });
   const fullScheduleUrl = `${scheduleServer}?${params.toString()}`;
+  const scheduleCookieHeader = serializeCookies(jar, scheduleServer);
+  const scheduleHeaders = {
+    "User-Agent": "linkgor"
+  };
+  if (scheduleCookieHeader) {
+    scheduleHeaders["Cookie"] = scheduleCookieHeader;
+  }
   const response = await fetch(fullScheduleUrl, {
-    headers: {
-      "User-Agent": "linkgor",
-      Cookie: serializeCookies(jar, scheduleServer)
-    }
+    headers: scheduleHeaders
   });
   if (!response.ok || response.status === 302) {
     const text = await response.text();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studentsphere/linkgor",
-  "version": "0.0.1-alpha",
+  "version": "0.0.2-alpha",
   "description": "A Wrapper for Wigor",
   "author": "Kaelian Baudelet <contact@kaelian.dev> (https://github.com/kaelianbaudelet)",
   "license": "GPL-3.0",