@kumori/aurora-backend-handler 1.0.99 → 1.0.111

package/api/tenant-api-service.ts

@@ -1,4 +1,4 @@
-import { Notification, Registry, Tenant, tenantRole } from "@kumori/aurora-interfaces";
+import { errors, Notification, Registry, Tenant, tenantRole } from "@kumori/aurora-interfaces";
 import { eventHelper } from "../backend-handler";
 import { environment } from "../environment";
 import {
@@ -16,6 +16,35 @@ interface DregistryBody {
     docker_password: string;
   };
 }
+
+/**
+ * Extracts a user-facing code/content pair from a failed request.
+ * Errors coming back from the WS layer are usually nested under `.error`
+ * (e.g. `{ error: { code, content } }`), but some server-side rejections
+ * (e.g. plan/limits validation) return the fields flat on the error object
+ * itself (`{ code, content }`). Without this fallback those errors were
+ * silently reported as "Unknown error" instead of surfacing the real code.
+ */
+const extractWsErrorInfo = (
+  err: unknown
+): { code: string; content: string } => {
+  const candidate =
+    err && typeof err === "object" && "error" in err
+      ? (err as any).error
+      : err;
+
+  const code =
+    candidate && typeof candidate === "object" && typeof candidate.code === "string"
+      ? candidate.code
+      : "Unknown error";
+  const content =
+    candidate && typeof candidate === "object" && typeof candidate.content === "string"
+      ? candidate.content
+      : "Unknown error";
+
+  return { code, content };
+};
+
 /**
  * Function to create a tenant using the global WebSocket connection
  * @param tenant Tenant object with the data of the tenant
@@ -62,7 +91,7 @@ export const createTenant = async (tenant: Tenant, security: Security) => {
     eventHelper.tenant.publish.created(updatedTenant);
     const tenantCreatedNotification: Notification = {
       type: "success",
-      subtype: "tenant-created",
+      subtype: errors.tenant.created.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
@@ -79,26 +108,11 @@ export const createTenant = async (tenant: Tenant, security: Security) => {
       tenant: tenant.name,
       webSocketStatus: getWebSocketStatus(),
     });
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
     const tenantCreationErrorNotification: Notification = {
       type: "error",
-      subtype: "tenant-creation-error",
+      subtype: errors.tenant.creationError.subtype,
       info_content: {
         code: contentMessage,
         message: errorContent,
@@ -146,27 +160,11 @@ export const deleteTenant = async (tenant: Tenant, security: string) => {
     return response;
   } catch (err) {
     console.error("Error in tenant deletion WebSocket request:", err);
-    eventHelper.tenant.publish.deletionError(tenant);
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof err === "object" &&
-      err !== null &&
-      "error" in err &&
-      typeof (err as any).error === "object" &&
-      (err as any).error !== null
-    ) {
-      if ("code" in (err as any).error) {
-        contentMessage = (err as any).error.code;
-      }
-      if ("content" in (err as any).error) {
-        errorContent = (err as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(err);
     const tenantDeletionErrorNotification: Notification = {
       type: "error",
-      subtype: "tenant-deletion-error",
+      subtype: errors.tenant.deletionError.subtype,
       info_content: {
         code: contentMessage,
         message: errorContent,
@@ -189,27 +187,32 @@ export const updateTenant = async (tenant: Tenant, security: string) => {
     await initializeGlobalWebSocketClient(security);
 
     const hasNpmRegistry =
-      tenant.npmRegistry && tenant.npmRegistry.endpoint !== "";
+      tenant.npmRegistry !== undefined && tenant.npmRegistry !== null;
+    const isNpmRegistryEmpty =
+      hasNpmRegistry &&
+      tenant.npmRegistry!.endpoint === "" &&
+      tenant.npmRegistry!.domain === "" &&
+      tenant.npmRegistry!.credentials === "" &&
+      tenant.npmRegistry!.public === false;
     const hasPlan = tenant.plan?.name;
 
     const updateBody: Record<string, any> = {
       tenant: tenant.name,
-      spec: {
-        registry: hasNpmRegistry
-          ? {
-              kind: "git",
-              endpoint: tenant.npmRegistry!.endpoint,
-              domain: tenant.npmRegistry!.domain,
-              credentials: tenant.npmRegistry!.credentials,
-              public: tenant.npmRegistry!.public,
-            }
-          : undefined,
-      },
+      spec: {},
     };
-
     if (hasPlan) {
       updateBody.provider = tenant.plan!.provider || "";
       updateBody.plan = tenant.plan!.name;
+    } 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(
@@ -224,7 +227,7 @@ export const updateTenant = async (tenant: Tenant, security: string) => {
     eventHelper.tenant.publish.updated(updatedTenant);
     const tenantCreatedNotification: Notification = {
       type: "success",
-      subtype: "tenant-updated",
+      subtype: errors.tenant.updated.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
@@ -236,27 +239,13 @@ export const updateTenant = async (tenant: Tenant, security: string) => {
     return response;
   } catch (err) {
     console.error("Error in tenant update WebSocket request:", err);
-    eventHelper.tenant.publish.updateError(tenant);
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof err === "object" &&
-      err !== null &&
-      "error" in err &&
-      typeof (err as any).error === "object" &&
-      (err as any).error !== null
-    ) {
-      if ("code" in (err as any).error) {
-        contentMessage = (err as any).error.code;
-      }
-      if ("content" in (err as any).error) {
-        errorContent = (err as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(err);
+    const { plan, ...tenantWithoutPlan } = tenant;
+    eventHelper.tenant.publish.updateError(tenantWithoutPlan as Tenant);
     const tenantUpdateErrorNotification: Notification = {
       type: "error",
-      subtype: "tenant-update-error",
+      subtype: errors.tenant.updateError.subtype,
       info_content: {
         code: contentMessage,
         message: errorContent,
@@ -324,7 +313,7 @@ export const createTenantHTTP = async (tenant: Tenant) => {
     eventHelper.tenant.publish.created(updatedTenant);
     const tenantCreatedNotification: Notification = {
       type: "success",
-      subtype: "tenant-created",
+      subtype: errors.tenant.created.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
@@ -356,7 +345,7 @@ export const createTenantHTTP = async (tenant: Tenant) => {
 
     const tenantCreationErrorNotification: Notification = {
       type: "error",
-      subtype: "tenant-creation-error",
+      subtype: errors.tenant.creationError.subtype,
       info_content: {
         code: errorCode,
         message: errorMessage,
@@ -387,7 +376,7 @@ export const deleteTenantHTTP = async (tenant: Tenant) => {
   if (response.ok) {
     const tenantDeletedNotification: Notification = {
       type: "success",
-      subtype: "tenant-deleting",
+      subtype: errors.tenant.deleting.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
@@ -416,7 +405,7 @@ export const deleteTenantHTTP = async (tenant: Tenant) => {
 
     const tenantDeletionErrorNotification: Notification = {
       type: "error",
-      subtype: "tenant-deletion-error",
+      subtype: errors.tenant.deletionError.subtype,
       info_content: {
         code: errorCode,
         message: errorMessage,
@@ -444,12 +433,11 @@ export const updateTenantHTTP = async (tenant: Tenant) => {
       tenant.plan?.provider || ""
     );
   }
+  const hasPlan = tenant.plan && tenant.plan?.name !== "" && tenant.plan?.provider !== "";
   const tenantBody =
-    tenant.npmRegistry && tenant.npmRegistry.endpoint !== ""
+    !hasPlan && tenant.npmRegistry && tenant.npmRegistry.endpoint !== ""
       ? {
           tenant: tenant.name,
-          provider: tenant.plan?.provider || "",
-          plan: tenant.plan?.name || "",
           spec: {
             registry: {
               kind: "git",
@@ -462,9 +450,7 @@ export const updateTenantHTTP = async (tenant: Tenant) => {
         }
       : {
           tenant: tenant.name,
-          spec: {
-            registry: undefined,
-          },
+          spec: {},
         };
   const response = await fetch(updateTenantUrl, {
     method: "PATCH",
@@ -479,7 +465,7 @@ export const updateTenantHTTP = async (tenant: Tenant) => {
     eventHelper.tenant.publish.updated(updatedTenant);
     const tenantCreatedNotification: Notification = {
       type: "success",
-      subtype: "tenant-updated",
+      subtype: errors.tenant.updated.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
@@ -489,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";
@@ -508,7 +496,7 @@ export const updateTenantHTTP = async (tenant: Tenant) => {
 
     const tenantUpdateErrorNotification: Notification = {
       type: "error",
-      subtype: "tenant-update-error",
+      subtype: errors.tenant.updateError.subtype,
       info_content: {
         code: errorCode,
         message: errorMessage,
@@ -558,11 +546,12 @@ export const createRegistry = async (
 
     const dregistryCreatedNotification: Notification = {
       type: "success",
-      subtype: "registry-created",
+      subtype: errors.registry.created.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
       data: {
+        registry: registry.name,
         tenant: tenant.name,
       },
     };
@@ -577,27 +566,12 @@ export const createRegistry = async (
       webSocketStatus: getWebSocketStatus(),
     });
 
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
 
     const dregistryCreationErrorNotification: Notification = {
       type: "error",
-      subtype: "registry-creation-error",
+      subtype: errors.registry.creationError.subtype,
       info_content: {
         code: contentMessage,
         message: errorContent,
@@ -658,11 +632,12 @@ export const updateRegistry = async (
     );
     const dregistryUpdatedNotification: Notification = {
       type: "success",
-      subtype: "registry-updated",
+      subtype: errors.registry.updated.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
       data: {
+        registry: registry.name,
         tenant: tenant.name,
       },
     };
@@ -679,27 +654,12 @@ export const updateRegistry = async (
       webSocketStatus: getWebSocketStatus(),
     });
 
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
 
     const dregistryUpdateErrorNotification: Notification = {
       type: "error",
-      subtype: "registry-update-error",
+      subtype: errors.registry.updateError.subtype,
       info_content: {
         code: contentMessage,
         message: errorContent,
@@ -742,11 +702,12 @@ export const deleteRegistry = async (
 
     const dregistryDeletedNotification: Notification = {
       type: "success",
-      subtype: "registry-deleted",
+      subtype: errors.registry.deleted.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
       data: {
+        registry: registry.name,
         tenant: tenant.name,
       },
     };
@@ -762,27 +723,12 @@ export const deleteRegistry = async (
       webSocketStatus: getWebSocketStatus(),
     });
 
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
 
     const dregistryDeletionErrorNotification: Notification = {
       type: "error",
-      subtype: "registry-deletion-error",
+      subtype: errors.registry.deletionError.subtype,
       info_content: {
         code: contentMessage,
         message: errorContent,
@@ -826,7 +772,7 @@ export const inviteUser = async (
     );
     const tenantInvitedNotification: Notification = {
       type: "success",
-      subtype: "tenant-user-invited",
+      subtype: errors.tenant.userInvited.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
@@ -848,26 +794,11 @@ export const inviteUser = async (
       role: role,
       webSocketStatus: getWebSocketStatus(),
     });
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
     const tenantInviteErrorNotification: Notification = {
       type: "error",
-      subtype: "tenant-user-invite-error",
+      subtype: errors.tenant.userInviteError.subtype,
       info_content: {
         code: contentMessage,
         message: errorContent,
@@ -908,7 +839,7 @@ export const removeUser = async (
     );
     const tenantUserRemovedNotification: Notification = {
       type: "success",
-      subtype: "tenant-user-removed",
+      subtype: errors.tenant.userRemoved.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
@@ -927,26 +858,11 @@ export const removeUser = async (
       userId: userId,
       webSocketStatus: getWebSocketStatus(),
     });
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
     const tenantUserRemovedErrorNotification: Notification = {
       type: "error",
-      subtype: "tenant-user-removed-error",
+      subtype: errors.tenant.userRemovedError.subtype,
       info_content: {
         code: contentMessage,
         message: errorContent,
@@ -989,7 +905,7 @@ export const updateUserRole = async (
     );
     const tenantUserUpdatedNotification: Notification = {
       type: "success",
-      subtype: "user-role-updated",
+      subtype: errors.tenant.roleUpdated.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
@@ -1010,26 +926,11 @@ export const updateUserRole = async (
       role: role,
       webSocketStatus: getWebSocketStatus(),
     });
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
     const tenantUserUpdatedErrorNotification: Notification = {
       type: "error",
-      subtype: "user-role-updated-error",
+      subtype: errors.tenant.roleUpdateError.subtype,
       info_content: {
         code: contentMessage,
         message: errorContent,
@@ -1064,7 +965,7 @@ export const acceptInvite = async (tenant: string, security: string) => {
     );
     const tenantInviteAcceptedNotification: Notification = {
       type: "success",
-      subtype: "tenant-invite-accepted",
+      subtype: errors.tenant.inviteAccepted.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
@@ -1081,26 +982,11 @@ export const acceptInvite = async (tenant: string, security: string) => {
       tenant: tenant,
       webSocketStatus: getWebSocketStatus(),
     });
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
     const tenantInviteAcceptedErrorNotification: Notification = {
       type: "error",
-      subtype: "tenant-invite-accepted-error",
+      subtype: errors.tenant.inviteAcceptError.subtype,
       info_content: {
         code: contentMessage,
         message: errorContent,
@@ -1120,7 +1006,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 };
@@ -1128,12 +1014,13 @@ export const rejectInvite = async (tenant: string, security: string) => {
       "tenant:reject_proposal_user",
       queryParams,
       30000,
-      "DELETE",
+      "REJECT",
       `${tenant}/reject`
     );
-    const tenantInviteRejectedNotification: Notification = {
+    if(leave){
+      const tenantInviteRejectedNotification: Notification = {
       type: "success",
-      subtype: "tenant-invite-rejected",
+      subtype: errors.tenant.leave.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
@@ -1142,6 +1029,21 @@ export const rejectInvite = async (tenant: string, security: string) => {
       },
     };
     eventHelper.notification.publish.creation(tenantInviteRejectedNotification);
+    }
+    else{
+      const tenantInviteRejectedNotification: Notification = {
+      type: "success",
+      subtype: errors.tenant.inviteRejected.subtype,
+      date: Date.now().toString(),
+      status: "unread",
+      callToAction: false,
+      data: {
+        tenant: tenant,
+      },
+    };
+    eventHelper.notification.publish.creation(tenantInviteRejectedNotification);
+    }
+    
     return response;
   } catch (error) {
     console.error("Error rejecting tenant invite:", {
@@ -1150,26 +1052,11 @@ export const rejectInvite = async (tenant: string, security: string) => {
       tenant: tenant,
       webSocketStatus: getWebSocketStatus(),
     });
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
     const tenantInviteRejectedErrorNotification: Notification = {
       type: "error",
-      subtype: "tenant-invite-rejected-error",
+      subtype: errors.tenant.inviteRejectError.subtype,
       info_content: {
         code: contentMessage,
         message: errorContent,
@@ -1222,7 +1109,7 @@ export const createToken = async (
 
     const tenantTokenCreatedNotification: Notification = {
       type: "success",
-      subtype: "token-created",
+      subtype: errors.user.tokenCreated.subtype,
       date: Date.now().toString(),
       status: "unread",
       callToAction: false,
@@ -1259,7 +1146,8 @@ export const deleteToken = async (
       queryParams,
       30000,
       "DELETE",
-      `${tenantName}/tokens/${tokenID}`
+      `${tenantName}/tokens/${tokenID}`,
+      "token"
     );
     return response;
   } catch (error) {