diff --git a/.gitignore b/.gitignore index 6684c76..86331f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /.idea /node_modules +/src/cas/debug.js +/result.json diff --git a/src/cas/ac-orleans-tours.js b/src/cas/ac-orleans-tours.js index a020880..34a2f74 100644 --- a/src/cas/ac-orleans-tours.js +++ b/src/cas/ac-orleans-tours.js @@ -38,7 +38,7 @@ async function login(url, account, username, password) }); return extractStart(await getDOM({ - url, + url: url + account.value + '.html', jar, asIs: true })); diff --git a/src/cas/ac-rouen.js b/src/cas/ac-rouen.js index c6f828f..2cfdc3e 100644 --- a/src/cas/ac-rouen.js +++ b/src/cas/ac-rouen.js @@ -6,7 +6,7 @@ const aten = require('./aten'); async function login(url, account, username, password) { const jar = new jsdom.CookieJar(); - let dom = await getDOM({ + const dom = await getDOM({ // eslint-disable-next-line max-len url: 'https://nero.l-educdenormandie.fr/Shibboleth.sso/Login?entityID=urn:fi:ac-rouen:ts-EDUC-Normandie:1:0&target=', jar, @@ -21,13 +21,11 @@ async function login(url, account, username, password) jar }); - dom = await getDOM({ - url, + return extractStart(await getDOM({ + url: url + account.value + '.html', jar, asIs: true - }); - - return extractStart(username, dom); + })); } module.exports = login; diff --git a/src/cas/kdecole-wayf.js b/src/cas/kdecole-wayf.js index 95fdb13..d7fb01e 100644 --- a/src/cas/kdecole-wayf.js +++ b/src/cas/kdecole-wayf.js @@ -37,7 +37,7 @@ async function login({ url, username, password, casUrl, idp, atenURL }) }); } - return extractStart(username, dom); + return extractStart(dom); } module.exports = login; diff --git a/src/cas/openent.js b/src/cas/openent.js index 0a00ea1..698863f 100644 --- a/src/cas/openent.js +++ b/src/cas/openent.js @@ -4,20 +4,17 @@ const { getDOM, extractStart } = require('./api'); async function login({ url, username, password, target }) { - const jar = new jsdom.CookieJar(); - const dom = await getDOM({ - url: url + 'auth/login', - jar, + return extractStart(await getDOM({ + url: target + 'auth/login', + jar: new jsdom.CookieJar(), method: 'POST', data: { email: username, password, - callback: '/cas/login?service=' + encodeURIComponent(target) + callback: '/cas/login?service=' + encodeURIComponent(url) }, asIs: true - }); - - return extractStart(username, dom); + })); } module.exports = login;