@kumori/aurora-backend-handler 1.1.87 → 1.1.89

package/api/tenant-api-service.ts

@@ -198,24 +198,21 @@ export const updateTenant = async (tenant: Tenant, security: string) => {
 
     const updateBody: Record<string, any> = {
       tenant: tenant.name,
+      spec: {},
     };
     if (hasPlan) {
       updateBody.provider = tenant.plan!.provider || "";
       updateBody.plan = tenant.plan!.name;
-    } else {
-      updateBody.spec = {
-        registry: !hasNpmRegistry
-          ? undefined
-          : isNpmRegistryEmpty
-            ? null
-            : {
-                kind: "git",
-                endpoint: tenant.npmRegistry!.endpoint,
-                domain: tenant.npmRegistry!.domain,
-                credentials: tenant.npmRegistry!.credentials,
-                public: tenant.npmRegistry!.public,
-              },
-      };
+    } else if (hasNpmRegistry) {
+      updateBody.spec.registry = isNpmRegistryEmpty
+        ? null
+        : {
+            kind: "git",
+            endpoint: tenant.npmRegistry!.endpoint,
+            domain: tenant.npmRegistry!.domain,
+            credentials: tenant.npmRegistry!.credentials,
+            public: tenant.npmRegistry!.public,
+          };
     }
 
     const response = await makeGlobalWebSocketRequest(
@@ -244,6 +241,8 @@ export const updateTenant = async (tenant: Tenant, security: string) => {
     console.error("Error in tenant update WebSocket request:", err);
     const { code: contentMessage, content: errorContent } =
       extractWsErrorInfo(err);
+    const { plan, ...tenantWithoutPlan } = tenant;
+    eventHelper.tenant.publish.updateError(tenantWithoutPlan as Tenant);
     const tenantUpdateErrorNotification: Notification = {
       type: "error",
       subtype: errors.tenant.updateError.subtype,
@@ -449,14 +448,10 @@ export const updateTenantHTTP = async (tenant: Tenant) => {
             },
           },
         }
-      : hasPlan
-        ? { tenant: tenant.name }
-        : {
-            tenant: tenant.name,
-            spec: {
-              registry: undefined,
-            },
-          };
+      : {
+          tenant: tenant.name,
+          spec: {},
+        };
   const response = await fetch(updateTenantUrl, {
     method: "PATCH",
     headers: {
@@ -480,7 +475,9 @@ export const updateTenantHTTP = async (tenant: Tenant) => {
     };
     eventHelper.notification.publish.creation(tenantCreatedNotification);
   } else {
-    eventHelper.tenant.publish.updateError(tenant);
+    // The request failed, so the plan change must not be reflected as applied.
+    const { plan, ...tenantWithoutPlan } = tenant;
+    eventHelper.tenant.publish.updateError(tenantWithoutPlan as Tenant);
 
     let errorCode = "Unknown error";
     let errorMessage = "Unknown error";

package/package.json

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