finki-auth 1.8.0 → 2.0.0

package/README.md

@@ -1,4 +1,4 @@
-# FINKI Auth
+# FINKI Hub / FINKI Auth
 
 Node.js package for managing authentication and cookies for FCSE's services, built using [axios](https://github.com/axios/axios).
 
@@ -46,7 +46,7 @@ const cookieHeader = await auth.buildCookieHeader(Service.COURSES);
 // Check if the cookie is still valid, and if not, call `authenticate` again
 const isCookieValid = await auth.isCookieValid(Service.COURSES);
 
-if (!isCookieValid) await auth.authenticate();
+if (!isCookieValid) await auth.authenticate(Service.COURSES);
 
 // There are also some utility functions available:
 const isCookieValidStandalone = await isCookieValid({

package/dist/authentication.d.ts

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

package/dist/authentication.js

@@ -1,24 +1,19 @@
-import axios from 'axios';
-import { wrapper } from 'axios-cookiejar-support';
-import { JSDOM } from 'jsdom';
+import * as cheerio from 'cheerio';
+import makeFetchCookie from 'fetch-cookie';
 import { CookieJar } from 'tough-cookie';
-import { z } from 'zod';
 import { SERVICE_LOGIN_URLS, SERVICE_URLS } from './constants.js';
 import { Service } from './lib/Service.js';
 import { getCookieValidity } from './utils.js';
 export class CasAuthentication {
+    cookieJar;
+    fetchWithCookies;
     password;
-    session;
     username;
     constructor({ password, username }) {
         this.username = username;
         this.password = password;
-        const cookieJar = new CookieJar();
-        const client = axios.create({
-            jar: cookieJar,
-            validateStatus: (status) => status >= 200 && status < 400,
-        });
-        this.session = wrapper(client);
+        this.cookieJar = new CookieJar();
+        this.fetchWithCookies = makeFetchCookie(fetch, this.cookieJar);
     }
     static getFullLoginUrl = (service) => {
         if (service === Service.CAS) {
@@ -28,15 +23,14 @@ export class CasAuthentication {
     };
     authenticate = async (service) => {
         const fullUrl = CasAuthentication.getFullLoginUrl(service);
-        const initialRequest = await this.session.get(fullUrl);
-        const { data } = z.string().safeParse(initialRequest.data);
-        if (!data) {
-            throw new Error('Failed to parse initial request data');
-        }
-        const { window } = new JSDOM(data);
-        const hiddenInputs = window.document.querySelectorAll('input[type="hidden"]');
-        const urlSearchParams = this.getFormData(hiddenInputs);
-        await this.session.post(fullUrl, urlSearchParams);
+        const initialResponse = await this.fetchWithCookies(fullUrl);
+        const html = await initialResponse.text();
+        const $ = cheerio.load(html);
+        const urlSearchParams = this.getFormData($);
+        await this.fetchWithCookies(fullUrl, {
+            body: urlSearchParams,
+            method: 'POST',
+        });
     };
     buildCookieHeader = async (service) => {
         const cookies = await this.getCookie(service);
@@ -44,8 +38,7 @@ export class CasAuthentication {
     };
     getCookie = async (service) => {
         const serviceLoginUrl = SERVICE_LOGIN_URLS[service];
-        const serviceCookies = await this.session.defaults.jar?.getCookies(serviceLoginUrl);
-        return serviceCookies ?? [];
+        return await this.cookieJar.getCookies(serviceLoginUrl);
     };
     isCookieValid = async (service) => {
         const url = SERVICE_URLS[service];
@@ -56,15 +49,15 @@ export class CasAuthentication {
         }
         return await getCookieValidity({ cookieJar: jar, service });
     };
-    getFormData = (inputs) => {
+    getFormData = ($) => {
         const urlSearchParams = new URLSearchParams();
-        for (const input of inputs) {
-            const name = input.getAttribute('name');
-            const value = input.getAttribute('value');
+        $('input[type="hidden"]').each((_i, input) => {
+            const name = $(input).attr('name');
+            const value = $(input).attr('value');
             if (name) {
                 urlSearchParams.append(name, value ?? '');
             }
-        }
+        });
         urlSearchParams.append('username', this.username);
         urlSearchParams.append('password', this.password);
         urlSearchParams.append('submit', 'LOGIN');

package/dist/constants.d.ts

@@ -21,7 +21,7 @@ export declare const SERVICE_SUCCESS_SELECTORS: {
     readonly consultations: "a#username";
     readonly courses: "span.usertext.me-1";
     readonly diplomas: "#logoutForm > ul > li:nth-child(1) > a";
-    readonly internships: "span.me-2";
+    readonly internships: "span.text-white";
     readonly masters: "li > a > span";
     readonly old_courses: "span.usertext.mr-1";
 };

package/dist/constants.js

@@ -22,7 +22,7 @@ export const SERVICE_SUCCESS_SELECTORS = {
     [Service.CONSULTATIONS]: 'a#username',
     [Service.COURSES]: 'span.usertext.me-1',
     [Service.DIPLOMAS]: '#logoutForm > ul > li:nth-child(1) > a',
-    [Service.INTERNSHIPS]: 'span.me-2',
+    [Service.INTERNSHIPS]: 'span.text-white',
     [Service.MASTERS]: 'li > a > span',
     [Service.OLD_COURSES]: 'span.usertext.mr-1',
 };

package/dist/utils.js

@@ -1,18 +1,17 @@
-import axios from 'axios';
-import { wrapper } from 'axios-cookiejar-support';
-import { JSDOM } from 'jsdom';
+import * as cheerio from 'cheerio';
+import makeFetchCookie from 'fetch-cookie';
 import { CookieJar } from 'tough-cookie';
-import z from 'zod';
 import { SERVICE_SUCCESS_SELECTORS, SERVICE_URLS } from './constants.js';
 export const getCookieValidity = async ({ cookieJar, service, }) => {
     const url = SERVICE_URLS[service];
     const userElementSelector = SERVICE_SUCCESS_SELECTORS[service];
-    const client = wrapper(axios.create({ jar: cookieJar }));
-    const response = await client.get(url);
-    const html = z.string().parse(response.data);
-    const { window } = new JSDOM(html);
-    const userElement = window.document.querySelector(userElementSelector);
-    switch (userElement?.textContent) {
+    const fetchWithCookies = makeFetchCookie(fetch, cookieJar);
+    const response = await fetchWithCookies(url);
+    const html = await response.text();
+    const $ = cheerio.load(html);
+    const userElement = $(userElementSelector).first();
+    const textContent = userElement.length > 0 ? userElement.text() : undefined;
+    switch (textContent) {
         case undefined:
         case 'Најава':
             return false;

package/package.json

@@ -13,32 +13,28 @@
     }
   },
   "dependencies": {
-    "axios": "^1.12.2",
-    "axios-cookiejar-support": "^6.0.4",
-    "jsdom": "^27.0.0",
+    "cheerio": "^1.2.0",
+    "fetch-cookie": "^3.2.0",
     "tough-cookie": "^6.0.0",
-    "zod": "^4.1.12"
+    "zod": "^4.3.6"
   },
   "description": "Authentication for FCSE services",
   "devDependencies": {
-    "@commitlint/cli": "^20.1.0",
-    "@commitlint/config-conventional": "^20.0.0",
-    "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/git": "^10.0.1",
-    "@types/jsdom": "^27.0.0",
+    "@commitlint/cli": "^20.4.2",
+    "@commitlint/config-conventional": "^20.4.2",
     "commitizen": "^4.3.1",
     "cz-conventional-changelog": "^3.3.0",
-    "dotenv": "^17.2.3",
-    "eslint": "^9.37.0",
-    "eslint-config-imperium": "^2.7.0",
+    "dotenv": "^17.3.1",
+    "eslint": "^9.39.3",
+    "eslint-config-imperium": "^3.4.0",
     "husky": "^9.1.7",
-    "rimraf": "^6.0.1",
-    "semantic-release": "^24.2.9",
+    "rimraf": "^6.1.3",
+    "semantic-release": "^25.0.2",
     "typescript": "~5.9.3",
-    "vitest": "^3.2.4"
+    "vitest": "^4.0.18"
   },
   "engines": {
-    "node": "^20 || ^22 || ^24"
+    "node": "^22 || ^24"
   },
   "files": [
     "dist",
@@ -72,5 +68,5 @@
   },
   "type": "module",
   "types": "dist/index.d.ts",
-  "version": "1.8.0"
+  "version": "2.0.0"
 }