@kumori/aurora-backend-handler 1.1.5 → 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,31 +38,33 @@ 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 currentUserInTenant = tenantToDelete.users.find((u) => u.id === userId);
-        console.log(`[handleUserEvent DEBUG] Processing missing tenant: ${key}`, {
-            tenantName: tenantToDelete.name,
-            tenantStatus: tenantToDelete.status,
-            currentUserInTenantStatus: currentUserInTenant?.status,
-            onlyOneUser: tenantToDelete.users.length === 1
-        });
-        if (currentUserInTenant?.status !== "rejected") {
+        const currentUserInTenant = tenantToDelete.users.find(
+          (u) => u.id === userId,
+        );
+        const isRejectedOrLeaving =
+          currentUserInTenant?.status === "rejected" ||
+          tenantToDelete.status === "leaving";
+
+        if (currentUserInTenant && !isRejectedOrLeaving) {
           const onlyOneUser = tenantToDelete.users.length === 1;
           const isSoloOwner =
-            onlyOneUser && tenantToDelete.users[0].role === tenantRole.OWNER;
-          
-          console.log(`[handleUserEvent DEBUG] Notification will be sent. isSoloOwner: ${isSoloOwner}`);
+            onlyOneUser &&
+            currentUserInTenant.role === tenantRole.OWNER &&
+            currentUserInTenant.id === userId;
 
           if (isSoloOwner) {
             eventHelper.tenant.publish.deleted(tenantToDelete);
@@ -72,7 +78,9 @@ export const handleUserEvent = ({
                 tenant: tenantToDelete.name,
               },
             };
-            eventHelper.notification.publish.creation(tenantDeletedNotification);
+            eventHelper.notification.publish.creation(
+              tenantDeletedNotification,
+            );
           } else {
             const userRemovedNotification: Notification = {
               type: "info",
@@ -114,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)) {
@@ -161,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.5",
+  "version": "1.1.7",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "scripts": {