Get the kube user info only once.

backend/src/routes/api/groups-config/groupsConfigUtil.ts

@@ -8,7 +8,7 @@ import {
   KubeFastifyInstance,
 } from '../../../types';
 import { getAllGroups, getGroupsCR, updateGroupsCR } from '../../../utils/groupsUtils';
-import { getUserName } from '../../../utils/userUtils';
+import { getUserInfo } from '../../../utils/userUtils';
 import { isUserAdmin } from '../../../utils/adminUtils';
 
 const SYSTEM_AUTHENTICATED = 'system:authenticated';
@@ -34,8 +34,8 @@ export const updateGroupsConfig = async (
   const { customObjectsApi } = fastify.kube;
   const { namespace } = fastify.kube;
 
-  const username = await getUserName(fastify, request);
-  const isAdmin = await isUserAdmin(fastify, username, namespace);
+  const userInfo = await getUserInfo(fastify, request);
+  const isAdmin = await isUserAdmin(fastify, userInfo.userName, namespace);
 
   if (!isAdmin) {
     const error = createError(403, 'Error updating groups, user needs to be admin');

backend/src/routes/api/notebooks/utils.ts

@@ -2,7 +2,7 @@ import { V1ContainerStatus, V1Pod, V1PodList } from '@kubernetes/client-node';
 import { FastifyRequest } from 'fastify';
 import { isHttpError } from '../../../utils';
 import { KubeFastifyInstance, Notebook, NotebookData } from '../../../types';
-import { getUserName } from '../../../utils/userUtils';
+import { getUserInfo } from '../../../utils/userUtils';
 import {
   createNotebook,
   generateNotebookNameFromUsername,
@@ -69,7 +69,7 @@ export const enableNotebook = async (
 ): Promise<Notebook> => {
   const notebookData = request.body;
   const { notebookNamespace } = getNamespaces(fastify);
-  const username = request.body.username || (await getUserName(fastify, request));
+  const username = request.body.username || (await getUserInfo(fastify, request));
   const name = generateNotebookNameFromUsername(username);
   const url = request.headers.origin;
 

backend/src/routes/api/status/adminAllowedUsers.ts

@@ -1,6 +1,6 @@
 import { FastifyRequest } from 'fastify';
 import { KubeFastifyInstance } from '../../../types';
-import { getUserName } from '../../../utils/userUtils';
+import { getUserInfo } from '../../../utils/userUtils';
 import {
   getAdminUserList,
   getAllowedUserList,
@@ -66,7 +66,8 @@ export const getAllowedUsers = async (
   request: FastifyRequest<{ Params: { namespace: string } }>,
 ): Promise<AllowedUser[]> => {
   const { namespace } = request.params;
-  const currentUser = await getUserName(fastify, request);
+  const userInfo = await getUserInfo(fastify, request);
+  const currentUser = userInfo.userName;
   const isAdmin = await isUserAdmin(fastify, currentUser, namespace);
   if (!isAdmin) {
     // Privileged call -- return nothing

backend/src/routes/api/status/statusUtils.ts

@@ -1,6 +1,6 @@
 import { FastifyRequest } from 'fastify';
 import { KubeFastifyInstance, KubeStatus } from '../../../types';
-import { getUserId, getUserName } from '../../../utils/userUtils';
+import { getUserInfo } from '../../../utils/userUtils';
 import { createCustomError } from '../../../utils/requestUtils';
 import { isUserAdmin, isUserAllowed } from '../../../utils/adminUtils';
 import { isImpersonating } from '../../../devFlags';
@@ -19,8 +19,7 @@ export const status = async (
 
   const { server } = currentCluster;
 
-  const userName = await getUserName(fastify, request);
-  const userID: string = await getUserId(fastify, request);
+  const { userName, userID } = await getUserInfo(fastify, request);
   const isAdmin = await isUserAdmin(fastify, userName, namespace);
   const isAllowed = isAdmin ? true : await isUserAllowed(fastify, userName);
 

backend/src/utils/fileUtils.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import { KubeFastifyInstance, OauthFastifyRequest } from '../types';
 import { LOG_DIR } from './constants';
-import { getUserName } from './userUtils';
+import { getUserInfo } from './userUtils';
 import { getNamespaces } from './notebookUtils';
 import { isUserAdmin } from './adminUtils';
 
@@ -27,13 +27,13 @@ export const logRequestDetails = (
   };
 
   const writeLogAsync = async () => {
-    const username = await getUserName(fastify, request);
+    const userInfo = await getUserInfo(fastify, request);
     const { dashboardNamespace } = getNamespaces(fastify);
-    const isAdmin = await isUserAdmin(fastify, username, dashboardNamespace);
+    const isAdmin = await isUserAdmin(fastify, userInfo.userName, dashboardNamespace);
 
     writeAdminLog(fastify, {
       ...data,
-      user: username,
+      user: userInfo.userName,
       isAdmin: isAdmin,
     });
   };

backend/src/utils/notebookUtils.ts

@@ -20,7 +20,7 @@ import {
   TolerationOperator,
   VolumeMount,
 } from '../types';
-import { getUserName, usernameTranslate } from './userUtils';
+import { getUserInfo, usernameTranslate } from './userUtils';
 import { createCustomError } from './requestUtils';
 import {
   PatchUtils,
@@ -389,7 +389,7 @@ export const stopNotebook = async (
     Body: NotebookData;
   }>,
 ): Promise<Notebook> => {
-  const username = request.body.username || (await getUserName(fastify, request));
+  const username = request.body.username || (await getUserInfo(fastify, request)).userName;
   const name = generateNotebookNameFromUsername(username);
   const { notebookNamespace } = getNamespaces(fastify);
 

backend/src/utils/route-security.ts

@@ -1,5 +1,5 @@
 import { FastifyReply, FastifyRequest } from 'fastify';
-import { getOpenshiftUser, getUserName, usernameTranslate } from './userUtils';
+import { getOpenshiftUser, getUserInfo, usernameTranslate } from './userUtils';
 import { createCustomError } from './requestUtils';
 import { isUserAdmin } from './adminUtils';
 import { getNamespaces } from './notebookUtils';
@@ -18,9 +18,9 @@ const testAdmin = async (
   request: OauthFastifyRequest,
   needsAdmin: boolean,
 ): Promise<boolean> => {
-  const username = await getUserName(fastify, request);
+  const userInfo = await getUserInfo(fastify, request);
   const { dashboardNamespace } = getNamespaces(fastify);
-  const isAdmin = await isUserAdmin(fastify, username, dashboardNamespace);
+  const isAdmin = await isUserAdmin(fastify, userInfo.userName, dashboardNamespace);
   if (isAdmin) {
     // User is an admin, pass to caller that we can bypass some logic
     return true;
@@ -29,7 +29,7 @@ const testAdmin = async (
   if (needsAdmin) {
     // Not an admin, route needs one -- reject
     fastify.log.error(
-      `A Non-Admin User (${username}) made a request against an endpoint that requires an admin.`,
+      `A Non-Admin User (${userInfo}) made a request against an endpoint that requires an admin.`,
     );
     throw createCustomError(
       'Not Admin',
@@ -68,8 +68,8 @@ const requestSecurityGuard = async (
   name?: string,
 ): Promise<void> => {
   const { notebookNamespace, dashboardNamespace } = getNamespaces(fastify);
-  const username = await getUserName(fastify, request);
-  const translatedUsername = usernameTranslate(username);
+  const userInfo = await getUserInfo(fastify, request);
+  const translatedUsername = usernameTranslate(userInfo.userName);
   const isReadRequest = request.method.toLowerCase() === 'get';
 
   // Check to see if a request was made against one of our namespaces
@@ -208,11 +208,11 @@ const handleSecurityOnRouteData = async (
     }
 
     // Not getting a resource, mutating something that is not verify-able theirs -- log the user encase of malicious behaviour
-    const username = await getUserName(fastify, request);
+    const userInfo = await getUserInfo(fastify, request);
     const { dashboardNamespace } = getNamespaces(fastify);
-    const isAdmin = await isUserAdmin(fastify, username, dashboardNamespace);
+    const isAdmin = await isUserAdmin(fastify, userInfo.userName, dashboardNamespace);
     fastify.log.warn(
-      `${isAdmin ? 'Admin ' : ''}User ${username} interacted with a resource that was not secure.`,
+      `${isAdmin ? 'Admin ' : ''}User ${userInfo} interacted with a resource that was not secure.`,
     );
   }
 };

backend/src/utils/userUtils.ts

@@ -29,7 +29,7 @@ export type OpenShiftUser = {
     name: string;
     uid: string;
     resourceVersion: string;
-    annotations: {
+    annotations?: {
       'toolchain.dev.openshift.com/sso-user-id': string;
     };
   };
@@ -89,47 +89,27 @@ export const getUser = async (
   }
 };
 
-export const getUserName = async (
+export const getUserInfo = async (
   fastify: KubeFastifyInstance,
   request: FastifyRequest,
-): Promise<string> => {
+): Promise<{ userName: string; userID: string }> => {
   const { currentUser } = fastify.kube;
 
   try {
     const userOauth = await getUser(fastify, request);
-    return userOauth.metadata.name;
-  } catch (e) {
-    if (DEV_MODE) {
-      if (isImpersonating()) {
-        return DEV_IMPERSONATE_USER ?? '';
-      }
-      return (currentUser.username || currentUser.name).split('/')[0];
-    }
-    fastify.log.error(`Failed to retrieve username: ${errorHandler(e)}`);
-    const error = createCustomError(
-      'Unauthorized',
-      `Failed to retrieve username: ${errorHandler(e)}`,
-      (isHttpError(e) && e.statusCode) || 500,
-    );
-    throw error;
-  }
-};
-
-export const getUserId = async (
-  fastify: KubeFastifyInstance,
-  request: FastifyRequest,
-): Promise<string> => {
-  const { currentUser } = fastify.kube;
-
-  try {
-    const userOauth = await getUser(fastify, request);
-    return userOauth.metadata.annotations?.['toolchain.dev.openshift.com/sso-user-id'];
+    return {
+      userName: userOauth.metadata.name,
+      userID: userOauth.metadata.annotations?.['toolchain.dev.openshift.com/sso-user-id'],
+    };
   } catch (e) {
     if (DEV_MODE) {
       if (isImpersonating()) {
-        return DEV_IMPERSONATE_USER ?? '';
+        return { userName: DEV_IMPERSONATE_USER ?? '', userID: undefined };
       }
-      return (currentUser.username || currentUser.name).split('/')[0];
+      return {
+        userName: (currentUser.username || currentUser.name).split('/')[0],
+        userID: undefined,
+      };
     }
     fastify.log.error(`Failed to retrieve username: ${errorHandler(e)}`);
     const error = createCustomError(

frontend/src/concepts/analyticsTracking/useTrackUser.ts

@@ -29,9 +29,11 @@ export const useTrackUser = (
       return aId;
     };
 
-    computeAnonymousUserId().then((val) => {
-      setAnonymousId(val);
-    });
+    if (!userID) {
+      computeAnonymousUserId().then((val) => {
+        setAnonymousId(val);
+      });
+    }
     // compute anonymousId only once
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);