review fixes

backend/src/db/migrations/20250502201443_invalidate-cache-status-superadmin.ts

@@ -1,21 +0,0 @@
-import { Knex } from "knex";
-
-import { TableName } from "../schemas";
-
-export async function up(knex: Knex): Promise<void> {
-  const hasColumn = await knex.schema.hasColumn(TableName.SuperAdmin, "invalidatingCache");
-  if (!hasColumn) {
-    await knex.schema.alterTable(TableName.SuperAdmin, (t) => {
-      t.boolean("invalidatingCache").notNullable().defaultTo(false);
-    });
-  }
-}
-
-export async function down(knex: Knex): Promise<void> {
-  const hasColumn = await knex.schema.hasColumn(TableName.SuperAdmin, "invalidatingCache");
-  if (hasColumn) {
-    await knex.schema.alterTable(TableName.SuperAdmin, (t) => {
-      t.dropColumn("invalidatingCache");
-    });
-  }
-}

backend/src/db/schemas/super-admin.ts

@@ -29,8 +29,7 @@ export const SuperAdminSchema = z.object({
   adminIdentityIds: z.string().array().nullable().optional(),
   encryptedMicrosoftTeamsAppId: zodBuffer.nullable().optional(),
   encryptedMicrosoftTeamsClientSecret: zodBuffer.nullable().optional(),
-  encryptedMicrosoftTeamsBotId: zodBuffer.nullable().optional(),
-  invalidatingCache: z.boolean().default(false)
+  encryptedMicrosoftTeamsBotId: zodBuffer.nullable().optional()
 });
 
 export type TSuperAdmin = z.infer<typeof SuperAdminSchema>;

backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-fns.ts

