* fix: Pull user Features from DB/Cache call instead of Cache only on User Feature Management (#5741)

* * fix user feature management to not read from cache only - instead pull from DB if cached value doesn't exist.

* * remove unused code.

* * fix update flags from set to createMany.

* * Add auth checks, remove unused solo add function.

* Update lib/cache/userFeatureFlagsCache.ts

Co-authored-by: Clément JANIN <clement.janin@cds-snc.ca>

* * Remove priv check on cache - it fails on putting users perms into cache when loading.

* * swap set to delete for remove flag.

---------

Co-authored-by: Clément JANIN <clement.janin@cds-snc.ca>

Author: ShadeWyrm

app/(gcforms)/[locale]/(app administration)/admin/(with nav)/accounts/[id]/manage-user-features/page.tsx

@@ -5,7 +5,7 @@ import { getUser } from "@lib/users";
 import { UserFeaturesList } from "./components/server/UserFeaturesList";
 import { AddUserFeatureModal } from "./components/client/AddUserFeatureModal";
 import { checkAll } from "@lib/cache/flags";
-import { featureFlagsCheck } from "@lib/cache/userFeatureFlagsCache";
+import { getUserFeatureFlags } from "@lib/userFeatureFlags";
 
 export default AuthenticatedPage<{ id: string }>(
   [authorization.canViewAllUsers, authorization.canAccessFlags],
@@ -17,7 +17,7 @@ export default AuthenticatedPage<{ id: string }>(
     const formUser = await getUser(id);
 
     const flags = await checkAll();
-    const userFlags = await featureFlagsCheck(formUser.id);
+    const userFlags = await getUserFeatureFlags(formUser.id);
 
     return (
       <div>

lib/cache/userFeatureFlagsCache.ts

@@ -1,6 +1,5 @@
 import { logMessage } from "@lib/logger";
 import { getRedisInstance } from "../integration/redisConnector";
-import { removeUserFeatureFlag, addUserFeatureFlag } from "@lib/userFeatureFlags";
 
 // If NODE_ENV is in test mode (Jest Tests) do not use the cache
 const cacheAvailable: boolean = process.env.APP_ENV !== "test" && Boolean(process.env.REDIS_URL);
@@ -68,29 +67,3 @@ export const featureFlagsGetAll = async (): Promise<{ userID: string; flag: stri
     throw new Error("Could not connect to cache");
   }
 };
-
-// Remove a feature flag for a user (hit the DB and then update the cache)
-export const featureFlagsRemove = async (userID: string, flag: string): Promise<void> => {
-  if (!cacheAvailable) return;
-
-  try {
-    await removeUserFeatureFlag(userID, flag);
-    await featureFlagsPut(userID, (await featureFlagsCheck(userID)) || []);
-  } catch (e) {
-    logMessage.error(e as Error);
-    throw new Error("Could not update feature flags in cache");
-  }
-};
-
-// Add a feature flag for a user (hit the DB and then update the cache)
-export const featureFlagsAdd = async (userID: string, flag: string): Promise<void> => {
-  if (!cacheAvailable) return;
-
-  try {
-    await addUserFeatureFlag(userID, flag);
-    await featureFlagsPut(userID, (await featureFlagsCheck(userID)) || []);
-  } catch (e) {
-    logMessage.error(e as Error);
-    throw new Error("Could not update feature flags in cache");
-  }
-};

lib/userFeatureFlags.ts

@@ -1,3 +1,4 @@
+import { authorization } from "@lib/privileges";
 import { prisma } from "@lib/integration/prismaConnector";
 import { featureFlagsCheck, featureFlagsPut } from "@lib/cache/userFeatureFlagsCache";
 
@@ -33,6 +34,9 @@ export const getUserFeatureFlags = async (userId: string): Promise<string[]> =>
 
 // Remove a specific feature flag for a user
 export const removeUserFeatureFlag = async (userId: string, flag: string): Promise<void> => {
+  await authorization.canManageFlags();
+  await authorization.canManageUser(userId);
+
   try {
     // Get current flags
     const currentFlags = await getUserFeatureFlags(userId);
@@ -42,11 +46,11 @@ export const removeUserFeatureFlag = async (userId: string, flag: string): Promi
 
     if (updatedFlags.length > 0) {
       // Update the database with the remaining features
-      await prisma.user.update({
-        where: { id: userId },
-        data: {
-          features: {
-            set: updatedFlags.map((feature) => ({ userId_feature: { userId, feature } })),
+      await prisma.userFeature.delete({
+        where: {
+          userId_feature: {
+            userId,
+            feature: flag,
           },
         },
       });
@@ -64,36 +68,11 @@ export const removeUserFeatureFlag = async (userId: string, flag: string): Promi
   }
 };
 
-// Add a specific feature flag for a user
-export const addUserFeatureFlag = async (userId: string, flag: string): Promise<void> => {
-  try {
-    // Get current flags
-    const currentFlags = await getUserFeatureFlags(userId);
-
-    // Add the new flag if it doesn't already exist
-    if (!currentFlags.includes(flag)) {
-      const updatedFlags = [...currentFlags, flag];
-
-      // Update the database
-      await prisma.user.update({
-        where: { id: userId },
-        data: {
-          features: {
-            set: updatedFlags.map((feature) => ({ userId_feature: { userId, feature } })),
-          },
-        },
-      });
-
-      // Update the cache
-      await featureFlagsPut(userId, updatedFlags);
-    }
-  } catch (error) {
-    throw new Error(`Failed to add feature flag: ${error}`);
-  }
-};
-
 // Add multiple feature flags for a user
 export const addUserFeatureFlags = async (userId: string, flags: string[]): Promise<void> => {
+  await authorization.canManageFlags();
+  await authorization.canManageUser(userId);
+
   try {
     // Get current flags
     const currentFlags = await getUserFeatureFlags(userId);
@@ -105,13 +84,9 @@ export const addUserFeatureFlags = async (userId: string, flags: string[]): Prom
       const updatedFlags = [...currentFlags, ...newFlags];
 
       // Update the database
-      await prisma.user.update({
-        where: { id: userId },
-        data: {
-          features: {
-            set: updatedFlags.map((feature) => ({ userId_feature: { userId, feature } })),
-          },
-        },
+      await prisma.userFeature.createMany({
+        data: newFlags.map((feature) => ({ userId, feature })),
+        skipDuplicates: true, // avoids error if the (userId, feature) already exists
       });
 
       // Update the cache