finki-auth 2.0.0 → 2.0.1

package/README.md

@@ -1,6 +1,6 @@
 # FINKI Hub / FINKI Auth
 
-Node.js package for managing authentication and cookies for FCSE's services, built using [axios](https://github.com/axios/axios).
+Node.js package for managing authentication and cookies for FCSE's services.
 
 ## Features
 

package/dist/authentication.d.ts

@@ -1,7 +1,6 @@
 import { Service } from './lib/Service.js';
 export declare class CasAuthentication {
     private readonly cookieJar;
-    private readonly fetchWithCookies;
     private readonly password;
     private readonly username;
     constructor({ password, username }: {

package/dist/authentication.js

@@ -1,19 +1,17 @@
 import * as cheerio from 'cheerio';
 import makeFetchCookie from 'fetch-cookie';
 import { CookieJar } from 'tough-cookie';
-import { SERVICE_LOGIN_URLS, SERVICE_URLS } from './constants.js';
+import { SERVICE_LOGIN_URLS } from './constants.js';
 import { Service } from './lib/Service.js';
 import { getCookieValidity } from './utils.js';
 export class CasAuthentication {
     cookieJar;
-    fetchWithCookies;
     password;
     username;
     constructor({ password, username }) {
         this.username = username;
         this.password = password;
         this.cookieJar = new CookieJar();
-        this.fetchWithCookies = makeFetchCookie(fetch, this.cookieJar);
     }
     static getFullLoginUrl = (service) => {
         if (service === Service.CAS) {
@@ -22,15 +20,23 @@ export class CasAuthentication {
         return `${SERVICE_LOGIN_URLS[Service.CAS]}?service=${encodeURIComponent(SERVICE_LOGIN_URLS[service])}`;
     };
     authenticate = async (service) => {
-        const fullUrl = CasAuthentication.getFullLoginUrl(service);
-        const initialResponse = await this.fetchWithCookies(fullUrl);
+        const jar = new CookieJar();
+        const fetchWithCookies = makeFetchCookie(fetch, jar);
+        const casLoginUrl = CasAuthentication.getFullLoginUrl(service);
+        const initialResponse = await fetchWithCookies(casLoginUrl);
         const html = await initialResponse.text();
         const $ = cheerio.load(html);
         const urlSearchParams = this.getFormData($);
-        await this.fetchWithCookies(fullUrl, {
+        const postResponse = await fetchWithCookies(casLoginUrl, {
             body: urlSearchParams,
             method: 'POST',
         });
+        await postResponse.body?.cancel();
+        const serviceLoginUrl = SERVICE_LOGIN_URLS[service];
+        const serviceCookies = await jar.getCookies(serviceLoginUrl);
+        for (const cookie of serviceCookies) {
+            await this.cookieJar.setCookie(cookie, serviceLoginUrl);
+        }
     };
     buildCookieHeader = async (service) => {
         const cookies = await this.getCookie(service);
@@ -41,11 +47,11 @@ export class CasAuthentication {
         return await this.cookieJar.getCookies(serviceLoginUrl);
     };
     isCookieValid = async (service) => {
-        const url = SERVICE_URLS[service];
+        const serviceLoginUrl = SERVICE_LOGIN_URLS[service];
         const cookies = await this.getCookie(service);
         const jar = new CookieJar();
         for (const cookie of cookies) {
-            await jar.setCookie(cookie, url);
+            await jar.setCookie(cookie, serviceLoginUrl);
         }
         return await getCookieValidity({ cookieJar: jar, service });
     };

package/package.json

@@ -68,5 +68,5 @@
   },
   "type": "module",
   "types": "dist/index.d.ts",
-  "version": "2.0.0"
+  "version": "2.0.1"
 }