@@ -219,7 +219,7 @@ export const parseRotationErrorMessage = (err: unknown): string => {
   if (err instanceof AxiosError) {
     errorMessage += err?.response?.data
       ? JSON.stringify(err?.response?.data)
-      : err?.message ?? "An unknown error occurred.";
+      : (err?.message ?? "An unknown error occurred.");
   } else {
     errorMessage += (err as Error)?.message || "An unknown error occurred.";
   }

backend/src/ee/services/ssh/ssh-certificate-authority-service.ts

@@ -282,7 +282,7 @@ export const sshCertificateAuthorityServiceFactory = ({
 
     // set [keyId] depending on if [allowCustomKeyIds] is true or false
     const keyId = sshCertificateTemplate.allowCustomKeyIds
-      ? requestedKeyId ?? `${actor}-${actorId}`
+      ? (requestedKeyId ?? `${actor}-${actorId}`)
       : `${actor}-${actorId}`;
 
     const sshCaSecret = await sshCertificateAuthoritySecretDAL.findOne({ sshCaId: sshCertificateTemplate.sshCaId });
@@ -404,7 +404,7 @@ export const sshCertificateAuthorityServiceFactory = ({
 
     // set [keyId] depending on if [allowCustomKeyIds] is true or false
     const keyId = sshCertificateTemplate.allowCustomKeyIds
-      ? requestedKeyId ?? `${actor}-${actorId}`
+      ? (requestedKeyId ?? `${actor}-${actorId}`)
       : `${actor}-${actorId}`;
 
     const sshCaSecret = await sshCertificateAuthoritySecretDAL.findOne({ sshCaId: sshCertificateTemplate.sshCaId });

backend/src/services/auth/auth-login-service.ts

@@ -401,8 +401,8 @@ export const authLoginServiceFactory = ({
     }
 
     const shouldCheckMfa = selectedOrg.enforceMfa || user.isMfaEnabled;
-    const orgMfaMethod = selectedOrg.enforceMfa ? selectedOrg.selectedMfaMethod ?? MfaMethod.EMAIL : undefined;
-    const userMfaMethod = user.isMfaEnabled ? user.selectedMfaMethod ?? MfaMethod.EMAIL : undefined;
+    const orgMfaMethod = selectedOrg.enforceMfa ? (selectedOrg.selectedMfaMethod ?? MfaMethod.EMAIL) : undefined;
+    const userMfaMethod = user.isMfaEnabled ? (user.selectedMfaMethod ?? MfaMethod.EMAIL) : undefined;
     const mfaMethod = orgMfaMethod ?? userMfaMethod;
 
     if (shouldCheckMfa && (!decodedToken.isMfaVerified || decodedToken.mfaMethod !== mfaMethod)) {

backend/src/services/secret-sync/secret-sync-fns.ts

@@ -291,7 +291,7 @@ export const parseSyncErrorMessage = (err: unknown): string => {
   } else if (err instanceof AxiosError) {
     errorMessage = err?.response?.data
       ? JSON.stringify(err?.response?.data)
-      : err?.message ?? "An unknown error occurred.";
+      : (err?.message ?? "An unknown error occurred.");
   } else {
     errorMessage = (err as Error)?.message || "An unknown error occurred.";
   }

backend/src/services/super-admin/invalidate-cache-queue.ts

@@ -21,7 +21,7 @@ export const invalidateCacheQueueFactory = ({ queueService, keyStore }: TInvalid
     await queueService.queue(QueueName.InvalidateCache, QueueJobs.InvalidateCache, dto, {
       removeOnComplete: true,
       removeOnFail: true,
-      jobId: "invalidate-cache"
+      jobId: `invalidate-cache-${dto.data.type}`
     });
   };
 

backend/src/services/super-admin/super-admin-service.ts

@@ -176,8 +176,8 @@ export const superAdminServiceFactory = ({
 
       const canServerAdminAccessAfterApply =
         data.enabledLoginMethods.some((loginMethod) =>
-          loginMethodToAuthMethod[loginMethod as LoginMethod].some(
-            (authMethod) => superAdminUser.authMethods?.includes(authMethod)
+          loginMethodToAuthMethod[loginMethod as LoginMethod].some((authMethod) =>
+            superAdminUser.authMethods?.includes(authMethod)
           )
         ) ||
         isUserSamlAccessEnabled ||

frontend/src/pages/admin/OverviewPage/components/CachingPanel.tsx

@@ -1,14 +1,15 @@
+/* eslint-disable no-return-assign, consistent-return */
 import { useEffect, useRef, useState } from "react";
+import { faRotate } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import { createNotification } from "@app/components/notifications";
 import { Badge, Button, DeleteActionModal } from "@app/components/v2";
 import { useOrgPermission } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { useInvalidateCache } from "@app/hooks/api";
-import { CacheType } from "@app/hooks/api/admin/types";
 import { useGetInvalidatingCacheStatus } from "@app/hooks/api/admin/queries";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faRotate } from "@fortawesome/free-solid-svg-icons";
+import { CacheType } from "@app/hooks/api/admin/types";
 
 export const CachingPanel = () => {
   const { mutateAsync: invalidateCache } = useInvalidateCache();
@@ -17,6 +18,9 @@ export const CachingPanel = () => {
   const { membership } = useOrgPermission();
 
   const ignoreInitial = useRef(true);
+  const timeoutRef = useRef<NodeJS.Timeout | null>(null);
+  const pollingRef = useRef<NodeJS.Timeout | null>(null);
+
   const [type, setType] = useState<CacheType | null>(null);
   const [buttonsDisabled, setButtonsDisabled] = useState(false);
 
@@ -24,21 +28,14 @@ export const CachingPanel = () => {
     "invalidateCache"
   ] as const);
 
-  const success = () => {
-    createNotification({
-      text: `Successfully invalidated cache`,
-      type: "success"
-    });
-    setButtonsDisabled(false);
+  const disableButtonsTemporarily = () => {
+    setButtonsDisabled(true);
+    timeoutRef.current = setTimeout(() => setButtonsDisabled(false), 10000);
   };
 
-  const timeoutRef = useRef<NodeJS.Timeout | null>(null);
-  const disableButtons = () => {
-    // Enable buttons after 10 seconds, even if still invalidating
-    setButtonsDisabled(true);
-    timeoutRef.current = setTimeout(() => {
-      setButtonsDisabled(false);
-    }, 10000);
+  const success = () => {
+    createNotification({ text: "Successfully invalidated cache", type: "success" });
+    setButtonsDisabled(false);
   };
 
   const handleInvalidateCacheSubmit = async () => {
@@ -46,13 +43,8 @@ export const CachingPanel = () => {
 
     try {
       await invalidateCache({ type });
-
-      createNotification({
-        text: `Began invalidating ${type} cache`,
-        type: "success"
-      });
-
-      disableButtons();
+      createNotification({ text: `Began invalidating ${type} cache`, type: "success" });
+      disableButtonsTemporarily();
       handlePopUpClose("invalidateCache");
 
       if (!(await refetchInvalidatingStatus()).data) {
@@ -61,59 +53,45 @@ export const CachingPanel = () => {
       }
     } catch (err) {
       console.error(err);
-      createNotification({
-        text: `Failed to invalidate ${type} cache`,
-        type: "error"
-      });
+      createNotification({ text: `Failed to invalidate ${type} cache`, type: "error" });
     }
 
     setType(null);
   };
 
-  const pollingRef = useRef<NodeJS.Timeout | null>(null);
-
-  // Update the "invalidating cache" status
   useEffect(() => {
-    if (!isInvalidating) return;
-
-    if (pollingRef.current) clearInterval(pollingRef.current);
-    if (timeoutRef.current) clearTimeout(timeoutRef.current);
-
-    // Start polling every 3 seconds
-    pollingRef.current = setInterval(async () => {
-      try {
-        await refetchInvalidatingStatus();
-      } catch (err) {
-        console.error("Polling error:", err);
-      }
-    }, 3000);
-
-    disableButtons();
-
-    return () => {
-      if (pollingRef.current) clearInterval(pollingRef.current);
-      if (timeoutRef.current) clearTimeout(timeoutRef.current);
-    };
-  }, [isInvalidating]);
-
-  // Helper to ignore the initial useEffect calls for isInvalidating
-  useEffect(() => {
-    const timer = setTimeout(() => {
-      ignoreInitial.current = false;
-    }, 1000);
-
+    const timer = setTimeout(() => (ignoreInitial.current = false), 1000);
     return () => clearTimeout(timer);
   }, []);
 
+  useEffect(() => {
+    if (!isInvalidating) return;
+
+    clearInterval(pollingRef.current!);
+    clearTimeout(timeoutRef.current!);
+
+    pollingRef.current = setInterval(() => {
+      refetchInvalidatingStatus().catch((err) => console.error("Polling error:", err));
+    }, 3000);
+
+    disableButtonsTemporarily();
+
+    return () => {
+      clearInterval(pollingRef.current!);
+      clearTimeout(timeoutRef.current!);
+    };
+  }, [isInvalidating]);
+
   useEffect(() => {
     if (!ignoreInitial.current && isInvalidating === false) {
       success();
-
-      if (pollingRef.current) clearInterval(pollingRef.current);
-      if (timeoutRef.current) clearTimeout(timeoutRef.current);
+      clearInterval(pollingRef.current!);
+      clearTimeout(timeoutRef.current!);
     }
   }, [isInvalidating]);
 
+  const isAdmin = membership?.role === "admin";
+
   return (
     <>
       <div className="mb-6 flex flex-wrap items-end justify-between gap-4 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
@@ -142,35 +120,12 @@ export const CachingPanel = () => {
             setType(CacheType.SECRETS);
             handlePopUpOpen("invalidateCache");
           }}
-          isDisabled={Boolean(membership && membership.role !== "admin") || buttonsDisabled}
+          isDisabled={!isAdmin || buttonsDisabled}
         >
           Invalidate Secrets Cache
         </Button>
       </div>
 
-      {/* Uncomment this when we have more than one cache type */}
-      {/* <div className="mb-6 flex flex-wrap items-end justify-between gap-4 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
-        <div className="flex flex-col">
-          <span className="mb-2 text-xl font-semibold text-mineshaft-100">All Cache</span>
-          <span className="max-w-xl text-sm text-mineshaft-400">
-            All cache refers to the entirety of cached data throughout the system, including secrets
-            and miscellaneous information.
-          </span>
-        </div>
-
-        <Button
-          colorSchema="danger"
-          isLoading={isLoading}
-          onClick={() => {
-            setType(CacheType.ALL);
-            handlePopUpOpen("invalidateCache");
-          }}
-          isDisabled={Boolean(membership && membership.role !== "admin") || isLoading}
-        >
-          Invalidate All Cache
-        </Button>
-      </div> */}
-
       <DeleteActionModal
         isOpen={popUp.invalidateCache.isOpen}
         title={`Are you sure you want to invalidate ${type} cache?`}