Add user email configurations and refactor tests to use them

Author: CalebGerman

src/test/TestConfig.ts

@@ -2,7 +2,6 @@
  * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
-/* eslint-disable no-console */
 import type { AccessToken } from "@itwin/core-bentley";
 import type { TestUserCredentials } from "@itwin/oidc-signin-tool/lib/cjs/frontend";
 import { TestUsers, TestUtility } from "@itwin/oidc-signin-tool";
@@ -27,6 +26,8 @@ export class TestConfig {
   public static readonly temporaryUserEmail: string = process.env.IMJS_TEST_TEMP_USER_EMAIL!;
   public static readonly temporaryUserId: string = process.env.IMJS_TEST_TEMP_USER_ID!;
 
+  public static readonly regularUserEmail: string = process.env.IMJS_TEST_REGULAR_USER_EMAIL!;
+  public static readonly managerUserEmail: string = process.env.IMJS_TEST_MANAGER_USER_EMAIL!;
   public static readonly regularUserId: string = process.env.IMJS_TEST_REGULAR_USER_ID!;
 
   public static readonly itwinId: string = process.env.IMJS_TEST_ITWIN_ID!;
@@ -38,10 +39,6 @@ export class TestConfig {
       email: process.env.IMJS_ITWIN_TEST_USER!,
       password: process.env.IMJS_ITWIN_TEST_USER_PASSWORD!,
     };
-
-    console.log(`Super: ${TestUsers.super.email} ${TestUsers.super.password}`);
-    console.log(`Regular: ${TestUsers.regular.email} ${TestUsers.regular.password}`);
-    console.log(`Manager: ${TestUsers.manager.email} ${TestUsers.manager.password}`);
-    return TestUtility.getAccessToken(userCredentials);
+    return TestUtility.getAccessToken(TestUsers?.super?.password && TestUsers?.super?.email ? TestUsers.super : userCredentials);
   }
 }

src/test/integration/accessControlClientOwnerMembers.test.ts

@@ -108,20 +108,21 @@ describe("AccessControlClient Owner Members", () => {
 
   it("should get add, get, and remove a owner member", async () => {
     // --- Add Owner ---
+    const managerEmail = TestUsers.manager.email ? TestUsers.manager.email : TestConfig.managerUserEmail;
     // Act
     const addOwnerMemberResponse: AccessControlAPIResponse<AddOwnerMemberResponse> =
       await accessControlClient.ownerMembers.addITwinOwnerMemberAsync(
         accessToken,
         TestConfig.itwinId,
         {
-          email: TestUsers.manager.email,
+          email: managerEmail,
         },
       );
     // Assert
     expect(addOwnerMemberResponse.status).toBe(201);
     expect(addOwnerMemberResponse.data).toBeDefined();
     expect(addOwnerMemberResponse.data!.member).toBeDefined();
-    expect(addOwnerMemberResponse.data!.member!.email).toBe(TestUsers.manager.email);
+    expect(addOwnerMemberResponse.data!.member!.email).toBe(managerEmail);
 
     // --- Check owner exists ---
     // Act
@@ -133,9 +134,9 @@ describe("AccessControlClient Owner Members", () => {
 
     expect(queryOwnerMemberResponse.status).toBe(200);
     expect(queryOwnerMemberResponse.data).toBeDefined();
-    const newOwner = queryOwnerMemberResponse.data!.filter((member) => member.email === TestUsers.manager.email)[0];
+    const newOwner = queryOwnerMemberResponse.data!.filter((member) => member.email === managerEmail)[0];
     expect(newOwner).toBeDefined();
-    expect(newOwner.email).toBe(TestUsers.manager.email);
+    expect(newOwner.email).toBe(managerEmail);
 
     // --- Remove owner ---
     // Act

src/test/integration/accessControlClientUserMembers.test.ts

@@ -140,6 +140,7 @@ describe("AccessControlClient User Members", () => {
   });
 
   it("should get add, get, update, and remove a user member", async () => {
+    const regularEmail = TestUsers.regular.email ? TestUsers.regular.email : TestConfig.regularUserEmail;
     // --- Add Member ---
     // Act
     const addUserMemberResponse: AccessControlAPIResponse<AddUserMemberResponse> =
@@ -148,7 +149,7 @@ describe("AccessControlClient User Members", () => {
         TestConfig.itwinId,
         [
           {
-            email: TestUsers.regular.email,
+            email: regularEmail,
             roleIds: [TestConfig.permanentRoleId1, TestConfig.permanentRoleId2],
           },
         ],
@@ -173,7 +174,7 @@ describe("AccessControlClient User Members", () => {
 
     expect(getUserMemberResponse.status).toBe(200);
     expect(getUserMemberResponse.data).toBeDefined();
-    expect(getUserMemberResponse.data!.email).toBe(TestUsers.regular.email);
+    expect(getUserMemberResponse.data!.email).toBe(regularEmail);
     expect(getUserMemberResponse.data!.roles!.length).toBe(2);
     expect(getUserMemberResponse.data!.roles![0].id).toBe(TestConfig.permanentRoleId1);