Pequenas atualizações - UNILAB

examples/download-all-files.js

@@ -4,7 +4,8 @@ const fs = require('fs');
 const path = require('path');
 
 const sigaa = new Sigaa({
-  url: 'https://sigaa.ifsc.edu.br'
+  url: 'https://sigaa.ifsc.edu.br',
+  institution: 'IFSC'
 });
 // Pasta para salvar os arquivos
 const BaseDestiny = path.resolve('.', 'downloads');

examples/get-absences.js

@@ -1,7 +1,8 @@
 const { Sigaa } = require('sigaa-api');
 
 const sigaa = new Sigaa({
-  url: 'https://sigaa.ifsc.edu.br'
+  url: 'https://sigaa.ifsc.edu.br',
+  institution: 'IFSC'
 });
 
 // coloque seu usuário

examples/get-account-info.js

@@ -1,7 +1,8 @@
 const { Sigaa } = require('sigaa-api');
 
 const sigaa = new Sigaa({
-  url: 'https://sigaa.ifsc.edu.br'
+  url: 'https://sigaa.ifsc.edu.br',
+  institution: 'IFSC'
 });
 
 // coloque seu usuário

examples/get-activities.js

@@ -1,7 +1,8 @@
 const { Sigaa } = require('sigaa-api');
 
 const sigaa = new Sigaa({
-  url: 'https://sigaa.ifsc.edu.br'
+  url: 'https://sigaa.ifsc.edu.br',
+  institution: 'IFSC'
 });
 
 // coloque seu usuário

examples/get-courses.js

@@ -1,7 +1,8 @@
 const { Sigaa } = require('sigaa-api');
 
 const sigaa = new Sigaa({
-  url: 'https://sigaa.ifsc.edu.br'
+  url: 'https://sigaa.ifsc.edu.br',
+  institution: 'IFSC'
 });
 
 // coloque seu usuário

examples/get-grades-simultaneously.js

@@ -1,7 +1,8 @@
 const { Sigaa } = require('sigaa-api');
 
 const sigaa = new Sigaa({
-  url: 'https://sigaa.ifsc.edu.br'
+  url: 'https://sigaa.ifsc.edu.br',
+  institution: 'IFSC'
 });
 
 // coloque seu usuário

examples/get-grades.js

@@ -1,7 +1,8 @@
 const { Sigaa } = require('sigaa-api');
 
 const sigaa = new Sigaa({
-  url: 'https://sigaa.ifsc.edu.br'
+  url: 'https://sigaa.ifsc.edu.br',
+  institution: 'IFSC'
 });
 
 // coloque seu usuário

examples/get-homework.js

@@ -1,7 +1,8 @@
 const { Sigaa } = require('sigaa-api');
 
 const sigaa = new Sigaa({
-  url: 'https://sigaa.ifsc.edu.br'
+  url: 'https://sigaa.ifsc.edu.br',
+  institution: 'IFSC'
 });
 
 // coloque seu usuário

examples/get-lessons.js

@@ -1,7 +1,8 @@
 const { Sigaa } = require('sigaa-api');
 
 const sigaa = new Sigaa({
-  url: 'https://sigaa.ifsc.edu.br'
+  url: 'https://sigaa.ifsc.edu.br',
+  institution: 'IFSC'
 });
 
 // coloque seu usuário

examples/get-news.js

@@ -1,7 +1,8 @@
 const { Sigaa } = require('sigaa-api');
 
 const sigaa = new Sigaa({
-  url: 'https://sigaa.ifsc.edu.br'
+  url: 'https://sigaa.ifsc.edu.br',
+  institution: 'IFSC'
 });
 
 // coloque seu usuário

examples/login-with-session.js

