Fix Node E2E

.pipelines/3p-e2e.yml

@@ -3,6 +3,10 @@ parameters:
       displayName: "Debug Variables"
       type: boolean
       default: false
+    - name: "maxParallel"
+      displayName: "Maximum number of parallel jobs"
+      type: number
+      default: 0
 variables:
     CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
     LinuxContainerImage: "mcr.microsoft.com/onebranch/cbl-mariner/build:2.0" # Docker image which is used to build the project https://aka.ms/obpipelines/containers
@@ -22,7 +26,7 @@ resources:
         - repository: 1P
           type: git
           name: IDDP/msal-javascript-1p
-          ref: master
+          ref: update-browser-api-extr
 extends:
     template: v2/OneBranch.NonOfficial.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates
     parameters:
@@ -49,11 +53,12 @@ extends:
                             - "pop"
                             - "customizable-e2e-test"
                         debug: ${{ parameters.debug }}
+                        maxParallel: ${{ parameters.maxParallel }}
                   - template: .pipelines/templates/e2e-tests.yml@1P
                     parameters:
                         jobName: "validate_msal_node"
                         targetLib: "msal-node"
-                        poolType: "windows"
+                        poolType: "linux"
                         stage: "CI"
                         sourceRepo: ${{ variables.sourceRepo }}
                         sourceBranch: ${{ variables.sourceBranch }}
@@ -68,6 +73,7 @@ extends:
                             - "b2c-user-flows"
                             # - "on-behalf-of"
                         debug: ${{ parameters.debug }}
+                        maxParallel: ${{ parameters.maxParallel }}
                   - template: .pipelines/templates/e2e-tests.yml@1P
                     parameters:
                         jobName: "validate_msal_react"
@@ -83,6 +89,7 @@ extends:
                             - "typescript-sample"
                             - "b2c-sample"
                         debug: ${{ parameters.debug }}
+                        maxParallel: ${{ parameters.maxParallel }}
                   - template: .pipelines/templates/e2e-tests.yml@1P
                     parameters:
                         jobName: "validate_msal_angular"

change/@azure-msal-node-aa1f6b5e-7b65-4f82-8b0c-228727a1cd77.json

@@ -0,0 +1,7 @@
+{
+  "type": "none",
+  "comment": "Update format",
+  "packageName": "@azure/msal-node",
+  "email": "[email protected]",
+  "dependentChangeType": "none"
+}

samples/e2eTestUtils/src/TestUtils.ts

@@ -4,7 +4,7 @@ import { LabConfig } from "./LabConfig";
 import { LabClient } from "./LabClient";
 
 export const ONE_SECOND_IN_MS = 1000;
