dh-auth-library 1.6.0 → 1.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -34,7 +34,6 @@ export declare class ADLoginPage extends BasePage {
34
34
  * await adLoginPage.loginWithADAccountAndCreateSession(account, TARGET_URL_BY_ENVIRONMENT[env], fileName);
35
35
  */
36
36
  loginWithADAccountAndCreateSession(account: Account, targetUrl: string, fileName: string): Promise<void>;
37
- tryAgainUntilSuccesful(): Promise<void>;
38
37
  /**
39
38
  * Determines the GZAC URL to log in against, based on the current environment.
40
39
  *
package/dist/index.cjs.js CHANGED
@@ -387,6 +387,9 @@ var EHerkenningBewindvoerderLoginHandler = class {
387
387
  var gzacUrlProd = "https://alg-zgw.denhaag.nl";
388
388
  var gzacUrlAcp = "https://alg-zgw.acc.denhaag.nl";
389
389
  var gzacUrlTest = "https://alg-zgw.test.denhaag.nl";
390
+ function escapeRegExp(value) {
391
+ return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
392
+ }
390
393
  var ADLoginPage = class ADLoginPage extends nl_portal_playwright_libraries.BasePage {
391
394
  gebruikersnaamInput;
392
395
  wachtwoordInput;
@@ -403,7 +406,7 @@ var ADLoginPage = class ADLoginPage extends nl_portal_playwright_libraries.BaseP
403
406
  this.volgendeInput = page.locator("//input[@type='submit']");
404
407
  this.aanmeldenInput = page.locator("//input[@type='submit']");
405
408
  this.kanAuthAppNietGebruikenLink = page.locator("//*[@id='signInAnotherWay']");
406
- this.gebruikVerificatieCode = page.locator("//div[@id='idDiv_SAOTCS_Proofs']//div[contains(@role,'listitem')][2]");
409
+ this.gebruikVerificatieCode = page.getByText(/Gebruik een verificatiecode|Use a verification code/);
407
410
  this.codeInput = page.locator("//input[@name='otc']");
408
411
  this.verifierenInput = page.locator("//input[@type='submit']");
409
412
  }
@@ -434,50 +437,58 @@ var ADLoginPage = class ADLoginPage extends nl_portal_playwright_libraries.BaseP
434
437
  */
435
438
  async loginWithADAccountAndCreateSession(account, targetUrl, fileName) {
436
439
  const adLoginPage = new ADLoginPage(this.page);
440
+ let targetOrigin;
441
+ try {
442
+ targetOrigin = new URL(targetUrl).origin;
443
+ } catch {
444
+ throw new Error(`AD login failed: targetUrl must be an absolute URL (e.g. "https://app.denhaag.nl/..."), got "${targetUrl}"`);
445
+ }
446
+ const isOnTargetApp = async () => this.page.waitForLoadState("networkidle").then(() => this.page.url().startsWith(targetOrigin), () => false);
447
+ let cachedAccountUsed = false;
448
+ let alreadyFullyAuthenticated = false;
437
449
  await _playwright_test.test.step("Fill AD username and submit", async () => {
438
450
  await this.page.goto(targetUrl);
439
- await adLoginPage.gebruikersnaamInput.waitFor();
440
- await adLoginPage.gebruikersnaamInput.fill(account.username);
441
- await adLoginPage.volgendeInput.click();
442
- await this.page.getByText("Uw wachtwoord gebruiken").click();
443
- });
444
- await _playwright_test.test.step("Fill AD password and submit", async () => {
445
- await maskedFill(adLoginPage.wachtwoordInput, account.password, "wachtwoord");
446
- await adLoginPage.aanmeldenInput.click();
447
- await this.page.waitForTimeout(1e3);
448
- try {
449
- if (await this.page.getByText("Uw account is niet geverifieerd. Probeer het opnieuw").isVisible()) await this.tryAgainUntilSuccesful();
450
- } catch (_error) {}
451
- });
452
- await _playwright_test.test.step("Complete MFA via TOTP", async () => {
453
- await adLoginPage.kanAuthAppNietGebruikenLink.click();
454
- await adLoginPage.gebruikVerificatieCode.click();
455
- const token = await totp_generator.TOTP.generate(`${process.env.AD_SECRET}`);
456
- await maskedFill(adLoginPage.codeInput, token.otp, "otp", true);
457
- await adLoginPage.verifierenInput.click();
458
- await adLoginPage.page.waitForTimeout(5e3);
459
- adLoginPage.page.on("domcontentloaded", () => {});
451
+ alreadyFullyAuthenticated = await isOnTargetApp();
452
+ if (alreadyFullyAuthenticated) return;
453
+ const cachedAccountTile = this.page.getByRole("button", { name: new RegExp(escapeRegExp(account.username), "i") });
454
+ await cachedAccountTile.or(adLoginPage.gebruikersnaamInput).waitFor({
455
+ state: "visible",
456
+ timeout: 1e4
457
+ }).catch(() => {});
458
+ cachedAccountUsed = await cachedAccountTile.isVisible().catch(() => false);
459
+ if (cachedAccountUsed) {
460
+ await cachedAccountTile.click();
461
+ alreadyFullyAuthenticated = await isOnTargetApp();
462
+ } else {
463
+ await adLoginPage.gebruikersnaamInput.waitFor();
464
+ await adLoginPage.gebruikersnaamInput.fill(account.username);
465
+ await adLoginPage.volgendeInput.click();
466
+ await this.page.getByText("Uw wachtwoord gebruiken").click();
467
+ }
460
468
  });
469
+ let sessionWasStale = false;
470
+ if (!alreadyFullyAuthenticated) {
471
+ await _playwright_test.test.step("Fill AD password and submit", async () => {
472
+ if (!cachedAccountUsed) {
473
+ await maskedFill(adLoginPage.wachtwoordInput, account.password, "wachtwoord");
474
+ await adLoginPage.aanmeldenInput.click();
475
+ await this.page.waitForTimeout(1e3);
476
+ }
477
+ sessionWasStale = await this.page.getByText("Uw account is niet geverifieerd. Probeer het opnieuw").isVisible().catch(() => false);
478
+ });
479
+ await _playwright_test.test.step("Complete MFA via TOTP", async () => {
480
+ if (!sessionWasStale) await adLoginPage.kanAuthAppNietGebruikenLink.click();
481
+ await adLoginPage.gebruikVerificatieCode.click();
482
+ const token = await totp_generator.TOTP.generate(`${process.env.AD_SECRET}`);
483
+ await maskedFill(adLoginPage.codeInput, token.otp, "otp", true);
484
+ await adLoginPage.verifierenInput.click();
485
+ await adLoginPage.page.waitForTimeout(5e3);
486
+ });
487
+ }
461
488
  await _playwright_test.test.step("Save session state", async () => {
462
489
  await adLoginPage.page.context().storageState({ path: fileName });
463
490
  });
464
491
  }
465
- async tryAgainUntilSuccesful() {
466
- let maxNumberOfTries = 6;
467
- let foutMeldingIsSHowing = true;
468
- while (foutMeldingIsSHowing) {
469
- await this.page.waitForTimeout(1e4);
470
- maxNumberOfTries--;
471
- if (maxNumberOfTries == 0) return;
472
- try {
473
- await this.page.goBack();
474
- await this.page.waitForTimeout(1e3);
475
- await this.page.locator("//div[contains(@role,'listitem')]").first().click();
476
- await this.page.waitForTimeout(1e3);
477
- foutMeldingIsSHowing = await this.page.getByText("Uw account is niet geverifieerd. Probeer het opnieuw").isVisible();
478
- } catch (_error) {}
479
- }
480
- }
481
492
  /**
482
493
  * Determines the GZAC URL to log in against, based on the current environment.
483
494
  *
package/dist/index.es.js CHANGED
@@ -363,6 +363,9 @@ var EHerkenningBewindvoerderLoginHandler = class {
363
363
  var gzacUrlProd = "https://alg-zgw.denhaag.nl";
364
364
  var gzacUrlAcp = "https://alg-zgw.acc.denhaag.nl";
365
365
  var gzacUrlTest = "https://alg-zgw.test.denhaag.nl";
366
+ function escapeRegExp(value) {
367
+ return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
368
+ }
366
369
  var ADLoginPage = class ADLoginPage extends BasePage {
367
370
  gebruikersnaamInput;
368
371
  wachtwoordInput;
@@ -379,7 +382,7 @@ var ADLoginPage = class ADLoginPage extends BasePage {
379
382
  this.volgendeInput = page.locator("//input[@type='submit']");
380
383
  this.aanmeldenInput = page.locator("//input[@type='submit']");
381
384
  this.kanAuthAppNietGebruikenLink = page.locator("//*[@id='signInAnotherWay']");
382
- this.gebruikVerificatieCode = page.locator("//div[@id='idDiv_SAOTCS_Proofs']//div[contains(@role,'listitem')][2]");
385
+ this.gebruikVerificatieCode = page.getByText(/Gebruik een verificatiecode|Use a verification code/);
383
386
  this.codeInput = page.locator("//input[@name='otc']");
384
387
  this.verifierenInput = page.locator("//input[@type='submit']");
385
388
  }
@@ -410,50 +413,58 @@ var ADLoginPage = class ADLoginPage extends BasePage {
410
413
  */
411
414
  async loginWithADAccountAndCreateSession(account, targetUrl, fileName) {
412
415
  const adLoginPage = new ADLoginPage(this.page);
416
+ let targetOrigin;
417
+ try {
418
+ targetOrigin = new URL(targetUrl).origin;
419
+ } catch {
420
+ throw new Error(`AD login failed: targetUrl must be an absolute URL (e.g. "https://app.denhaag.nl/..."), got "${targetUrl}"`);
421
+ }
422
+ const isOnTargetApp = async () => this.page.waitForLoadState("networkidle").then(() => this.page.url().startsWith(targetOrigin), () => false);
423
+ let cachedAccountUsed = false;
424
+ let alreadyFullyAuthenticated = false;
413
425
  await test.step("Fill AD username and submit", async () => {
414
426
  await this.page.goto(targetUrl);
415
- await adLoginPage.gebruikersnaamInput.waitFor();
416
- await adLoginPage.gebruikersnaamInput.fill(account.username);
417
- await adLoginPage.volgendeInput.click();
418
- await this.page.getByText("Uw wachtwoord gebruiken").click();
419
- });
420
- await test.step("Fill AD password and submit", async () => {
421
- await maskedFill(adLoginPage.wachtwoordInput, account.password, "wachtwoord");
422
- await adLoginPage.aanmeldenInput.click();
423
- await this.page.waitForTimeout(1e3);
424
- try {
425
- if (await this.page.getByText("Uw account is niet geverifieerd. Probeer het opnieuw").isVisible()) await this.tryAgainUntilSuccesful();
426
- } catch (_error) {}
427
- });
428
- await test.step("Complete MFA via TOTP", async () => {
429
- await adLoginPage.kanAuthAppNietGebruikenLink.click();
430
- await adLoginPage.gebruikVerificatieCode.click();
431
- const token = await TOTP.generate(`${process.env.AD_SECRET}`);
432
- await maskedFill(adLoginPage.codeInput, token.otp, "otp", true);
433
- await adLoginPage.verifierenInput.click();
434
- await adLoginPage.page.waitForTimeout(5e3);
435
- adLoginPage.page.on("domcontentloaded", () => {});
427
+ alreadyFullyAuthenticated = await isOnTargetApp();
428
+ if (alreadyFullyAuthenticated) return;
429
+ const cachedAccountTile = this.page.getByRole("button", { name: new RegExp(escapeRegExp(account.username), "i") });
430
+ await cachedAccountTile.or(adLoginPage.gebruikersnaamInput).waitFor({
431
+ state: "visible",
432
+ timeout: 1e4
433
+ }).catch(() => {});
434
+ cachedAccountUsed = await cachedAccountTile.isVisible().catch(() => false);
435
+ if (cachedAccountUsed) {
436
+ await cachedAccountTile.click();
437
+ alreadyFullyAuthenticated = await isOnTargetApp();
438
+ } else {
439
+ await adLoginPage.gebruikersnaamInput.waitFor();
440
+ await adLoginPage.gebruikersnaamInput.fill(account.username);
441
+ await adLoginPage.volgendeInput.click();
442
+ await this.page.getByText("Uw wachtwoord gebruiken").click();
443
+ }
436
444
  });
445
+ let sessionWasStale = false;
446
+ if (!alreadyFullyAuthenticated) {
447
+ await test.step("Fill AD password and submit", async () => {
448
+ if (!cachedAccountUsed) {
449
+ await maskedFill(adLoginPage.wachtwoordInput, account.password, "wachtwoord");
450
+ await adLoginPage.aanmeldenInput.click();
451
+ await this.page.waitForTimeout(1e3);
452
+ }
453
+ sessionWasStale = await this.page.getByText("Uw account is niet geverifieerd. Probeer het opnieuw").isVisible().catch(() => false);
454
+ });
455
+ await test.step("Complete MFA via TOTP", async () => {
456
+ if (!sessionWasStale) await adLoginPage.kanAuthAppNietGebruikenLink.click();
457
+ await adLoginPage.gebruikVerificatieCode.click();
458
+ const token = await TOTP.generate(`${process.env.AD_SECRET}`);
459
+ await maskedFill(adLoginPage.codeInput, token.otp, "otp", true);
460
+ await adLoginPage.verifierenInput.click();
461
+ await adLoginPage.page.waitForTimeout(5e3);
462
+ });
463
+ }
437
464
  await test.step("Save session state", async () => {
438
465
  await adLoginPage.page.context().storageState({ path: fileName });
439
466
  });
440
467
  }
441
- async tryAgainUntilSuccesful() {
442
- let maxNumberOfTries = 6;
443
- let foutMeldingIsSHowing = true;
444
- while (foutMeldingIsSHowing) {
445
- await this.page.waitForTimeout(1e4);
446
- maxNumberOfTries--;
447
- if (maxNumberOfTries == 0) return;
448
- try {
449
- await this.page.goBack();
450
- await this.page.waitForTimeout(1e3);
451
- await this.page.locator("//div[contains(@role,'listitem')]").first().click();
452
- await this.page.waitForTimeout(1e3);
453
- foutMeldingIsSHowing = await this.page.getByText("Uw account is niet geverifieerd. Probeer het opnieuw").isVisible();
454
- } catch (_error) {}
455
- }
456
- }
457
468
  /**
458
469
  * Determines the GZAC URL to log in against, based on the current environment.
459
470
  *
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dh-auth-library",
3
- "version": "1.6.0",
3
+ "version": "1.6.1",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "git+https://github.com/Gemeente-DenHaag/dh-auth-library.git"