@studentsphere/linkgor 0.0.3-alpha → 0.0.4-alpha

package/dist/index.js

@@ -221,7 +221,6 @@ async function getProfile(instanceId, token) {
 // src/services/planning.ts
 async function loginWithCredentials(instanceId, username, password) {
   const jar = /* @__PURE__ */ new Map();
-  const loginServer = LOGIN_SERVER_ENDPOINT;
   const scheduleServer = getPlanningServer(instanceId);
   const now = /* @__PURE__ */ new Date();
   const from = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1e3);
@@ -233,14 +232,33 @@ async function loginWithCredentials(instanceId, username, password) {
     dateDebut: from.toISOString(),
     dateFin: to.toISOString()
   });
-  const serviceUrl = `${scheduleServer}?${params.toString()}`;
-  const currentUrl = `${loginServer}?service=${encodeURIComponent(serviceUrl)}`;
-  const getRes = await fetch(currentUrl, {
-    headers: { "User-Agent": "linkgor" }
+  let currentUrl = `${scheduleServer}?${params.toString()}`;
+  let response = await fetch(currentUrl, {
+    headers: { "User-Agent": "linkgor" },
+    redirect: "manual"
   });
-  const initialCookies = getRes.headers.getSetCookie ? getRes.headers.getSetCookie() : getRes.headers.get("Set-Cookie") ? [getRes.headers.get("Set-Cookie")] : [];
+  const initialCookies = response.headers.getSetCookie ? response.headers.getSetCookie() : response.headers.get("Set-Cookie") ? [response.headers.get("Set-Cookie")] : [];
   updateCookies(jar, currentUrl, initialCookies);
-  const html = await getRes.text();
+  if (response.status >= 300 && response.status < 400) {
+    const location = response.headers.get("location");
+    if (location) {
+      currentUrl = new URL(location, currentUrl).toString();
+      const cookieHeader = serializeCookies(jar, currentUrl);
+      const redirectHeaders = {
+        "User-Agent": "linkgor"
+      };
+      if (cookieHeader) {
+        redirectHeaders["Cookie"] = cookieHeader;
+      }
+      response = await fetch(currentUrl, {
+        headers: redirectHeaders,
+        redirect: "manual"
+      });
+      const redirectCookies = response.headers.getSetCookie ? response.headers.getSetCookie() : response.headers.get("Set-Cookie") ? [response.headers.get("Set-Cookie")] : [];
+      updateCookies(jar, currentUrl, redirectCookies);
+    }
+  }
+  const html = await response.text();
   const extractHiddenFields = (htmlText) => {
     const fields = {};
     const regex = /<input[^>]+type="hidden"[^>]+name="([^"]+)"[^>]+value="([^"]*)"/gi;
@@ -265,7 +283,7 @@ async function loginWithCredentials(instanceId, username, password) {
   if (initialCookieHeader) {
     postHeaders["Cookie"] = initialCookieHeader;
   }
-  let response = await fetch(currentUrl, {
+  response = await fetch(currentUrl, {
     method: "POST",
     headers: postHeaders,
     body: form.toString(),
@@ -274,14 +292,13 @@ async function loginWithCredentials(instanceId, username, password) {
   let redirectCount = 0;
   const maxRedirects = 15;
   const seenTickets = /* @__PURE__ */ new Set();
-  let followUrl = currentUrl;
   while (true) {
     const redirectCookies = response.headers.getSetCookie ? response.headers.getSetCookie() : response.headers.get("Set-Cookie") ? [response.headers.get("Set-Cookie")] : [];
-    updateCookies(jar, followUrl, redirectCookies);
+    updateCookies(jar, currentUrl, redirectCookies);
     if (response.status >= 300 && response.status < 400) {
       let location = response.headers.get("location");
       if (!location) break;
-      const urlObj = new URL(location, followUrl);
+      const urlObj = new URL(location, currentUrl);
       const ticket = urlObj.searchParams.get("ticket");
       if (ticket) {
         if (seenTickets.has(ticket)) {
@@ -291,15 +308,15 @@ async function loginWithCredentials(instanceId, username, password) {
           seenTickets.add(ticket);
         }
       }
-      followUrl = new URL(location, followUrl).toString();
-      const cookieHeader = serializeCookies(jar, followUrl);
+      currentUrl = new URL(location, currentUrl).toString();
+      const cookieHeader = serializeCookies(jar, currentUrl);
       const redirectHeaders = {
         "User-Agent": "linkgor"
       };
       if (cookieHeader) {
         redirectHeaders["Cookie"] = cookieHeader;
       }
-      response = await fetch(followUrl, {
+      response = await fetch(currentUrl, {
         headers: redirectHeaders,
         redirect: "manual"
       });
@@ -311,7 +328,7 @@ async function loginWithCredentials(instanceId, username, password) {
   }
   if (response.status >= 400) {
     throw new Error(
-      `Authentication failed with status ${response.status} at ${followUrl}`
+      `Authentication failed with status ${response.status} at ${currentUrl}`
     );
   }
   const jarArray = Array.from(jar.entries()).map(([domain, map]) => {

package/dist/index.mjs

@@ -189,7 +189,6 @@ async function getProfile(instanceId, token) {
 // src/services/planning.ts
 async function loginWithCredentials(instanceId, username, password) {
   const jar = /* @__PURE__ */ new Map();
-  const loginServer = LOGIN_SERVER_ENDPOINT;
   const scheduleServer = getPlanningServer(instanceId);
   const now = /* @__PURE__ */ new Date();
   const from = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1e3);
@@ -201,14 +200,33 @@ async function loginWithCredentials(instanceId, username, password) {
     dateDebut: from.toISOString(),
     dateFin: to.toISOString()
   });
-  const serviceUrl = `${scheduleServer}?${params.toString()}`;
-  const currentUrl = `${loginServer}?service=${encodeURIComponent(serviceUrl)}`;
-  const getRes = await fetch(currentUrl, {
-    headers: { "User-Agent": "linkgor" }
+  let currentUrl = `${scheduleServer}?${params.toString()}`;
+  let response = await fetch(currentUrl, {
+    headers: { "User-Agent": "linkgor" },
+    redirect: "manual"
   });
-  const initialCookies = getRes.headers.getSetCookie ? getRes.headers.getSetCookie() : getRes.headers.get("Set-Cookie") ? [getRes.headers.get("Set-Cookie")] : [];
+  const initialCookies = response.headers.getSetCookie ? response.headers.getSetCookie() : response.headers.get("Set-Cookie") ? [response.headers.get("Set-Cookie")] : [];
   updateCookies(jar, currentUrl, initialCookies);
-  const html = await getRes.text();
+  if (response.status >= 300 && response.status < 400) {
+    const location = response.headers.get("location");
+    if (location) {
+      currentUrl = new URL(location, currentUrl).toString();
+      const cookieHeader = serializeCookies(jar, currentUrl);
+      const redirectHeaders = {
+        "User-Agent": "linkgor"
+      };
+      if (cookieHeader) {
+        redirectHeaders["Cookie"] = cookieHeader;
+      }
+      response = await fetch(currentUrl, {
+        headers: redirectHeaders,
+        redirect: "manual"
+      });
+      const redirectCookies = response.headers.getSetCookie ? response.headers.getSetCookie() : response.headers.get("Set-Cookie") ? [response.headers.get("Set-Cookie")] : [];
+      updateCookies(jar, currentUrl, redirectCookies);
+    }
+  }
+  const html = await response.text();
   const extractHiddenFields = (htmlText) => {
     const fields = {};
     const regex = /<input[^>]+type="hidden"[^>]+name="([^"]+)"[^>]+value="([^"]*)"/gi;
@@ -233,7 +251,7 @@ async function loginWithCredentials(instanceId, username, password) {
   if (initialCookieHeader) {
     postHeaders["Cookie"] = initialCookieHeader;
   }
-  let response = await fetch(currentUrl, {
+  response = await fetch(currentUrl, {
     method: "POST",
     headers: postHeaders,
     body: form.toString(),
@@ -242,14 +260,13 @@ async function loginWithCredentials(instanceId, username, password) {
   let redirectCount = 0;
   const maxRedirects = 15;
   const seenTickets = /* @__PURE__ */ new Set();
-  let followUrl = currentUrl;
   while (true) {
     const redirectCookies = response.headers.getSetCookie ? response.headers.getSetCookie() : response.headers.get("Set-Cookie") ? [response.headers.get("Set-Cookie")] : [];
-    updateCookies(jar, followUrl, redirectCookies);
+    updateCookies(jar, currentUrl, redirectCookies);
     if (response.status >= 300 && response.status < 400) {
       let location = response.headers.get("location");
       if (!location) break;
-      const urlObj = new URL(location, followUrl);
+      const urlObj = new URL(location, currentUrl);
       const ticket = urlObj.searchParams.get("ticket");
       if (ticket) {
         if (seenTickets.has(ticket)) {
@@ -259,15 +276,15 @@ async function loginWithCredentials(instanceId, username, password) {
           seenTickets.add(ticket);
         }
       }
-      followUrl = new URL(location, followUrl).toString();
-      const cookieHeader = serializeCookies(jar, followUrl);
+      currentUrl = new URL(location, currentUrl).toString();
+      const cookieHeader = serializeCookies(jar, currentUrl);
       const redirectHeaders = {
         "User-Agent": "linkgor"
       };
       if (cookieHeader) {
         redirectHeaders["Cookie"] = cookieHeader;
       }
-      response = await fetch(followUrl, {
+      response = await fetch(currentUrl, {
         headers: redirectHeaders,
         redirect: "manual"
       });
@@ -279,7 +296,7 @@ async function loginWithCredentials(instanceId, username, password) {
   }
   if (response.status >= 400) {
     throw new Error(
-      `Authentication failed with status ${response.status} at ${followUrl}`
+      `Authentication failed with status ${response.status} at ${currentUrl}`
     );
   }
   const jarArray = Array.from(jar.entries()).map(([domain, map]) => {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@studentsphere/linkgor",
-  "version": "0.0.3-alpha",
+  "version": "0.0.4-alpha",
   "description": "A Wrapper for Wigor",
   "author": "Kaelian Baudelet <contact@kaelian.dev> (https://github.com/kaelianbaudelet)",
-  "license": "GPL-3.0",
+  "license": "GPL-4.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/studentsphere-app/linkgor.git"