-export const RETRY_TIMES = 5;
+export const RETRY_TIMES = 0;
 
 const WAIT_FOR_NAVIGATION_CONFIG: WaitForOptions = {
     waitUntil: ["load", "domcontentloaded", "networkidle0"],
@@ -179,6 +179,7 @@ export async function b2cLocalAccountEnterCredentials(
     await screenshot.takeScreenshot(page, "b2cSignInPage");
     await page.type("#logonIdentifier", username);
     await page.type("#password", accountPwd);
+    await screenshot.takeScreenshot(page, "b2cSignInPageCredentialsEntered");
     await page.click("#next");
 }
 
@@ -211,7 +212,7 @@ export async function b2cMsaAccountEnterCredentials(
 }
 
 // Constants
-export const SCREENSHOT_BASE_FOLDER_NAME = `${__dirname}/screenshots`;
+export const SCREENSHOT_BASE_FOLDER_NAME = `${process.cwd()}/screenshots`;
 export const SAMPLE_HOME_URL = "http://localhost";
 export const SUCCESSFUL_GRAPH_CALL_ID = "graph-called-successfully";
 export const SUCCESSFUL_SILENT_TOKEN_ACQUISITION_ID = "token-acquired-silently";

samples/msal-node-samples/auth-code/index.js

@@ -173,7 +173,7 @@ if (argv.$0 === "index.js") {
             clientId: config.authOptions.clientId,
             authority: config.authOptions.authority,
             clientSecret: process.env.AZURE_CLIENT_SECRET,
-            knownAuthorities: [config.authOptions.knownAuthorities]
+            knownAuthorities: config.authOptions.knownAuthorities
         },
         cache: {
             cachePlugin

samples/msal-node-samples/auth-code/test/auth-code-b2c-local.spec.ts

@@ -2,7 +2,7 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-
+import fs from "fs";
 import * as puppeteer from "puppeteer";
 import {
     Screenshot,
@@ -20,7 +20,7 @@ import {
     UserTypes,
 } from "e2e-test-utils";
 
-import { PublicClientApplication } from "@azure/msal-node";
+import { LogLevel, PublicClientApplication } from "@azure/msal-node";
 
 // Set test cache name/location
 const TEST_CACHE_LOCATION = `${__dirname}/data/b2c-local.cache.json`;
@@ -45,6 +45,7 @@ describe("Auth Code B2C Tests (local account)", () => {
 
     let username: string;
     let accountPwd: string;
+    const logFile = fs.createWriteStream(__dirname + '/debug.log', {flags : 'w'});
 
     const screenshotFolder = `${SCREENSHOT_BASE_FOLDER_NAME}/auth-code/b2c/local-account`;
 
@@ -87,6 +88,14 @@ describe("Auth Code B2C Tests (local account)", () => {
             publicClientApplication = new PublicClientApplication({
                 auth: config.authOptions,
                 cache: { cachePlugin },
+                system: {
+                    loggerOptions: {
+                        loggerCallback(loglevel, message, containsPii) {
+                            logFile.write(message + "\n");
+                        },
+                        logLevel: LogLevel.Verbose
+                    },
+                }
             });
 
             server = getTokenAuthCode(config, publicClientApplication, port);
@@ -102,7 +111,7 @@ describe("Auth Code B2C Tests (local account)", () => {
         beforeEach(async () => {
             context = await browser.createIncognitoBrowserContext();
             page = await context.newPage();
-            page.setDefaultTimeout(5000);
+            page.setDefaultTimeout(10000);
             page.on("dialog", async (dialog) => {
                 console.log(dialog.message());
                 await dialog.dismiss();
@@ -124,9 +133,11 @@ describe("Auth Code B2C Tests (local account)", () => {
                 username,
                 accountPwd
             );
+
             await page.waitForFunction(
                 `window.location.href.startsWith("${SAMPLE_HOME_URL}")`
             );
+            await screenshot.takeScreenshot(page, "credentialsSubmitted");
             const cachedTokens = await NodeCacheTestUtils.waitForTokens(
                 TEST_CACHE_LOCATION,
                 2000
@@ -147,9 +158,11 @@ describe("Auth Code B2C Tests (local account)", () => {
                 username,
                 accountPwd
             );
+
             await page.waitForFunction(
                 `window.location.href.startsWith("${SAMPLE_HOME_URL}")`
             );
+            await screenshot.takeScreenshot(page, "credentialsSubmitted");
 
             const cachedTokens = await NodeCacheTestUtils.waitForTokens(
                 TEST_CACHE_LOCATION,
@@ -171,9 +184,11 @@ describe("Auth Code B2C Tests (local account)", () => {
                 username,
                 accountPwd
             );
+
             await page.waitForFunction(
                 `window.location.href.startsWith("${SAMPLE_HOME_URL}")`
             );
+            await screenshot.takeScreenshot(page, "credentialsSubmitted");
 
             const cachedTokens = await NodeCacheTestUtils.waitForTokens(
                 TEST_CACHE_LOCATION,
@@ -194,9 +209,11 @@ describe("Auth Code B2C Tests (local account)", () => {
                 username,
                 accountPwd
             );
+
             await page.waitForFunction(
                 `window.location.href.startsWith("${SAMPLE_HOME_URL}")`
             );
+            await screenshot.takeScreenshot(page, "credentialsSubmitted");
             await NodeCacheTestUtils.waitForTokens(TEST_CACHE_LOCATION, 2000);
 
             // Reset the cache to prepare for the second login
@@ -225,9 +242,11 @@ describe("Auth Code B2C Tests (local account)", () => {
                 username,
                 accountPwd
             );
+
             await page.waitForFunction(
                 `window.location.href.startsWith("${SAMPLE_HOME_URL}")`
             );
+            await screenshot.takeScreenshot(page, "credentialsSubmitted");
             const url = page.url();
             expect(url.includes(`state=${STATE_VALUE}`)).toBe(true);
             const cachedTokens = await NodeCacheTestUtils.waitForTokens(

samples/msal-node-samples/auth-code/test/auth-code-b2c-msa.spec.ts

@@ -127,6 +127,7 @@ describe("Auth Code B2C Tests (msa account)", () => {
             await page.waitForFunction(
                 `window.location.href.startsWith("${SAMPLE_HOME_URL}")`
             );
+            await screenshot.takeScreenshot(page, "credentialsSubmitted");
             const cachedTokens = await NodeCacheTestUtils.waitForTokens(
                 TEST_CACHE_LOCATION,
                 2000
@@ -150,7 +151,7 @@ describe("Auth Code B2C Tests (msa account)", () => {
             await page.waitForFunction(
                 `window.location.href.startsWith("${SAMPLE_HOME_URL}")`
             );
-
+            await screenshot.takeScreenshot(page, "credentialsSubmitted");
             const cachedTokens = await NodeCacheTestUtils.waitForTokens(
                 TEST_CACHE_LOCATION,
                 2000
@@ -174,6 +175,7 @@ describe("Auth Code B2C Tests (msa account)", () => {
             await page.waitForFunction(
                 `window.location.href.startsWith("${SAMPLE_HOME_URL}")`
             );
+            await screenshot.takeScreenshot(page, "credentialsSubmitted");
 
             const cachedTokens = await NodeCacheTestUtils.waitForTokens(
                 TEST_CACHE_LOCATION,
@@ -197,6 +199,7 @@ describe("Auth Code B2C Tests (msa account)", () => {
             await page.waitForFunction(
                 `window.location.href.startsWith("${SAMPLE_HOME_URL}")`
             );
+            await screenshot.takeScreenshot(page, "credentialsSubmitted");
             await NodeCacheTestUtils.waitForTokens(TEST_CACHE_LOCATION, 2000);
 
             // Reset the cache to prepare for the second login
@@ -228,6 +231,7 @@ describe("Auth Code B2C Tests (msa account)", () => {
             await page.waitForFunction(
                 `window.location.href.startsWith("${SAMPLE_HOME_URL}")`
             );
+            await screenshot.takeScreenshot(page, "credentialsSubmitted");
             const url = page.url();
             expect(url.includes(`state=${STATE_VALUE}`)).toBe(true);
             const cachedTokens = await NodeCacheTestUtils.waitForTokens(