finki-auth 1.5.0 → 1.6.0

package/README.md

@@ -9,6 +9,10 @@ Currently supports the following services:
 - [CAS](https://cas.finki.ukim.mk/)
 - [Courses](https://courses.finki.ukim.mk/)
 - [Diplomas](https://diplomski.finki.ukim.mk/)
+- [Old Courses](https://oldcourses.finki.ukim.mk/)
+- [Masters](https://magisterski.finki.ukim.mk/)
+- [Internships](https://internships.finki.ukim.mk/)
+- [Consultations](https://consultations.finki.ukim.mk/)
 
 ## Installation
 

package/dist/constants.d.ts

@@ -1,18 +1,27 @@
 export declare const SERVICE_URLS: {
     readonly cas: "https://cas.finki.ukim.mk";
+    readonly consultations: "https://consultations.finki.ukim.mk";
     readonly courses: "https://courses.finki.ukim.mk";
     readonly diplomas: "http://diplomski.finki.ukim.mk";
+    readonly internships: "https://internships.finki.ukim.mk";
+    readonly masters: "https://magisterski.finki.ukim.mk";
     readonly old_courses: "https://oldcourses.finki.ukim.mk";
 };
 export declare const SERVICE_LOGIN_URLS: {
     readonly cas: "https://cas.finki.ukim.mk/cas/login";
+    readonly consultations: "https://consultations.finki.ukim.mk/consultations";
     readonly courses: "https://courses.finki.ukim.mk/login/index.php";
     readonly diplomas: "http://diplomski.finki.ukim.mk/Account/LoginCAS";
+    readonly internships: "https://internships.finki.ukim.mk/login";
+    readonly masters: "https://magisterski.finki.ukim.mk/login";
     readonly old_courses: "https://oldcourses.finki.ukim.mk/login/index.php";
 };
 export declare const SERVICE_USER_ELEMENT_SELECTORS: {
     readonly cas: "";
+    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 masters: "li > a > span";
     readonly old_courses: "span.usertext.mr-1";
 };

package/dist/constants.js

@@ -1,19 +1,28 @@
 import { Service } from './lib/Service.js';
 export const SERVICE_URLS = {
     [Service.CAS]: 'https://cas.finki.ukim.mk',
+    [Service.CONSULTATIONS]: 'https://consultations.finki.ukim.mk',
     [Service.COURSES]: 'https://courses.finki.ukim.mk',
     [Service.DIPLOMAS]: 'http://diplomski.finki.ukim.mk',
+    [Service.INTERNSHIPS]: 'https://internships.finki.ukim.mk',
+    [Service.MASTERS]: 'https://magisterski.finki.ukim.mk',
     [Service.OLD_COURSES]: 'https://oldcourses.finki.ukim.mk',
 };
 export const SERVICE_LOGIN_URLS = {
     [Service.CAS]: 'https://cas.finki.ukim.mk/cas/login',
+    [Service.CONSULTATIONS]: 'https://consultations.finki.ukim.mk/consultations',
     [Service.COURSES]: 'https://courses.finki.ukim.mk/login/index.php',
     [Service.DIPLOMAS]: 'http://diplomski.finki.ukim.mk/Account/LoginCAS',
+    [Service.INTERNSHIPS]: 'https://internships.finki.ukim.mk/login',
+    [Service.MASTERS]: 'https://magisterski.finki.ukim.mk/login',
     [Service.OLD_COURSES]: 'https://oldcourses.finki.ukim.mk/login/index.php',
 };
 export const SERVICE_USER_ELEMENT_SELECTORS = {
     [Service.CAS]: '',
+    [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.MASTERS]: 'li > a > span',
     [Service.OLD_COURSES]: 'span.usertext.mr-1',
 };

package/dist/lib/Service.d.ts

@@ -1,8 +1,11 @@
 import { z } from 'zod';
 export declare enum Service {
     CAS = "cas",
+    CONSULTATIONS = "consultations",
     COURSES = "courses",
     DIPLOMAS = "diplomas",
+    INTERNSHIPS = "internships",
+    MASTERS = "masters",
     OLD_COURSES = "old_courses"
 }
 export declare const ServiceSchema: z.ZodEnum<typeof Service>;

package/dist/lib/Service.js

@@ -2,8 +2,11 @@ import { z } from 'zod';
 export var Service;
 (function (Service) {
     Service["CAS"] = "cas";
+    Service["CONSULTATIONS"] = "consultations";
     Service["COURSES"] = "courses";
     Service["DIPLOMAS"] = "diplomas";
+    Service["INTERNSHIPS"] = "internships";
+    Service["MASTERS"] = "masters";
     Service["OLD_COURSES"] = "old_courses";
 })(Service || (Service = {}));
 export const ServiceSchema = z.enum(Service);

package/dist/session.js

@@ -1,16 +1,29 @@
 import axios from 'axios';
+import { wrapper } from 'axios-cookiejar-support';
 import { JSDOM } from 'jsdom';
+import { CookieJar } from 'tough-cookie';
 import { z } from 'zod';
 import { SERVICE_URLS, SERVICE_USER_ELEMENT_SELECTORS } from './constants.js';
 export const isCookieValid = async (service, cookies) => {
     const url = SERVICE_URLS[service];
-    const userElement = SERVICE_USER_ELEMENT_SELECTORS[service];
-    const response = await axios.get(url, {
-        headers: {
-            Cookie: cookies,
-        },
-    });
+    const userElementSelector = SERVICE_USER_ELEMENT_SELECTORS[service];
+    const jar = new CookieJar();
+    if (cookies) {
+        const cookiePairs = cookies.split('; ');
+        for (const pair of cookiePairs) {
+            await jar.setCookie(pair, url);
+        }
+    }
+    const client = wrapper(axios.create({ jar }));
+    const response = await client.get(url);
     const html = z.string().parse(response.data);
     const { window } = new JSDOM(html);
-    return window.document.querySelector(userElement) !== null;
+    const userElement = window.document.querySelector(userElementSelector);
+    switch (userElement?.textContent) {
+        case undefined:
+        case 'Најава':
+            return false;
+        default:
+            return true;
+    }
 };

package/package.json

@@ -72,5 +72,5 @@
   },
   "type": "module",
   "types": "dist/index.d.ts",
-  "version": "1.5.0"
+  "version": "1.6.0"
 }