@@ -0,0 +1,30 @@
+const { Sigaa, SigaaCookiesController } = require('sigaa-api');
+
+const sigaaURL = new URL('https://sigaa.ifsc.edu.br');
+const institution = 'IFSC';
+
+const cookie = "" // coloque seu cookie JSESSIONID
+const JSESSIONID = `JSESSIONID=${cookie}`;
+
+const main = async () => {
+        const cookiesController = new SigaaCookiesController();
+        cookiesController.storeCookies(sigaaURL.hostname, [JSESSIONID]);
+
+        const sigaa = new Sigaa({
+            url: sigaaURL.href,
+            institution,
+            cookiesController
+        });
+
+        const http = sigaa.httpFactory.createHttp();
+        const page = await http.get("/sigaa/vinculos.jsf");
+        const account = await sigaa.accountFactory.getAccount(page);
+
+        console.log('> Nome: ' + (await account.getName()));
+        console.log('> Emails: ' + (await account.getEmails()).join(', '));
+        console.log('> Url foto: ' + (await account.getProfilePictureURL()));
+}
+
+main().catch((err) => {
+    if (err) console.log(err);
+});

examples/search-teacher.js

@@ -1,7 +1,8 @@
 const { Sigaa } = require('sigaa-api');
 
 const sigaa = new Sigaa({
-  url: 'https://sigaa.ifsc.edu.br'
+  url: 'https://sigaa.ifsc.edu.br',
+  institution: 'IFSC'
 });
 
 const searchTerm = 'José'; // Nome do professor para procurar

examples/use-another-institution.js

@@ -1,7 +1,8 @@
 const { Sigaa } = require('sigaa-api');
 
 const sigaa = new Sigaa({
-  url: 'https://sigaa.ifsc.edu.br'
+  url: 'https://sigaa.ifsc.edu.br',
+  institution: 'IFSC'
 });
 
 // Ou

package.json

