@kumori/aurora-backend-handler 1.0.98 → 1.0.100

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` } }));
@@ -646,9 +636,6 @@ export async function generateServiceSpec(
             config: {
               parameters: [
                 { name: "type", value: "https", type: "string" },
-                ...(channel.withMtls && channel.caResource
-                  ? [{ name: "mtls", value: "true", type: "bool" as const }]
-                  : []),
                 // { name: "websocket", value: "true", type: "bool", configParam: "websocket" },
               ],
               resources: [
@@ -670,7 +657,7 @@ export async function generateServiceSpec(
                   ? [
                       {
                         ca: {
-                          name: "clientca",
+                          name: "clientcertca",
                           configResource: `${channel.channelName}_ca`,
                         },
                       },
@@ -892,7 +879,11 @@ export async function generateServiceSpec(
         resource: withDefaultValue(channel.domain, ""),
       },
     }));
-  if (deploymentConfigDomain.length) {
+
+  const hasDefaultCertChannelDeployment = form.channels.some(
+    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource,
+  );
+  if (hasDefaultCertChannelDeployment) {
     deploymentConfigDomain.push({
       certificate: {
         name: "main_inbound_servercert",
@@ -900,6 +891,29 @@ export async function generateServiceSpec(
       },
     });
   }
+
+  const customCertDeploymentResources: DeploymentResource[] = form.channels
+    .filter(
+      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource,
+    )
+    .map((ch) => ({
+      certificate: {
+        name: `${ch.channelName}_cert`,
+        resource: ch.certificateResource!,
+      },
+    }));
+
+  const customCaDeploymentResources: DeploymentResource[] = form.channels
+    .filter(
+      (ch) =>
+        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource,
+    )
+    .map((ch) => ({
+      ca: {
+        name: `${ch.channelName}_ca`,
+        resource: ch.caResource!,
+      },
+    }));
   const deploymentConfigPort: DeploymentResource[] = form.channels
     .filter((channel) => channel.protocol === "TCP" && channel.isPublic)
     .map((channel) => ({
@@ -1077,6 +1091,8 @@ export async function generateServiceSpec(
       parameters: [...deploymentConfigParameters],
       resources: [
         ...deploymentConfigDomain,
+        ...customCertDeploymentResources,
+        ...customCaDeploymentResources,
         ...deploymentConfigPort,
         ...deploymentConfigResources,
       ],
@@ -1119,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({
@@ -1129,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` } }));
@@ -1241,9 +1251,6 @@ async function generateServiceSpecDSL(
             config: {
               parameters: [
                 { name: "type", value: "https", type: "string" as const },
-                ...(channel.withMtls && channel.caResource
-                  ? [{ name: "mtls", value: "true", type: "bool" as const }]
-                  : []),
               ],
               resources: [
                 {
@@ -1264,7 +1271,7 @@ async function generateServiceSpecDSL(
                   ? [
                       {
                         ca: {
-                          name: "clientca",
+                          name: "clientcertca",
                           configResource: `${channel.channelName}_ca`,
                         },
                       },
@@ -1435,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({
@@ -1448,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: {
@@ -1460,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: {
@@ -1469,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) => ({
@@ -1600,6 +1601,8 @@ async function generateServiceSpecDSL(
       parameters: [...deploymentConfigParameters],
       resources: [
         ...deploymentConfigDomain,
+        ...customCertDeploymentResources,
+        ...customCaDeploymentResources,
         ...deploymentConfigPort,
         ...deploymentConfigResources,
       ],
@@ -1693,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/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.98",
+  "version": "1.0.100",
   "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 &&