@kumori/aurora-backend-handler 1.1.4 → 1.1.6

package/helpers/user-helper.ts

@@ -46,38 +46,34 @@ export const handleUserEvent = ({
     if (!userTenants.includes(key)) {
       const tenantToDelete = tenantsMap.get(key);
       if (tenantToDelete) {
-        const currentUserInTenant = tenantToDelete.users.find((u) => u.id === userId);
-        if (currentUserInTenant?.status !== "rejected") {
-          const onlyOneUser = tenantToDelete.users.length === 1;
-          const isSoloOwner =
-            onlyOneUser && tenantToDelete.users[0].role === tenantRole.OWNER;
+        const onlyOneUser = tenantToDelete.users.length === 1;
+        const isSoloOwner = onlyOneUser && tenantToDelete.users[0].role === tenantRole.OWNER;
 
-          if (isSoloOwner) {
-            eventHelper.tenant.publish.deleted(tenantToDelete);
-            const tenantDeletedNotification: Notification = {
-              type: "success",
-              subtype: "tenant-deleted",
-              date: Date.now().toString(),
-              callToAction: false,
-              status: "unread",
-              data: {
-                tenant: tenantToDelete.name,
-              },
-            };
-            eventHelper.notification.publish.creation(tenantDeletedNotification);
-          } else {
-            const userRemovedNotification: Notification = {
-              type: "info",
-              subtype: "user-removed-from-tenant",
-              date: Date.now().toString(),
-              callToAction: false,
-              status: "unread",
-              data: {
-                tenant: tenantToDelete.name,
-              },
-            };
-            eventHelper.notification.publish.creation(userRemovedNotification);
-          }
+        if (isSoloOwner) {
+          eventHelper.tenant.publish.deleted(tenantToDelete);
+          const tenantDeletedNotification: Notification = {
+            type: "success",
+            subtype: "tenant-deleted",
+            date: Date.now().toString(),
+            callToAction: false,
+            status: "unread",
+            data: {
+              tenant: tenantToDelete.name,
+            },
+          };
+          eventHelper.notification.publish.creation(tenantDeletedNotification);
+        } else {
+          const userRemovedNotification: Notification = {
+            type: "info",
+            subtype: "user-removed-from-tenant",
+            date: Date.now().toString(),
+            callToAction: false,
+            status: "unread",
+            data: {
+              tenant: tenantToDelete.name,
+            },
+          };
+          eventHelper.notification.publish.creation(userRemovedNotification);
         }
         deletedTenantKeys.push(key);
       }

package/package.json

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

package/websocket-manager.ts

@@ -192,6 +192,7 @@ const REPORTING_ITERATIONS = 5;
 const REPORTING_INTERVAL = 1000;
 let hasLoadedReportingOnce = false;
 let recentlyUpdatedServices = new Map<string, Service>();
+let pendingTenantStatus = new Map<string, string>();
 /**
  * Helper function to safely stringify error objects
  */
@@ -639,6 +640,18 @@ const handleEvent = async (message: WSMessage) => {
           parseKeyPath,
           eventHelper,
         });
+        Object.entries(eventData.status.tenants).forEach(
+          ([tenantId, tenantInfo]: [string, any]) => {
+            if (tenantInfo.status === "rejected") {
+              const tenant = tenantsMap.get(tenantId);
+              if (tenant) {
+                tenantsMap.set(tenantId, { ...tenant, status: "leaving" });
+              } else {
+                pendingTenantStatus.set(tenantId, "leaving");
+              }
+            }
+          },
+        );
         userData = userEventResult.userData;
         tempProviders = userEventResult.tempProviders;
         userEventResult.deletedTenantKeys.forEach((key) => {
@@ -850,6 +863,12 @@ const handleEvent = async (message: WSMessage) => {
         }
 
         tenantsMap.set(entityId, newTenant);
+        if (pendingTenantStatus.has(entityId)) {
+          const pendingStatus = pendingTenantStatus.get(entityId)!;
+          tenantsMap.set(entityId, { ...newTenant, status: pendingStatus });
+          pendingTenantStatus.delete(entityId);
+        }
+
         loadMarketplaceItemsForTenant(entityId, "") //TODO Move to helper
           .then((items) => {
             const tenant = tenantsMap.get(entityId);
@@ -952,13 +971,17 @@ const handleEvent = async (message: WSMessage) => {
         break;
 
       case "ca":
-        const caResult = handleCAEvent(eventData, parentParts, tenantsMap, hasRequestingServices,);
+        const caResult = handleCAEvent(
+          eventData,
+          parentParts,
+          tenantsMap,
+          hasRequestingServices,
+        );
         processResourceResult(
           caResult,
           tenantsMap,
           pendingDomains,
           eventHelper,
-          
         );
         break;