@kumori/aurora-backend-handler 1.0.99 → 1.1.0

package/api/deploy-service-helper.ts

@@ -436,7 +436,6 @@ export function handleParametersToGenerateData(
  * @returns A ServiceSpecForm object with the data of the service.
  */
 export function transformServiceToForm(service: Service): ServiceSpecForm {
-  console.log('--- TRANSFORM SERVICE TO FORM ---', service.name);
   return {
     tenantId: service.tenant,
     accountId: service.account,
@@ -513,15 +512,12 @@ export async function generateServiceSpec(
     resources: componentResources,
   } = handleParametersToGenerateData(formParams, formResources);
 
-  console.log('--- GENERATE SERVICE SPEC ---', form.serviceId);
-  console.log('Channels from Form:', JSON.stringify(form.channels));
-
   const serverConfigDomainResources: ArtifactConfigResource[] = form.channels
     .filter((channel) => channel.protocol === "HTTPS" && channel.isPublic)
     .map((channel) => ({ domain: { name: `${channel.channelName}_domain` } }));
 
   const hasDefaultCertChannel = form.channels.some(
-    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource
+    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource,
   );
   if (hasDefaultCertChannel) {
     serverConfigDomainResources.push({
@@ -531,23 +527,17 @@ export async function generateServiceSpec(
 
   const customCertResources: ArtifactConfigResource[] = form.channels
     .filter(
-      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource
+      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource,
     )
     .map((ch) => ({ certificate: { name: `${ch.channelName}_cert` } }));
 
   const customCaResources: ArtifactConfigResource[] = form.channels
     .filter(
       (ch) =>
-        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource
+        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource,
     )
     .map((ch) => ({ ca: { name: `${ch.channelName}_ca` } }));
 
-  console.log('Generated Resources Spec:', {
-    serverConfigDomainResources,
-    customCertResources,
-    customCaResources
-  });
-
   const serviceConfigPortResources: ArtifactConfigResource[] = form.channels
     .filter((channel) => channel.protocol === "TCP" && channel.isPublic)
     .map((channel) => ({ port: { name: `${channel.channelName}_port` } }));
@@ -891,7 +881,7 @@ export async function generateServiceSpec(
     }));
 
   const hasDefaultCertChannelDeployment = form.channels.some(
-    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource
+    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource,
   );
   if (hasDefaultCertChannelDeployment) {
     deploymentConfigDomain.push({
@@ -904,7 +894,7 @@ export async function generateServiceSpec(
 
   const customCertDeploymentResources: DeploymentResource[] = form.channels
     .filter(
-      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource
+      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource,
     )
     .map((ch) => ({
       certificate: {
@@ -916,7 +906,7 @@ export async function generateServiceSpec(
   const customCaDeploymentResources: DeploymentResource[] = form.channels
     .filter(
       (ch) =>
-        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource
+        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource,
     )
     .map((ch) => ({
       ca: {
@@ -1145,7 +1135,7 @@ async function generateServiceSpecDSL(
     .map((channel) => ({ domain: { name: `${channel.channelName}_domain` } }));
 
   const hasDefaultCertChannel = form.channels.some(
-    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource
+    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource,
   );
   if (hasDefaultCertChannel) {
     serverConfigDomainResources.push({
@@ -1155,23 +1145,17 @@ async function generateServiceSpecDSL(
 
   const customCertResources: ArtifactConfigResource[] = form.channels
     .filter(
-      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource
+      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource,
     )
     .map((ch) => ({ certificate: { name: `${ch.channelName}_cert` } }));
 
   const customCaResources: ArtifactConfigResource[] = form.channels
     .filter(
       (ch) =>
-        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource
+        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource,
     )
     .map((ch) => ({ ca: { name: `${ch.channelName}_ca` } }));
 
-  console.log('Generated Resources Config:', {
-    serverConfigDomainResources,
-    customCertResources,
-    customCaResources
-  });
-
   const serviceConfigPortResources: ArtifactConfigResource[] = form.channels
     .filter((channel) => channel.protocol === "TCP" && channel.isPublic)
     .map((channel) => ({ port: { name: `${channel.channelName}_port` } }));
@@ -1458,7 +1442,7 @@ async function generateServiceSpecDSL(
     }));
 
   const hasDefaultCertChannelDeployment = form.channels.some(
-    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource
+    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource,
   );
   if (hasDefaultCertChannelDeployment) {
     deploymentConfigDomain.push({
@@ -1471,7 +1455,7 @@ async function generateServiceSpecDSL(
 
   const customCertDeploymentResources: DeploymentResource[] = form.channels
     .filter(
-      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource
+      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource,
     )
     .map((ch) => ({
       certificate: {
@@ -1483,7 +1467,7 @@ async function generateServiceSpecDSL(
   const customCaDeploymentResources: DeploymentResource[] = form.channels
     .filter(
       (ch) =>
-        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource
+        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource,
     )
     .map((ch) => ({
       ca: {
@@ -1492,12 +1476,6 @@ async function generateServiceSpecDSL(
       },
     }));
 
-  console.log('Generated Deployment Resources:', {
-    deploymentConfigDomain,
-    customCertDeploymentResources,
-    customCaDeploymentResources
-  });
-
   const deploymentConfigPort: DeploymentResource[] = form.channels
     .filter((channel) => channel.protocol === "TCP" && channel.isPublic)
     .map((channel) => ({
@@ -1718,7 +1696,6 @@ export async function deployServiceHelper(
     serviceForm,
     marketplaceItem,
   );
-  console.log('Final generated ServiceSpecDSL:', JSON.stringify(serviceSpecDSL, null, 2));
   CUEBundle = buildServiceDeploymentModule(serviceSpecDSL);
 
   // if (marketplaceItem?.package) {

package/api/tenant-api-service.ts

@@ -1120,7 +1120,7 @@ export const acceptInvite = async (tenant: string, security: string) => {
   }
 };
 
-export const rejectInvite = async (tenant: string, security: string) => {
+export const rejectInvite = async (tenant: string, security: string, leave: boolean) => {
   try {
     await initializeGlobalWebSocketClient(security);
     const queryParams = { tenant: tenant };
@@ -1131,7 +1131,21 @@ export const rejectInvite = async (tenant: string, security: string) => {
       "DELETE",
       `${tenant}/reject`
     );
-    const tenantInviteRejectedNotification: Notification = {
+    if(leave){
+      const tenantInviteRejectedNotification: Notification = {
+      type: "success",
+      subtype: "tenant-leave",
+      date: Date.now().toString(),
+      status: "unread",
+      callToAction: false,
+      data: {
+        tenant: tenant,
+      },
+    };
+    eventHelper.notification.publish.creation(tenantInviteRejectedNotification);
+    }
+    else{
+      const tenantInviteRejectedNotification: Notification = {
       type: "success",
       subtype: "tenant-invite-rejected",
       date: Date.now().toString(),
@@ -1142,6 +1156,8 @@ export const rejectInvite = async (tenant: string, security: string) => {
       },
     };
     eventHelper.notification.publish.creation(tenantInviteRejectedNotification);
+    }
+    
     return response;
   } catch (error) {
     console.error("Error rejecting tenant invite:", {

package/backend-handler.ts

@@ -352,8 +352,8 @@ export class BackendHandler {
     this.unsubscribeFunctions.push(() =>
       eventHelper.tenant.unsubscribe.acceptInviteError(inviteAcceptErrorCb)
     );
-    const rejectInviteCb = (payload: { tenant: string }) => {
-      rejectInvite(payload.tenant, token);
+    const rejectInviteCb = (payload: { tenant: string, leave: boolean }) => {
+      rejectInvite(payload.tenant, token, payload.leave);
     }
     eventHelper.tenant.subscribe.rejectInvite(rejectInviteCb);
     this.unsubscribeFunctions.push(() =>

package/event-helper.ts

@@ -1,3 +1,4 @@
+import { loadUser } from './api/user-api-service';
 import { Account, Environment, Link, MarketplaceItem, MarketplaceService, Organization, PlanProvider, Registry, Tenant, tenantRole, User, Service, Notification, Resource } from "@kumori/aurora-interfaces";
 import { EventNames } from "./event-names";
 export interface RegistryUpdatePayload {
@@ -63,7 +64,7 @@ export class EventHelper {
         updateInvite: this.createEvent<{ tenant: string; user: string; role: tenantRole; }>(EventNames.UpdateInvite).publish,
         inviteUpdated: this.createEvent<{ tenant: string; user: string; role: tenantRole; }>(EventNames.InviteUpdated).publish,
         inviteUpdateError: this.createEvent<{ tenant: string; user: string;  role: tenantRole; }>(EventNames.InviteUpdateError).publish,
-        rejectInvite: this.createEvent<{ tenant: string; }>(EventNames.RejectInvite).publish,
+        rejectInvite: this.createEvent<{ tenant: string; leave: boolean }>(EventNames.RejectInvite).publish,
         inviteRejected: this.createEvent<{ user: string; tenant: string; }>(EventNames.InviteRejected).publish,
         inviteRejectError: this.createEvent<{ tenant: string; }>(EventNames.InviteRejectError).publish,
         createToken: this.createEvent<{ tenant: string; expiration: string; description: string }>(EventNames.CreateToken).publish,
@@ -104,7 +105,7 @@ export class EventHelper {
         updateInvite: this.createEvent<{ tenant: string; user: string; role: tenantRole; }>(EventNames.UpdateInvite).subscribe,
         inviteUpdated: this.createEvent<{ tenant: string; user: string; role: tenantRole; }>(EventNames.InviteUpdated).subscribe,
         inviteUpdateError: this.createEvent<{ tenant: string; user: string;  role: tenantRole; }>(EventNames.InviteUpdateError).subscribe,
-        rejectInvite: this.createEvent<{ tenant: string; }>(EventNames.RejectInvite).subscribe,
+        rejectInvite: this.createEvent<{ tenant: string; leave: boolean }>(EventNames.RejectInvite).subscribe,
         inviteRejected: this.createEvent<{ user: string; tenant: string; }>(EventNames.InviteRejected).subscribe,
         inviteRejectError: this.createEvent<{ tenant: string; }>(EventNames.InviteRejectError).subscribe,
         createToken: this.createEvent<{ tenant: string; expiration: string; description: string }>(EventNames.CreateToken).subscribe,
@@ -145,7 +146,7 @@ export class EventHelper {
         updateInvite: this.createEvent<{ tenant: string; user: string; role: tenantRole; }>(EventNames.UpdateInvite).unsubscribe,
         inviteUpdated: this.createEvent<{ tenant: string; user: string; role: tenantRole; }>(EventNames.InviteUpdated).unsubscribe,
         inviteUpdateError: this.createEvent<{ tenant: string; user: string;  role: tenantRole; }>(EventNames.InviteUpdateError).unsubscribe,
-        rejectInvite: this.createEvent<{ tenant: string; }>(EventNames.RejectInvite).unsubscribe,
+        rejectInvite: this.createEvent<{ tenant: string; leave: boolean }>(EventNames.RejectInvite).unsubscribe,
         inviteRejected: this.createEvent<{ user: string; tenant: string; }>(EventNames.InviteRejected).unsubscribe,
         inviteRejectError: this.createEvent<{ tenant: string; }>(EventNames.InviteRejectError).unsubscribe,
         createToken: this.createEvent<{ tenant: string; expiration: string; description: string }>(EventNames.CreateToken).unsubscribe,

package/helpers/user-helper.ts

@@ -38,10 +38,9 @@ export const handleUserEvent = ({
     if (!userTenants.includes(key)) {
       const tenantToDelete = tenantsMap.get(key);
       if (tenantToDelete) {
-        eventHelper.tenant.publish.deleted(tenantToDelete);
-        const tenantDeletedNotification: Notification = {
-          type: "success",
-          subtype: "tenant-deleted",
+        const userRemovedNotification: Notification = {
+          type: "info",
+          subtype: "user-removed-from-tenant",
           date: Date.now().toString(),
           callToAction: false,
           status: "unread",
@@ -49,7 +48,7 @@ export const handleUserEvent = ({
             tenant: tenantToDelete.name,
           },
         };
-        eventHelper.notification.publish.creation(tenantDeletedNotification);
+        eventHelper.notification.publish.creation(userRemovedNotification);
         deletedTenantKeys.push(key);
       }
     }

package/package.json

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

package/websocket-manager.ts

@@ -804,6 +804,27 @@ const handleEvent = async (message: WSMessage) => {
           eventData,
           userData,
         );
+
+        if (
+          existingTenant &&
+          existingTenant.role &&
+          newTenant.role &&
+          existingTenant.role !== newTenant.role
+        ) {
+          const roleNotification: Notification = {
+            type: "info",
+            subtype: "tenant-role-changed",
+            date: Date.now().toString(),
+            status: "unread",
+            callToAction: false,
+            data: {
+              tenant: newTenant.name,
+              oldRole: existingTenant.role,
+              newRole: newTenant.role,
+            },
+          };
+          eventHelper.notification.publish.creation(roleNotification);
+        }
         if (existingTenant) {
           if (
             !newTenant.resources?.length &&