chore(rbac): bump test utils and remove auth and rbac apis

Signed-off-by: Patrick Knight <pknight@redhat.com>

Author: PatAKnight

workspaces/rbac/e2e-tests/package.json

@@ -25,7 +25,7 @@
     "@backstage-community/plugin-rbac-common": "1.23.0",
     "@eslint/js": "^9.39.2",
     "@playwright/test": "1.57.0",
-    "@red-hat-developer-hub/e2e-test-utils": "1.1.14",
+    "@red-hat-developer-hub/e2e-test-utils": "1.1.15",
     "@types/node": "^24.10.1",
     "dotenv": "^16.4.7",
     "eslint": "^9.39.2",

workspaces/rbac/e2e-tests/support/api/rbac-api.ts

@@ -1,16 +1,20 @@
 import { APIResponse } from "@playwright/test";
-import RhdhRbacApi, { Policy, Response } from "../../support/api/rbac-api";
 import { RbacRef } from "../constants/roles";
 import {
   PermissionAction,
   RoleConditionalPolicyDecision,
 } from "@backstage-community/plugin-rbac-common";
+import {
+  RbacApiHelper,
+  Policy,
+  Response,
+} from "@red-hat-developer-hub/e2e-test-utils/helpers";
 
 // Roles that cannot be deleted and will throw a 403 — skip to avoid noise
 const SKIPPABLE_ROLES: Set<string> = new Set(["rbac_admin", "guests"]);
 
 async function deletePoliciesForRole(
-  rbacApi: RhdhRbacApi,
+  rbacApi: RbacApiHelper,
   roleName: string,
   policiesResponse: APIResponse,
 ): Promise<void> {
@@ -22,7 +26,7 @@ async function deletePoliciesForRole(
 }
 
 async function deleteConditionsForRole(
-  rbacApi: RhdhRbacApi,
+  rbacApi: RbacApiHelper,
   conditionResponse: APIResponse,
   remainingConditions: RoleConditionalPolicyDecision<PermissionAction>[],
 ): Promise<void> {
@@ -32,7 +36,10 @@ async function deleteConditionsForRole(
   }
 }
 
-async function cleanupRole(rbacApi: RhdhRbacApi, role: RbacRef): Promise<void> {
+async function cleanupRole(
+  rbacApi: RbacApiHelper,
+  role: RbacRef,
+): Promise<void> {
   const policiesResponse = await rbacApi.getPoliciesByRole(role.name);
   const conditionResponse = await rbacApi.getConditions();
   const remainingConditions = await rbacApi.getConditionsByRole(
@@ -63,7 +70,7 @@ export async function cleanupRoles(
   roles: Record<string, RbacRef>,
   apiToken: string,
 ): Promise<void> {
-  const rbacApi = await RhdhRbacApi.build(apiToken);
+  const rbacApi = await RbacApiHelper.build(apiToken);
 
   for (const role of Object.values(roles)) {
     if (SKIPPABLE_ROLES.has(role.name)) continue;

workspaces/rbac/e2e-tests/support/api/rhdh-auth-api-hack.ts

@@ -10,7 +10,6 @@ import {
 import { $ } from "@red-hat-developer-hub/e2e-test-utils/utils";
 import * as path from "node:path";
 import { createUsersAndGroups } from "../../support/utils/create-users";
-import { RhdhAuthApiHack } from "../../support/api/rhdh-auth-api-hack";
 import { cleanupRoles } from "../../support/utils/cleanup";
 import {
   RBAC_DESCRIPTIVE_USERS,
@@ -21,6 +20,7 @@ import {
 import { RBAC_ROLES } from "../../support/constants/roles";
 import { loginAs } from "../../support/utils/login";
 import {
+  AuthApiHelper,
   LoginHelper,
   UIhelper,
 } from "@red-hat-developer-hub/e2e-test-utils/helpers";
@@ -77,7 +77,8 @@ test.describe("RBAC plugin", () => {
     const uiHelper = new UIhelper(page);
     const loginHelper = new LoginHelper(page);
     await setupAdminSession({ page, uiHelper, loginHelper });
-    apiToken = await RhdhAuthApiHack.getToken(page);
+    const authApiHelper = new AuthApiHelper(page);
+    apiToken = await authApiHelper.getToken();
     await context.close();
   });
 
@@ -569,6 +570,7 @@ test.describe("RBAC plugin", () => {
       await loginAs(loginHelper, RBAC_DESCRIPTIVE_USERS.rbacAdmin);
 
       await rbacPO.navigateToRBACPage();
+
       await rbacPO.deleteRole(RBAC_ROLES.rbacOwnership.ref);
     });
 

workspaces/rbac/e2e-tests/support/utils/cleanup.ts

@@ -296,11 +296,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@red-hat-developer-hub/e2e-test-utils@npm:1.1.14":
-  version: 1.1.14
-  resolution: "@red-hat-developer-hub/e2e-test-utils@npm:1.1.14"
+"@red-hat-developer-hub/e2e-test-utils@npm:1.1.15":
+  version: 1.1.15
+  resolution: "@red-hat-developer-hub/e2e-test-utils@npm:1.1.15"
   dependencies:
     "@axe-core/playwright": ^4.11.0
+    "@backstage-community/plugin-rbac-common": 1.23.0
     "@eslint/js": ^9.39.1
     "@keycloak/keycloak-admin-client": ^26.0.0
     "@kubernetes/client-node": ^1.4.0
@@ -319,7 +320,7 @@ __metadata:
     zx: ^8.8.5
   peerDependencies:
     "@playwright/test": ^1.57.0
-  checksum: 22264a01c79284deaa18c455b6477b7ea304fca62f2517cf347c1fc51131003d58db383e04bfcc0e8ddbe231d819f9ae0b9ee5497b2b00a2cff56ed70c1a1339
+  checksum: 9b92ffbec69b77f263c875a9f3edb672fbe165f3cee8f84c5e2e7b9dd2428b693a2eb9b3375f42c0706960dd7ea2d434e7917f2eb5b6a3762d8f80c18a936c70
   languageName: node
   linkType: hard
 
@@ -2033,7 +2034,7 @@ __metadata:
     "@backstage-community/plugin-rbac-common": 1.23.0
     "@eslint/js": ^9.39.2
     "@playwright/test": 1.57.0
-    "@red-hat-developer-hub/e2e-test-utils": 1.1.14
+    "@red-hat-developer-hub/e2e-test-utils": 1.1.15
     "@types/node": ^24.10.1
     dotenv: ^16.4.7
     eslint: ^9.39.2