Add role name to profile page, replace GET route handlers with functions in server components

galasa-ui/extendedJsdomEnvironment.ts

@@ -0,0 +1,21 @@
+/*
+ * Copyright contributors to the Galasa project
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+import JSDOMEnvironment from 'jest-environment-jsdom';
+
+/**
+ * An extension of the JSDOM environment created to fix issues with resolving
+ * global functions in unit tests.
+ */
+export default class ExtendedJSDOMEnvironment extends JSDOMEnvironment {
+  constructor(...args: ConstructorParameters<typeof JSDOMEnvironment>) {
+    super(...args);
+
+    // structuredClone() was added in Node 17 but a "ReferenceError: structuredClone is not defined"
+    // error is thrown when running tests - see https://github.com/jsdom/jsdom/issues/3363
+    // This line forces the unit tests to use the correct implementation of structuredClone()
+    this.global.structuredClone = structuredClone;
+  }
+}

galasa-ui/jest.config.js

@@ -12,7 +12,7 @@ const createJestConfig = nextJest({
 // The Jest configuration to use in this project - see https://jestjs.io/docs/configuration for more information
 const config = {
 	setupFilesAfterEnv: ["<rootDir>/setupTests.ts"],
-	testEnvironment: "jest-environment-jsdom",
+	testEnvironment: "./extendedJsdomEnvironment.ts",
 
   // Ignore auto-generated code in coverage reports
   coveragePathIgnorePatterns: [

galasa-ui/src/app/auth/tokens/route.ts

@@ -8,8 +8,7 @@ import { createAuthenticatedApiConfiguration } from '@/utils/api';
 import AuthCookies from '@/utils/authCookies';
 import { cookies } from 'next/headers';
 import { NextRequest, NextResponse } from 'next/server';
-import { AuthenticationAPIApi, UsersAPIApi } from '@/generated/galasaapi';
-import * as Constants from "@/utils/constants";
+import { AuthenticationAPIApi } from '@/generated/galasaapi';
 
 // Stop this route from being pre-rendered
 export const dynamic = 'force-dynamic';
@@ -48,29 +47,6 @@ export async function POST(request: NextRequest) {
   }
 }
 
-export async function GET(request: NextRequest) {
-  // Call out to the API server's /auth/tokens endpoint to retrieve all tokens for a user
-
-  const authApiClientWithAuthHeader = new AuthenticationAPIApi(createAuthenticatedApiConfiguration());
-  const userApiClientWithAuthHeader = new UsersAPIApi(createAuthenticatedApiConfiguration());
-
-  const response = await userApiClientWithAuthHeader.getUserByLoginId(Constants.CLIENT_API_VERSION,"me");
-
-  const loginId = response.length > 0 && response[0].loginId;
-
-  if (loginId) {
-
-    const tokens = await authApiClientWithAuthHeader.getTokens(Constants.CLIENT_API_VERSION, loginId);
-
-    const serializedTokens = JSON.stringify(tokens.tokens);
-    return (new NextResponse(serializedTokens, {status: 200}));
-
-  } else {
-    return (new NextResponse("No login ID provided", {status : 400}));
-  }
-
-}
-
 export async function DELETE(request: NextRequest){
 
   const { tokenId } = await request.json();

galasa-ui/src/app/layout.tsx

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-import PageHeader from '@/components/PageHeader';
-import '../styles/global.scss';
+import PageHeader from '@/components/headers/PageHeader';
+import '@/styles/global.scss';
 
 export const dynamic = "force-dynamic";