@kumori/aurora-backend-handler 1.1.82 → 1.1.84

package/api/tenant-api-service.ts

@@ -1286,7 +1286,8 @@ export const deleteToken = async (
       queryParams,
       30000,
       "DELETE",
-      `${tenantName}/tokens/${tokenID}`
+      `${tenantName}/tokens/${tokenID}`,
+      "token"
     );
     return response;
   } catch (error) {

package/helpers/token-helper.ts

@@ -1,4 +1,4 @@
-import { ClusterToken, Token, UserData } from "@kumori/aurora-interfaces";
+import { ClusterToken, errors, Notification, Token, UserData } from "@kumori/aurora-interfaces";
 
 
 interface HandleTokenEventParams {
@@ -107,4 +107,53 @@ export const handleTokenOperationSuccess = ({
   return {
     token: tokenWithData,
   };
+};
+interface HandleTokenDeletionParams {
+  tokenId: string;
+  tokenMap: Map<string, Token>;
+  userData: UserData;
+}
+
+interface HandleTokenDeletionResult {
+  removed: boolean;
+  updatedUserTokens: Token[];
+  notification: Notification | null;
+}
+
+export const handleTokenDeletion = ({
+  tokenId,
+  tokenMap,
+  userData,
+}: HandleTokenDeletionParams): HandleTokenDeletionResult => {
+  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/helpers/user-helper.ts

@@ -5,6 +5,7 @@ import {
   Tenant,
   UserData,
   tenantRole,
+  UserStatus
 } from "@kumori/aurora-interfaces";
 
 interface HandleUserEventParams {
@@ -173,6 +174,6 @@ export const handleUserDelete = (): UserData => {
     axebowPlan: "freemium",
     companyName: "",
     rol: "",
-    status: "notlogged",
+    status: UserStatus.NOT_LOGGED,
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumori/aurora-backend-handler",
-  "version": "1.1.82",
+  "version": "1.1.84",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "scripts": {
@@ -11,7 +11,7 @@
     "glob": "^11.0.0"
   },
   "dependencies": {
-    "@kumori/aurora-interfaces": "^1.0.18",
+    "@kumori/aurora-interfaces": "^1.0.20",
     "@kumori/kumori-dsl-generator": "1.0.7",
     "@kumori/kumori-module-generator": "^1.1.6",
     "ts-node": "^10.9.2",

package/websocket-manager.ts

@@ -20,6 +20,7 @@ import {
   Token,
   User,
   UserData,
+  UserStatus
 } from "@kumori/aurora-interfaces";
 import { loadMarketplaceItemsForTenant } from "./api/marketplace-api-service";
 import { getReporting } from "./api/reporting-api-service";
@@ -69,6 +70,7 @@ import {
 } from "./helpers/plan-helper";
 import { handleRegistryEvent } from "./helpers/registry-helper";
 import {
+  handleTokenDeletion,
   handleTokenEvent,
   handleTokenOperationSuccess,
 } from "./helpers/token-helper";
@@ -349,7 +351,7 @@ export const initializeGlobalWebSocketClient = async (
             message.error?.code === "_unknown_user_" &&
             message.error?.content !== "Unknown proposed user."
           ) {
-            userData.status = "notlogged";
+            userData.status = UserStatus.UNKNOWN;
             user = new User(userData);
             eventHelper.user.publish.loaded(user);
           }
@@ -375,7 +377,7 @@ export const initializeGlobalWebSocketClient = async (
 
       wsConnection?.addEventListener("error", (error) => {
         console.error("Global WebSocket error:", error);
-        userData.status = "notlogged";
+        userData.status = UserStatus.NOT_LOGGED;
         user = new User(userData);
         eventHelper.user.publish.loaded(user);
         connectionPromise = null;
@@ -1509,10 +1511,27 @@ const handleOperationSuccess = (operation: PendingOperation, response: any) => {
       }
       break;
     case "token":
-      const tokenSuccessResult = handleTokenOperationSuccess({
-        responsePayload: response.payload,
-      });
-      tokenMap.set(tokenSuccessResult.token.name, tokenSuccessResult.token);
+      if (action === "DELETE") {
+        const deletedTokenId = entityName.split("/").pop();
+        if (deletedTokenId) {
+          const tokenDeletionResult = handleTokenDeletion({
+            tokenId: deletedTokenId,
+            tokenMap,
+            userData,
+          });
+          if (tokenDeletionResult.removed) {
+            userData.tokens = tokenDeletionResult.updatedUserTokens;
+            eventHelper.notification.publish.creation(
+              tokenDeletionResult.notification!,
+            );
+          }
+        }
+      } else {
+        const tokenSuccessResult = handleTokenOperationSuccess({
+          responsePayload: response.payload,
+        });
+        tokenMap.set(tokenSuccessResult.token.name, tokenSuccessResult.token);
+      }
       break;
     case "user":
       if (action === "DELETE") {
@@ -1893,24 +1912,16 @@ 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,
+    });
+    if (tokenDeletionResult.removed) {
+      userData.tokens = tokenDeletionResult.updatedUserTokens;
+      eventHelper.notification.publish.creation(
+        tokenDeletionResult.notification!,
+      );
     }
   }
   rebuildHierarchy();