@kumori/aurora-backend-handler 1.1.6 → 1.1.7

package/helpers/user-helper.ts

@@ -1,6 +1,10 @@
-import { Notification, Plan, Tenant, UserData, tenantRole } from "@kumori/aurora-interfaces";
-
-
+import {
+  Notification,
+  Plan,
+  Tenant,
+  UserData,
+  tenantRole,
+} from "@kumori/aurora-interfaces";
 
 interface HandleUserEventParams {
   eventData: any;
@@ -34,46 +38,62 @@ export const handleUserEvent = ({
   const userId = eventData.id.name;
   const userTenants = Object.keys(eventData.status.tenants);
   const deletedTenantKeys: string[] = [];
-  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" });
+  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" });
+        }
       }
-    }
-  });
+    },
+  );
   for (const key of tenantsMap.keys()) {
     if (!userTenants.includes(key)) {
       const tenantToDelete = tenantsMap.get(key);
       if (tenantToDelete) {
-        const onlyOneUser = tenantToDelete.users.length === 1;
-        const isSoloOwner = onlyOneUser && tenantToDelete.users[0].role === tenantRole.OWNER;
+        const currentUserInTenant = tenantToDelete.users.find(
+          (u) => u.id === userId,
+        );
+        const isRejectedOrLeaving =
+          currentUserInTenant?.status === "rejected" ||
+          tenantToDelete.status === "leaving";
 
-        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 (currentUserInTenant && !isRejectedOrLeaving) {
+          const onlyOneUser = tenantToDelete.users.length === 1;
+          const isSoloOwner =
+            onlyOneUser &&
+            currentUserInTenant.role === tenantRole.OWNER &&
+            currentUserInTenant.id === userId;
+
+          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);
       }
@@ -102,14 +122,14 @@ export const handleUserEvent = ({
           };
           userPlans.push(basicPlan);
         }
-      }
+      },
     );
   }
   const tempProviders: Record<string, string> = eventData.spec.providers || {};
   const providers: { name: string; email: string; password?: string }[] = [];
 
   const existingProvidersMap = new Map(
-    (currentUserData.provider || []).map((p) => [p.name, p])
+    (currentUserData.provider || []).map((p) => [p.name, p]),
   );
 
   for (const [providerName, providerId] of Object.entries(tempProviders)) {
@@ -149,18 +169,18 @@ export const handleUserEvent = ({
   };
 };
 export const handleUserOperationError = (): UserData => {
-    return {
-        id: "",
-        name: "",
-        surname: "",
-        provider: [],
-        notificationsEnabled: "",
-        organizations: [],
-        clusterTokens: [],
-        tokens: [],
-        tenants: [],
-        axebowPlan: "freemium",
-        companyName: "",
-        rol: "",
-    };
+  return {
+    id: "",
+    name: "",
+    surname: "",
+    provider: [],
+    notificationsEnabled: "",
+    organizations: [],
+    clusterTokens: [],
+    tokens: [],
+    tenants: [],
+    axebowPlan: "freemium",
+    companyName: "",
+    rol: "",
+  };
 };

package/package.json

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

package/websocket-manager.ts

@@ -192,7 +192,6 @@ 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
  */
@@ -640,18 +639,6 @@ 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) => {
@@ -863,12 +850,6 @@ 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);
@@ -971,17 +952,13 @@ 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;