@kumori/aurora-backend-handler 1.1.83 → 1.1.85

package/helpers/token-helper.ts

@@ -1,10 +1,11 @@
-import { ClusterToken, Token, UserData } from "@kumori/aurora-interfaces";
+import { ClusterToken, errors, Notification, Token, UserData } from "@kumori/aurora-interfaces";
 
 
 interface HandleTokenEventParams {
   eventData: any;
   tokenMap: Map<string, Token>;
   userData: UserData;
+  deletedTokenIds: Set<string>;
 }
 
 interface HandleTokenEventResult {
@@ -24,10 +25,26 @@ export const handleTokenEvent = ({
   eventData,
   tokenMap,
   userData,
+  deletedTokenIds,
 }: HandleTokenEventParams): HandleTokenEventResult => {
   const tokenParentKind = eventData.id.parent?.kind;
   const tokenId = eventData.id.name;
 
+  if (tokenParentKind === "user" && deletedTokenIds.has(tokenId)) {
+    // A tombstoned token (already explicitly deleted by the user) must
+    // never be resurrected by a stale/out-of-order "token" event -
+    // e.g. one reflecting backend state that hasn't caught up with the
+    // deletion yet.
+    return {
+      isUserToken: false,
+      isClusterToken: false,
+      userToken: null,
+      clusterToken: null,
+      updatedUserTokens: userData.tokens,
+      tokenId,
+    };
+  }
+
   if (tokenParentKind === "user") {
     const tokenInMap = tokenMap.get(tokenId);
     
@@ -107,4 +124,56 @@ export const handleTokenOperationSuccess = ({
   return {
     token: tokenWithData,
   };
+};
+interface HandleTokenDeletionParams {
+  tokenId: string;
+  tokenMap: Map<string, Token>;
+  userData: UserData;
+  deletedTokenIds: Set<string>;
+}
+
+interface HandleTokenDeletionResult {
+  removed: boolean;
+  updatedUserTokens: Token[];
+  notification: Notification | null;
+}
+
+export const handleTokenDeletion = ({
+  tokenId,
+  tokenMap,
+  userData,
+  deletedTokenIds,
+}: HandleTokenDeletionParams): HandleTokenDeletionResult => {
+  deletedTokenIds.add(tokenId);
+  const tokenIndex = userData.tokens.findIndex((t) => t.name === tokenId);
+  if (tokenIndex === -1) {
+    return {
+      removed: false,
+      updatedUserTokens: userData.tokens,
+      notification: null,
+    };
+  }
+
+  const deletedToken = userData.tokens[tokenIndex];
+  const updatedUserTokens = [...userData.tokens];
+  updatedUserTokens.splice(tokenIndex, 1);
+  tokenMap.delete(tokenId);
+
+  const notification: Notification = {
+    type: "success",
+    subtype: errors.user.tokenDeleted.subtype,
+    date: Date.now().toString(),
+    status: "unread",
+    callToAction: false,
+    data: {
+      tokenName: deletedToken.name,
+      tenant: deletedToken.tenant,
+    },
+  };
+
+  return {
+    removed: true,
+    updatedUserTokens,
+    notification,
+  };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumori/aurora-backend-handler",
-  "version": "1.1.83",
+  "version": "1.1.85",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "scripts": {

package/websocket-manager.ts

@@ -70,6 +70,7 @@ import {
 } from "./helpers/plan-helper";
 import { handleRegistryEvent } from "./helpers/registry-helper";
 import {
+  handleTokenDeletion,
   handleTokenEvent,
   handleTokenOperationSuccess,
 } from "./helpers/token-helper";
@@ -173,6 +174,7 @@ let accountsMap = new Map<string, Account>();
 let revisionsMap = new Map<string, Revision>();
 let roleMap = new Map<string, Role[]>();
 let tokenMap = new Map<string, Token>();
+let deletedTokenIds = new Set<string>();
 let platformInfo: Platform | null = null;
 let isPlatformInfoLoading = false;
 let isPlatformInfoLoaded = false;
@@ -638,7 +640,11 @@ const rebuildHierarchy = () => {
     notificationsEnabled: preservedUserData.notificationsEnabled,
     organizations: Array.from(organizationsMap.values()),
     clusterTokens: Array.from(clusterTokensMap.values()),
-    tokens: tokenMap.size > 0 ? (preservedUserData.tokens || []).filter(t => tokenMap.has(t.name)) : (preservedUserData.tokens || []),
+    tokens: (
+      tokenMap.size > 0
+        ? (preservedUserData.tokens || []).filter(t => tokenMap.has(t.name))
+        : (preservedUserData.tokens || [])
+    ).filter(t => !deletedTokenIds.has(t.name)),
     tenants: Array.from(tenantsMap.values()),
     axebowPlan: preservedUserData.axebowPlan,
     companyName: preservedUserData.companyName,
@@ -1128,6 +1134,7 @@ const handleEvent = async (message: WSMessage) => {
           eventData,
           tokenMap,
           userData,
+          deletedTokenIds,
         });
 
         if (tokenResult.isUserToken) {
@@ -1513,12 +1520,17 @@ const handleOperationSuccess = (operation: PendingOperation, response: any) => {
       if (action === "DELETE") {
         const deletedTokenId = entityName.split("/").pop();
         if (deletedTokenId) {
-          tokenMap.delete(deletedTokenId);
-          const tokenIndex = userData.tokens.findIndex(
-            (t) => t.name === deletedTokenId,
-          );
-          if (tokenIndex !== -1) {
-            userData.tokens.splice(tokenIndex, 1);
+          const tokenDeletionResult = handleTokenDeletion({
+            tokenId: deletedTokenId,
+            tokenMap,
+            userData,
+            deletedTokenIds,
+          });
+          if (tokenDeletionResult.removed) {
+            userData.tokens = tokenDeletionResult.updatedUserTokens;
+            eventHelper.notification.publish.creation(
+              tokenDeletionResult.notification!,
+            );
           }
         }
       } else {
@@ -1907,24 +1919,17 @@ const handleDeleteEvent = async (message: WSMessage) => {
     }
   }
   if (keyParts.token && keyParts.user) {
-    const tokenId = keyParts.token;
-    const tokenIndex = userData.tokens.findIndex((t) => t.name === tokenId);
-    if (tokenIndex !== -1) {
-      const deletedToken = userData.tokens[tokenIndex];
-      userData.tokens.splice(tokenIndex, 1);
-      tokenMap.delete(tokenId);
-      const tokenNotification: Notification = {
-        type: "success",
-        subtype: errors.user.tokenDeleted.subtype,
-        date: Date.now().toString(),
-        status: "unread",
-        callToAction: false,
-        data: {
-          tokenName: deletedToken.name,
-          tenant: deletedToken.tenant,
-        },
-      };
-      eventHelper.notification.publish.creation(tokenNotification);
+    const tokenDeletionResult = handleTokenDeletion({
+      tokenId: keyParts.token,
+      tokenMap,
+      userData,
+      deletedTokenIds,
+    });
+    if (tokenDeletionResult.removed) {
+      userData.tokens = tokenDeletionResult.updatedUserTokens;
+      eventHelper.notification.publish.creation(
+        tokenDeletionResult.notification!,
+      );
     }
   }
   rebuildHierarchy();
@@ -2059,7 +2064,8 @@ export const updateUserComplete = (updatedUserData: UserData): User => {
     );
     const mergedTokens = [...(updatedUserData.tokens || []), ...localOnlyTokens]
       .filter((t, index, arr) => arr.findIndex(x => x.name === t.name) === index)
-      .filter(t => tokenMap.size === 0 || tokenMap.has(t.name));
+      .filter(t => tokenMap.size === 0 || tokenMap.has(t.name))
+      .filter(t => !deletedTokenIds.has(t.name));
 
     userData = {
       id: updatedUserData.id || userData.id,