@kumori/aurora-backend-handler 1.1.21 → 1.1.23

package/package.json

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

package/websocket-manager.ts

@@ -599,7 +599,7 @@ const rebuildHierarchy = () => {
     notificationsEnabled: preservedUserData.notificationsEnabled,
     organizations: Array.from(organizationsMap.values()),
     clusterTokens: Array.from(clusterTokensMap.values()),
-    tokens: preservedUserData.tokens || [],
+    tokens: tokenMap.size > 0 ? (preservedUserData.tokens || []).filter(t => tokenMap.has(t.name)) : (preservedUserData.tokens || []),
     tenants: Array.from(tenantsMap.values()),
     axebowPlan: preservedUserData.axebowPlan,
     companyName: preservedUserData.companyName,
@@ -1823,7 +1823,7 @@ const handleDeleteEvent = async (message: WSMessage) => {
     if (tokenIndex !== -1) {
       const deletedToken = userData.tokens[tokenIndex];
       userData.tokens.splice(tokenIndex, 1);
-
+      tokenMap.delete(tokenId);
       const tokenNotification: Notification = {
         type: "success",
         subtype: "token-deleted",
@@ -1966,10 +1966,9 @@ export const updateUserComplete = (updatedUserData: UserData): User => {
     const localOnlyTokens = (userData.tokens || []).filter(
       (t) => !incomingTokenNames.has(t.name)
     );
-    const mergedTokens = [
-      ...(updatedUserData.tokens || []),
-      ...localOnlyTokens,
-    ];
+    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));
 
     userData = {
       id: updatedUserData.id || userData.id,