@@ -1,7 +1,7 @@
 {
     "name": "sigaa-api",
     "description": "Unofficial high performance API for SIGAA IFSC using web scraping.",
-    "version": "1.0.34",
+    "version": "1.0.35",
     "main": "dist/sigaa-all-types.js",
     "types": "dist/sigaa-all-types.d.ts",
     "author": "Geovane Schmitz <[email protected]>",

src/account/sigaa-account-factory.ts

@@ -8,6 +8,7 @@ import { SigaaAccountIFSC } from './sigaa-account-ifsc';
 import { SigaaAccountUFPB } from './sigaa-account-ufpb';
 import { SigaaAccountUNILAB } from './sigaa-account-unilab';
 import { SigaaAccountUNB } from './sigaa-account-unb';
+import { SigaaAccountInstitutionMap } from '@session/sigaa-institution-controller';
 
 /**
  * Abstraction to represent the class that instantiates the account.
@@ -38,14 +39,13 @@ export class SigaaAccountFactory implements AccountFactory {
    * @param page home page of account (page after login).
    */
   async getAccount(page: Page): Promise<Account> {
-    const SigaaAccountInstitution = {
+    const SigaaAccountInstitution: SigaaAccountInstitutionMap = {
       IFSC: SigaaAccountIFSC,
       UFPB: SigaaAccountUFPB,
       UNB: SigaaAccountUNB,
       UNILAB: SigaaAccountUNILAB
     };
-    const institution = this.session.institution;
-    return new SigaaAccountInstitution[institution](
+    return new SigaaAccountInstitution[this.session.institution](
       page,
       this.http,
       this.parser,

src/account/sigaa-account-ifsc.ts

@@ -2,10 +2,10 @@ import { Parser } from '@helpers/sigaa-parser';
 import { HTTP, ProgressCallback } from '@session/sigaa-http';
 import { Session } from '@session/sigaa-session';
 import { LoginStatus } from '../sigaa-types';
-import { URL } from 'url';
 import { BondFactory, BondType } from '@bonds/sigaa-bond-factory';
 import { Page } from '@session/sigaa-page';
 import { Account } from './sigaa-account';
+import { URL } from 'url';
 
 /**
  * Responsible for representing the user account.

src/account/sigaa-account-ufpb.ts

@@ -2,10 +2,10 @@ import { Parser } from '@helpers/sigaa-parser';
 import { HTTP, ProgressCallback } from '@session/sigaa-http';
 import { Session } from '@session/sigaa-session';
 import { LoginStatus } from '../sigaa-types';
-import { URL } from 'url';
 import { BondFactory, BondType } from '@bonds/sigaa-bond-factory';
 import { Page } from '@session/sigaa-page';
 import { Account } from './sigaa-account';
+import { URL } from 'url';
 
 /**
  * Responsible for representing the user account.

src/account/sigaa-account-unb.ts

@@ -2,10 +2,10 @@ import { Parser } from '@helpers/sigaa-parser';
 import { HTTP, ProgressCallback } from '@session/sigaa-http';
 import { Session } from '@session/sigaa-session';
 import { LoginStatus } from '../sigaa-types';
-import { URL } from 'url';
 import { BondFactory, BondType } from '@bonds/sigaa-bond-factory';
 import { Page } from '@session/sigaa-page';
 import { Account } from './sigaa-account';
+import { URL } from 'url';
 
 /**
  * Responsible for representing the user account.
@@ -94,6 +94,10 @@ export class SigaaAccountUNB implements Account {
       this.pagehomeParsePromise = this.http
         .get(homepage.url.href, { noCache: true })
         .then((page) => this.parseBondPage(page));
+    } else if (homepage.url.href.includes('/sigaa/telaAvisoLogon.jsf')) {
+      this.pagehomeParsePromise = this.http
+        .get('/sigaa/vinculos.jsf')
+        .then((page) => this.parseBondPage(page));
     } else {
       throw new Error('SIGAA: Unknown homepage format.');
     }

src/account/sigaa-account.ts

@@ -1,6 +1,10 @@
 import { ProgressCallback } from '@session/sigaa-http';
 import { URL } from 'url';
 import { BondType } from '@bonds/sigaa-bond-factory';
+import { SigaaAccountIFSC } from './sigaa-account-ifsc';
+import { SigaaAccountUFPB } from './sigaa-account-ufpb';
+import { SigaaAccountUNB } from './sigaa-account-unb';
+import { SigaaAccountUNILAB } from './sigaa-account-unilab';
 
 /**
  * Abstraction of account type.
@@ -66,3 +70,11 @@ export interface Account {
    */
   changePassword(oldPassword: string, newPassword: string): Promise<void>;
 }
+
+export type SigaaAccountInstitution =
+  | SigaaAccountIFSC
+  | SigaaAccountUFPB
+  | SigaaAccountUNB
+  | SigaaAccountUNILAB;
+
+export type CommonSigaaAccount = Account & SigaaAccountInstitution;

src/bonds/sigaa-bond-factory.ts

@@ -3,7 +3,7 @@ import { CourseFactory } from '@courses/sigaa-course-student-factory';
 import { Parser } from '@helpers/sigaa-parser';
 import { HTTP } from '@session/sigaa-http';
 import { HTTPFactory } from '@session/sigaa-http-factory';
-
+import { URL } from 'url';
 import { SigaaStudentBond, StudentBond } from './sigaa-student-bond';
 import { SigaaTeacherBond, TeacherBond } from './sigaa-teacher-bond';
 

src/bonds/sigaa-student-bond.ts

@@ -1,7 +1,7 @@
 import { CourseFactory } from '@courses/sigaa-course-student-factory';
 import { Parser } from '@helpers/sigaa-parser';
 import { HTTP } from '@session/sigaa-http';
-
+import { URL } from 'url';
 import {
   CourseStudent,
   CourseStudentData

src/courses/resources/attachments/sigaa-web-content-student.ts

@@ -34,7 +34,8 @@ export interface WebContent extends UpdatableResource<WebContentData> {
  */
 export class SigaaWebContent
   extends AbstractUpdatableResource
-  implements WebContent {
+  implements WebContent
+{
   readonly type = 'webcontent';
 
   private _title!: string;

src/courses/resources/forum/sigaa-course-forum-student.ts

@@ -1,5 +1,4 @@
 import { URL } from 'url';
-
 import { FormData } from 'formdata-node';
 import { Parser } from '@helpers/sigaa-parser';
 import { File, FileData } from '@resources/sigaa-file';

src/courses/sigaa-course-student.ts

@@ -1,11 +1,9 @@
-import { URL } from 'url';
-
 import { Lesson } from '@courseResources/sigaa-lesson-student';
 import { NewsData, News } from '@courseResources/sigaa-news-student';
 import { Parser } from '@helpers/sigaa-parser';
 import { File } from '@resources/sigaa-file';
 import { HTTP } from '@session/sigaa-http';
-
+import { URL } from 'url';
 import { SigaaForm, Page } from '@session/sigaa-page';
 import { QuizData, Quiz } from '@attachments/sigaa-quiz-student';
 import { HomeworkData, Homework } from '@attachments/sigaa-homework-student';

src/search/sigaa-search-teacher-result.ts

@@ -1,6 +1,5 @@
 import { Parser } from '@helpers/sigaa-parser';
 import { HTTP, ProgressCallback } from '@session/sigaa-http';
-import { URL } from 'url';
 
 /**
  * @category Internal

src/search/sigaa-search-teacher.ts

@@ -1,7 +1,6 @@
 import { Parser } from '@helpers/sigaa-parser';
 import { HTTP } from '@session/sigaa-http';
 import { Page } from '@session/sigaa-page';
-import { URL } from 'url';
 import {
   TeacherResult,
   SigaaSearchTeacherResult

src/session/login/sigaa-login-ifsc.ts

@@ -1,9 +1,10 @@
 import { LoginStatus } from '../../sigaa-types';
 import { URL } from 'url';
 import { HTTP } from '../sigaa-http';
-import { Page, SigaaForm } from '../sigaa-page';
 import { Session } from '../sigaa-session';
 import { Login } from './sigaa-login';
+import { IFSCPage } from '@session/page/sigaa-page-ifsc';
+import { SigaaForm } from '@session/sigaa-page';
 
 /**
  * Responsible for logging in IFSC.
@@ -13,7 +14,7 @@ export class SigaaLoginIFSC implements Login {
   constructor(protected http: HTTP, protected session: Session) {}
   readonly errorInvalidCredentials = 'SIGAA: Invalid credentials.';
 
-  protected parseLoginForm(page: Page): SigaaForm {
+  protected parseLoginForm(page: IFSCPage): SigaaForm {
     const formElement = page.$("form[name='loginForm']");
 
     const actionUrl = formElement.attr('action');
@@ -56,7 +57,7 @@ export class SigaaLoginIFSC implements Login {
   protected async desktopLogin(
     username: string,
     password: string
-  ): Promise<Page> {
+  ): Promise<IFSCPage> {
     const { action, postValues } = await this.getLoginForm();
 
     postValues['user.login'] = username;
@@ -70,7 +71,11 @@ export class SigaaLoginIFSC implements Login {
    * @param username
    * @param password
    */
-  async login(username: string, password: string, retry = true): Promise<Page> {
+  async login(
+    username: string,
+    password: string,
+    retry = true
+  ): Promise<IFSCPage> {
     if (this.session.loginStatus === LoginStatus.Authenticated)
       throw new Error('SIGAA: This session already has a user logged in.');
     try {
@@ -85,7 +90,7 @@ export class SigaaLoginIFSC implements Login {
     }
   }
 
-  protected async parseDesktopLoginResult(page: Page): Promise<Page> {
+  protected async parseDesktopLoginResult(page: IFSCPage): Promise<IFSCPage> {
     const accountPage = await this.http.followAllRedirect(page);
     if (accountPage.bodyDecoded.includes('Entrar no Sistema')) {
       if (accountPage.bodyDecoded.includes('Usuário e/ou senha inválidos')) {