@kumori/aurora-backend-handler 1.1.84 → 1.1.85

package/helpers/token-helper.ts

@@ -5,6 +5,7 @@ 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);
     
@@ -112,6 +129,7 @@ interface HandleTokenDeletionParams {
   tokenId: string;
   tokenMap: Map<string, Token>;
   userData: UserData;
+  deletedTokenIds: Set<string>;
 }
 
 interface HandleTokenDeletionResult {
@@ -124,7 +142,9 @@ 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 {

package/package.json

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

package/websocket-manager.ts

@@ -174,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;
@@ -639,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,
@@ -1129,6 +1134,7 @@ const handleEvent = async (message: WSMessage) => {
           eventData,
           tokenMap,
           userData,
+          deletedTokenIds,
         });
 
         if (tokenResult.isUserToken) {
@@ -1518,6 +1524,7 @@ const handleOperationSuccess = (operation: PendingOperation, response: any) => {
             tokenId: deletedTokenId,
             tokenMap,
             userData,
+            deletedTokenIds,
           });
           if (tokenDeletionResult.removed) {
             userData.tokens = tokenDeletionResult.updatedUserTokens;
@@ -1916,6 +1923,7 @@ const handleDeleteEvent = async (message: WSMessage) => {
       tokenId: keyParts.token,
       tokenMap,
       userData,
+      deletedTokenIds,
     });
     if (tokenDeletionResult.removed) {
       userData.tokens = tokenDeletionResult.updatedUserTokens;
@@ -2056,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,