arona/destreamer-mirror
1
0
Fork 0
mirror of https://github.com/snobu/destreamer.git synced 2026-02-07 23:49:43 +00:00
Code Issues Projects Releases Wiki Activity

fix target during SharePoint login

Browse Source
This commit is contained in:
Luca Armaroli
2021-10-14 21:56:23 +02:00
parent 153d15c9c9
commit 1111eea9d5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/LoginModules.ts
View File

@@ -23,7 +23,7 @@ export async function doStreamLogin(url: string, tokenCache: TokenCache, usernam
] ]
}); });
// try-finally because we were leaving zombie processes if there was an error // try-finally because we were leaving zombie processes if there was an error
try { try {
const page: puppeteer.Page = (await browser.pages())[0]; const page: puppeteer.Page = (await browser.pages())[0];
@@ -94,7 +94,11 @@ export async function doStreamLogin(url: string, tokenCache: TokenCache, usernam
export async function doShareLogin(url: string, username?: string): Promise<ShareSession> { export async function doShareLogin(url: string, username?: string): Promise<ShareSession> {
logger.info('Launching headless Chrome to perform the OpenID Connect dance...'); logger.info('Launching headless Chrome to perform the OpenID Connect dance...');
const hostname = new URL(url).hostname; const hostname = new URL(url).host;
logger.verbose(new URL(url).host);
logger.verbose(new URL(url).hostname);
const browser: puppeteer.Browser = await puppeteer.launch({ const browser: puppeteer.Browser = await puppeteer.launch({
executablePath: getPuppeteerChromiumPath(), executablePath: getPuppeteerChromiumPath(),
headless: false, headless: false,
@@ -135,7 +139,7 @@ export async function doShareLogin(url: string, username?: string): Promise<Shar
logger.info('Waiting for target!'); logger.info('Waiting for target!');
await browser.waitForTarget((target: puppeteer.Target) => target.url().includes(hostname), { timeout: 150000 }); await browser.waitForTarget((target: puppeteer.Target) => target.url().startsWith(`https://${hostname}`), { timeout: 150000 });
logger.info('We are logged in.'); logger.info('We are logged in.');
let session: ShareSession | null = null; let session: ShareSession | null = null;