Setup tests to allow for easier lab user selection

samples/VanillaJSTestApp2.0/app/b2c/test/browser.spec.ts

@@ -2,7 +2,7 @@ import * as Mocha from "mocha";
 import puppeteer from "puppeteer";
 import { expect } from "chai";
 import fs from "fs";
-import { LabClient } from "../../../e2eTests/LabClient";
+import { LabClient, ILabApiParams } from "../../../e2eTests/LabClient";
 
 const SCREENSHOT_BASE_FOLDER_NAME = `${__dirname}/screenshots`;
 let SCREENSHOT_NUM = 0;
@@ -24,7 +24,8 @@ function setupScreenshotDir() {
 
 async function setupCredentials() {
     const testCreds = new LabClient();
-    const envResponse = await testCreds.getUserVarsByCloudEnvironment("azurecloud");
+    const userParams: ILabApiParams = {envName: "azurecloud"};
+    const envResponse = await testCreds.getUserVarsByCloudEnvironment(userParams);
     const testEnv = envResponse[0];
     if (testEnv.upn) {
         username = testEnv.upn;

samples/VanillaJSTestApp2.0/app/default/test/browser.spec.ts

@@ -2,7 +2,7 @@ import "mocha";
 import puppeteer from "puppeteer";
 import { expect } from "chai";
 import fs from "fs";
-import { LabClient } from "../../../e2eTests/LabClient";
+import { LabClient, ILabApiParams } from "../../../e2eTests/LabClient";
 
 const SCREENSHOT_BASE_FOLDER_NAME = `${__dirname}/screenshots`;
 let SCREENSHOT_NUM = 0;
@@ -17,7 +17,8 @@ function setupScreenshotDir() {
 
 async function setupCredentials() {
     const testCreds = new LabClient();
-    const envResponse = await testCreds.getUserVarsByCloudEnvironment("azureppe");
+    const userParams: ILabApiParams = {envName: "azurecloud"};
+    const envResponse = await testCreds.getUserVarsByCloudEnvironment(userParams);
     const testEnv = envResponse[0];
     if (testEnv.upn) {
         username = testEnv.upn;

samples/VanillaJSTestApp2.0/app/multiple_resources/test/multiple_resources.spec.ts

@@ -2,7 +2,7 @@ import "mocha";
 import puppeteer from "puppeteer";
 import { expect } from "chai";
 import fs from "fs";
-import { LabClient } from "../../../e2eTests/LabClient";
+import { LabClient, ILabApiParams } from "../../../e2eTests/LabClient";
 
 const SCREENSHOT_BASE_FOLDER_NAME = `${__dirname}/screenshots`;
 let SCREENSHOT_NUM = 0;
@@ -17,7 +17,8 @@ function setupScreenshotDir() {
 
 async function setupCredentials() {
     const testCreds = new LabClient();
-    const envResponse = await testCreds.getUserVarsByCloudEnvironment("azureppe");
+    const userParams: ILabApiParams = {envName: "azurecloud"};
+    const envResponse = await testCreds.getUserVarsByCloudEnvironment(userParams);
     const testEnv = envResponse[0];
     if (testEnv.upn) {
         username = testEnv.upn;

samples/VanillaJSTestApp2.0/e2eTests/LabClient.ts

@@ -2,6 +2,12 @@ import { ClientSecretCredential, AccessToken } from "@azure/identity";
 import axios from "axios";
 const labApiUri = "https://msidlab.com/api"
 
+export interface ILabApiParams {
+    envName?: string,
+    userType?: string,
+    b2cProvider?: string
+};
+
 export class LabClient {
 
     private credentials: ClientSecretCredential;
@@ -35,10 +41,26 @@ export class LabClient {
         return null;
     }
 
-    async getUserVarsByCloudEnvironment(envName: string): Promise<any> {
+    async getUserVarsByCloudEnvironment(apiParams: ILabApiParams): Promise<any> {
         const accessToken = await this.getCurrentToken();
+        let queryParams: Array<string> = [];
+
+        if (apiParams.envName) {
+            queryParams.push(`envname=${apiParams.envName}`);
+        }
+        if (apiParams.userType) {
+            queryParams.push(`usertype=${apiParams.userType}`);
+        }
+        if (apiParams.b2cProvider) {
+            queryParams.push(`b2cprovider=${apiParams.b2cProvider}`);
+        }
+
+        if (queryParams.length <= 0) {
+            throw "Must provide at least one param to getUserVarsByCloudEnvironment";
+        }
+        const apiUrl = '/user?' + queryParams.join("&");
 
-        return await this.requestLabApi(`/user?azureenvironment=${envName}`, accessToken);
+        return await this.requestLabApi(apiUrl, accessToken);
     }
 
     async getSecret(secretName: string): Promise<any> {