Merge pull request #3583 from uselagoon/purge-group-cache-when-deleted

fix: purge the cached id of the group when group is deleted
uselagoon · Nov 2, 2023 · f427908 · f427908
2 parents d7d382c + bf88f3a
commit f427908
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/services/api/src/clients/redisClient.ts b/services/api/src/clients/redisClient.ts
@@ -31,7 +31,7 @@ export const get = promisify(redisClient.get).bind(redisClient);
 const hgetall = promisify(redisClient.hgetall).bind(redisClient);
 const smembers = promisify(redisClient.smembers).bind(redisClient);
 const sadd = promisify(redisClient.sadd).bind(redisClient);
-const del = promisify(redisClient.del).bind(redisClient);
+export const del = promisify(redisClient.del).bind(redisClient);
 
 interface IUserResourceScope {
   resource: string;

diff --git a/services/api/src/models/group.ts b/services/api/src/models/group.ts
@@ -9,7 +9,7 @@ import { logger } from '../loggers/logger';
 // @ts-ignore
 import GroupRepresentation from 'keycloak-admin/lib/defs/groupRepresentation';
 import { User } from './user';
-import { saveRedisKeycloakCache, get, redisClient } from '../clients/redisClient';
+import { saveRedisKeycloakCache, get, del, redisClient } from '../clients/redisClient';
 import { Helpers as projectHelpers } from '../resources/project/helpers';
 import { sqlClientPool } from '../clients/sqlClient';
 import { log } from 'winston';
@@ -627,6 +627,11 @@ export const Group = (clients: {
 
   const deleteGroup = async (id: string): Promise<void> => {
     try {
+      const keycloakGroup = await keycloakAdminClient.groups.findOne({
+        id,
+        briefRepresentation: false,
+      });
+      await del(`cache:keycloak:group-id:${keycloakGroup.name}`);
       await keycloakAdminClient.groups.del({ id });
     } catch (err) {
       if (err.response.status && err.response.status === 404) {