@kumori/aurora-backend-handler 1.1.106 → 1.1.108

package/api/user-api-service.ts

@@ -8,7 +8,7 @@ import {
   Account,
   Container,
   Environment,
-  getWuiErrorCode,
+  errors,
   Instance,
   MarketplaceItem,
   Organization,
@@ -94,6 +94,7 @@ export const loadUserData = async () => {
 
     const userData: UserData = {
       id: userResponse.userRecord.id.name,
+      created: userResponse.userRecord.meta.created,
       name: userResponse.userRecord.spec.userinfo.name,
       surname: userResponse.userRecord.spec.userinfo.surname,
       provider: [{ name: provider, email: email || "", password: "" }],
@@ -1048,7 +1049,7 @@ export const updateUser = async (user: User) => {
       spec: {
         name: user.name,
         surname: user.surname,
-        discoveryMethod: user.discoveryMethod,
+        discoveryMethod: "work",
         companyName: user.companyName,
         companyRole: user.rol,
       },
@@ -1063,10 +1064,10 @@ export const updateUser = async (user: User) => {
     eventHelper.user.publish.updated(user);
     eventHelper.notification.publish.creation({
       type: "success",
-      subtype: "user-updated",
+      subtype: errors.user.updated.subtype,
       date: Date.now().toString(),
       status: "unread",
-      notificationType: "regular",
+      callToAction: false,
       data: { user: user.name },
     });
   } catch (error) {
@@ -1078,10 +1079,10 @@ export const updateUser = async (user: User) => {
     eventHelper.user.publish.updateError(user);
     eventHelper.notification.publish.creation({
       type: "error",
-      subtype: getWuiErrorCode("user", "modifyUserInfo", (error as any).error.code) ?? "user-update-error",
+      subtype: errors.user.updateError.subtype,
       date: Date.now().toString(),
       status: "unread",
-      notificationType: "regular",
+      callToAction: false,
       info_content: {
         code: (error as any).error.code,
         message: (error as any).error.content,
@@ -1106,10 +1107,10 @@ export const deleteUSer = async (user: User, security: string) => {
     );
     eventHelper.notification.publish.creation({
       type: "success",
-      subtype: "user-deleted",
+      subtype: errors.user.deleted.subtype,
       date: Date.now().toString(),
       status: "unread",
-      notificationType: "regular",
+      callToAction: false,
       data: { user: user.name },
     });
     return response;
@@ -1117,10 +1118,10 @@ export const deleteUSer = async (user: User, security: string) => {
     console.error("Error deleting user:", error);
     eventHelper.notification.publish.creation({
       type: "error",
-      subtype: getWuiErrorCode("user", "deleteUser", (error as any).error.code) ?? "user-delete-error",
+      subtype: errors.user.deleteError.subtype,
       date: Date.now().toString(),
       status: "unread",
-      notificationType: "regular",
+      callToAction: false,
       info_content: {
         code: (error as any).error.code,
         message: (error as any).error.content,

package/backend-handler.ts

@@ -68,6 +68,7 @@ import { getPlanProviders } from "./api/planProvider-api-service";
 import {
   Account,
   Environment,
+  errors,
   Link,
   MarketplaceItem,
   MarketplaceService,
@@ -611,10 +612,10 @@ export class BackendHandler {
     const updatedCb = (data: string) => {
       const upgradeNotification: Notification = {
         type: "success",
-        subtype: "plan-upgrade",
+        subtype: errors.user.planUpgraded.subtype,
         date: Date.now().toString(),
         status: "unread",
-        notificationType: "regular",
+        callToAction: false,
         data: {
           plan: data,
         },
@@ -641,10 +642,10 @@ export class BackendHandler {
     const downgradedCb = (data: string) => {
       const downgradeNotification: Notification = {
         type: "success",
-        subtype: "plan-downgrade",
+        subtype: errors.user.planDowngraded.subtype,
         date: Date.now().toString(),
         status: "unread",
-        notificationType: "regular",
+        callToAction: false,
         data: {
           plan: data,
         },
@@ -677,10 +678,10 @@ export class BackendHandler {
     const createdCb = (data: Environment) => {
       const envNotification: Notification = {
         type: "success",
-        subtype: "environment-created",
+        subtype: errors.environment.created.subtype,
         date: Date.now().toString(),
         status: "unread",
-        notificationType: "regular",
+        callToAction: false,
         data: {
           environment: data.name,
           account: data.account,
@@ -761,10 +762,10 @@ export class BackendHandler {
     const deployedCb = (data: Service) => {
       const deploymentSuccessNotification: Notification = {
         type: "success",
-        subtype: "deployment-success",
+        subtype: errors.deployment.success.subtype,
         date: Date.now().toString(),
         status: "unread",
-        notificationType: "regular",
+        callToAction: false,
         data: {
           service: data.name,
           tenant: data.tenant,
@@ -776,7 +777,7 @@ export class BackendHandler {
     const deploymentErrorCb = (data: Service) => {
       const deploymentErrorNotification: Notification = {
         type: "error",
-        subtype: "deployment-error",
+        subtype: errors.deployment.error.subtype,
         date: Date.now().toString(),
         status: "unread",
         info_content: {
@@ -784,7 +785,7 @@ export class BackendHandler {
           message: data.error?.message || "",
           timestamp: data.error?.timestamp || "",
         },
-        notificationType: "regular",
+        callToAction: false,
         data: {
           service: data.name,
           tenant: data.tenant,
@@ -797,10 +798,10 @@ export class BackendHandler {
       deployService(data, token);
       const deploymentSuccessNotification: Notification = {
         type: "info",
-        subtype: "deployment-in-progress",
+        subtype: errors.deployment.inProgress.subtype,
         date: Date.now().toString(),
         status: "unread",
-        notificationType: "regular",
+        callToAction: false,
         data: {
           service: data.name,
           tenant: data.tenant,
@@ -828,10 +829,10 @@ export class BackendHandler {
     const updatedCb = (data: Service) => {
       const deploymentNotification: Notification = {
         type: "success",
-        subtype: "deployment-updated",
+        subtype: errors.deployment.updated.subtype,
         date: Date.now().toString(),
         status: "unread",
-        notificationType: "regular",
+        callToAction: false,
         data: {
           service: data.name,
           tenant: data.tenant,
@@ -853,10 +854,10 @@ export class BackendHandler {
     const deleteCb = (data: Service) => {
       const deploymentNotification: Notification = {
         type: "info",
-        subtype: "deployment-deleting",
+        subtype: errors.deployment.deleting.subtype,
         date: Date.now().toString(),
         status: "unread",
-        notificationType: "regular",
+        callToAction: false,
         data: {
           service: data.name,
           tenant: data.tenant,
@@ -873,10 +874,10 @@ export class BackendHandler {
     const deletedCb = (data: Service) => {
       const deploymentNotification: Notification = {
         type: "success",
-        subtype: "deployment-deleted",
+        subtype: errors.deployment.deleted.subtype,
         date: Date.now().toString(),
         status: "unread",
-        notificationType: "regular",
+        callToAction: false,
         data: {
           service: data.name,
           tenant: data.tenant,
@@ -1089,10 +1090,10 @@ export class BackendHandler {
     const deletedCb = (data: Resource) => {
       const resourceNotification: Notification = {
         type: "success",
-        subtype: "resource-deleted",
+        subtype: errors.resource.deleted.subtype,
         date: Date.now().toString(),
         status: "unread",
-        notificationType: "regular",
+        callToAction: false,
         data: {
           resource: data.name,
           type: data.type,

package/helpers/account-helper.ts

@@ -1,4 +1,4 @@
-import { Account, getWuiErrorCode, Notification } from "@kumori/aurora-interfaces";
+import { Account, errors, Notification } from "@kumori/aurora-interfaces";
 const CREDENTIAL_ERROR_CODES = new Set([
   "_error_retrieving_credentials_",
   "_invalid_account_credentials_",
@@ -289,10 +289,10 @@ export const handleAccountOperationSuccess = ({
       shouldDelete: true,
       notification: {
         type: "success",
-        subtype: "account-deleted",
+        subtype: errors.account.deleted.subtype,
         date: Date.now().toString(),
         status: "unread",
-        notificationType: "regular",
+        callToAction: false,
         data: { account: originalData.name, tenant: originalData.tenant },
       },
       eventType: "deleted",
@@ -308,10 +308,10 @@ export const handleAccountOperationSuccess = ({
       shouldDelete: false,
       notification: {
         type: "success",
-        subtype: isCreate ? "account-created" : "account-updated",
+        subtype: isCreate ? errors.account.created.subtype : errors.account.updated.subtype,
         date: Date.now().toString(),
         status: "unread",
-        notificationType: "regular",
+        callToAction: false,
         data: { account: updatedAccount.name, tenant: updatedAccount.tenant },
       },
       eventType: isCreate ? "created" : "updated",
@@ -326,7 +326,7 @@ export const handleAccountOperationSuccess = ({
       subtype: "account-unknown",
       date: Date.now().toString(),
       status: "unread",
-      notificationType: "regular",
+      callToAction: false,
       data: {},
     },
     eventType: null,
@@ -357,11 +357,10 @@ export const handleAccountOperationError = ({
   const errorCode: string = error?.error?.code ?? error?.code ?? "";
   const errorStatus = resolveErrorStatus(errorCode);
 
-  const errSubtype = isCreate ? "account-creation-error" : isUpdate ? "account-update-error" : "account-deletion-error";
-  const errMethod = isCreate ? "createAccount" : isUpdate ? "updateAccount" : "deleteAccount";
+  const errEntry = isCreate ? errors.account.creationError : isUpdate ? errors.account.updateError : errors.account.deletionError;
   const notification: Notification = {
     type: "error",
-    subtype: getWuiErrorCode("account", errMethod, errorCode) ?? errSubtype,
+    subtype: errEntry.subtype,
     date: Date.now().toString(),
     status: "unread",
     info_content: {
@@ -370,7 +369,7 @@ export const handleAccountOperationError = ({
         error?.error?.content ?? error?.error?.message ?? "Unknown error",
       timestamp: error?.error?.timestamp ?? Date.now().toString(),
     },
-    notificationType: "regular",
+    callToAction: false,
     data: {
       account:
         entityName || originalData?.name || originalData?.account || "unknown",

package/helpers/environment-helper.ts

@@ -1,4 +1,4 @@
-import { Account, Environment, getWuiErrorCode, Notification } from "@kumori/aurora-interfaces";
+import { Account, Environment, errors, Notification } from "@kumori/aurora-interfaces";
 
 
 
@@ -184,10 +184,10 @@ export const handleEnvironmentOperationSuccess = ({
 
     const envNotification: Notification = {
       type: "success",
-      subtype: "environment-cleaned",
+      subtype: errors.environment.purged.subtype,
       date: Date.now().toString(),
       status: "unread",
-      notificationType: "regular",
+      callToAction: false,
       data: {
         environment: envData.name,
         account: envData.account,
@@ -249,11 +249,10 @@ export const handleEnvironmentOperationError = ({
       ? "updateError"
       : "deletionError";
 
-  const envErrSubtype = action === "CREATE" ? "environment-creation-error" : action === "UPDATE" ? "environment-update-error" : "environment-deletion-error";
-  const envErrMethod = action === "CREATE" ? "createEnvironment" : action === "UPDATE" ? "updateEnvironment" : "deleteEnvironment";
+  const envErrEntry = action === "CREATE" ? errors.environment.creationError : action === "UPDATE" ? errors.environment.updateError : errors.environment.deletionError;
   const envErrorNotification: Notification = {
     type: "error",
-    subtype: getWuiErrorCode("environment", envErrMethod, error?.error?.code || "UNKNOWN_ERROR") ?? envErrSubtype,
+    subtype: envErrEntry.subtype,
     date: Date.now().toString(),
     status: "unread",
     info_content: {
@@ -261,7 +260,7 @@ export const handleEnvironmentOperationError = ({
       message: error?.error?.content || error?.error?.message || "Unknown error",
       timestamp: error?.error?.timestamp || "",
     },
-    notificationType: "regular",
+    callToAction: false,
     data: {
       environment: originalData.name,
       account: originalData.account,

package/helpers/revision-helper.ts

@@ -224,7 +224,7 @@ const createRevision = (
         cpu: { max: eventData.spec.intensives?.vcpu / 1000 || 0, min: 0 },
         memory: { max: eventData.spec.intensives?.ram / 1000 || 0, min: 0 },
         storage: {
-          max: eventData.spec.intensives?.shared_disk / 1000 || 0,
+          max: (eventData.spec.intensives?.volatile_disk / 1000 || 0) + (eventData.spec.intensives?.nrpersistent_disk / 1000 || 0) + (eventData.spec.intensives?.persistent_disk / 1000 || 0),
           min: 0,
         },
         volatileStorage: {
@@ -717,7 +717,7 @@ export const processRevisionData = (
             cpu: { max: revisionData.intensives?.vcpu / 1000 || 0, min: 0 },
             memory: { max: revisionData.intensives?.ram / 1000 || 0, min: 0 },
             storage: {
-              max: revisionData.intensives?.shared_disk / 1000 || 0,
+              max: (revisionData.intensives?.volatile_disk / 1000 || 0) + (revisionData.intensives?.nrpersistent_disk / 1000 || 0) + (revisionData.intensives?.persistent_disk / 1000 || 0),
               min: 0,
             },
             volatileStorage: {

package/helpers/service-helper.ts

@@ -110,7 +110,7 @@ const getDefaultUsage = (eventData?: any): Usage => ({
   limit: {
     cpu: { max: eventData.vcpu || 0, min: eventData.vcpu || 0 },
     memory: { max: eventData.ram || 0, min: eventData.ram || 0 },
-    storage: { max: eventData.shared_disk || 0, min: eventData.shared_disk || 0 },
+    storage: { max: (eventData.volatile_disk || 0) + (eventData.persistent_disk || 0) +  (eventData.persistent_disk || 0), min: (eventData.volatile_disk || 0) + (eventData.persistent_disk || 0) +  (eventData.persistent_disk || 0) },
     volatileStorage: { max: eventData.volatile_disk || 0, min: eventData.volatile_disk || 0 },
     nonReplicatedStorage: { max: eventData.persistent_disk || 0, min: eventData.persistent_disk || 0 },
     persistentStorage: { max: eventData.persistent_disk || 0, min: eventData.persistent_disk || 0 },

package/helpers/token-helper.ts

@@ -1,4 +1,4 @@
-import { ClusterToken, Notification, Token, UserData } from "@kumori/aurora-interfaces";
+import { ClusterToken, errors, Notification, Token, UserData } from "@kumori/aurora-interfaces";
 
 
 interface HandleTokenEventParams {
@@ -161,10 +161,10 @@ export const handleTokenDeletion = ({
 
   const notification: Notification = {
     type: "success",
-    subtype: "token-deleted",
+    subtype: errors.user.tokenDeleted.subtype,
     date: Date.now().toString(),
     status: "unread",
-    notificationType: "regular",
+    callToAction: false,
     data: {
       tokenName: deletedToken.name,
       tenant: deletedToken.tenant,

package/helpers/user-helper.ts

@@ -1,4 +1,5 @@
 import {
+  errors,
   Notification,
   Plan,
   Tenant,
@@ -61,9 +62,9 @@ export const handleUserEvent = ({
             eventHelper.tenant.publish.deleted(tenantToDelete);
             const tenantDeletedNotification: Notification = {
               type: "success",
-              subtype: "tenant-deleted",
+              subtype: errors.tenant.deleted.subtype,
               date: Date.now().toString(),
-              notificationType: "regular",
+              callToAction: false,
               status: "unread",
               data: {
                 tenant: tenantToDelete.name,
@@ -75,9 +76,9 @@ export const handleUserEvent = ({
           } else {
             const userRemovedNotification: Notification = {
               type: "info",
-              subtype: "user-removed-from-tenant",
+              subtype: errors.tenant.accessRevoked.subtype,
               date: Date.now().toString(),
-              notificationType: "regular",
+              callToAction: false,
               status: "unread",
               data: {
                 tenant: tenantToDelete.name,
@@ -137,6 +138,7 @@ export const handleUserEvent = ({
   }
   const userData: UserData = {
     id: userId,
+    created: eventData.meta?.created || currentUserData.created || "",
     name: eventData.spec.userinfo.name,
     surname: eventData.spec.userinfo.surname,
     provider: providers,
@@ -162,6 +164,7 @@ export const handleUserEvent = ({
 export const handleUserDelete = (): UserData => {
   return {
     id: "",
+    created: "",
     name: "",
     surname: "",
     provider: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumori/aurora-backend-handler",
-  "version": "1.1.106",
+  "version": "1.1.108",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "scripts": {
@@ -11,8 +11,8 @@
     "glob": "^11.0.0"
   },
   "dependencies": {
-    "@kumori/aurora-interfaces": "^1.0.31",
-    "@kumori/kumori-dsl-generator": "1.0.7",
+    "@kumori/aurora-interfaces": "^1.0.30",
+    "@kumori/kumori-dsl-generator": "1.0.10",
     "@kumori/kumori-module-generator": "^1.1.6",
     "ts-node": "^10.9.2",
     "uuid": "^11.1.0",

package/test/deploy-service-helper.test.ts

@@ -196,6 +196,15 @@ describe("handleParametersToGenerateData", () => {
     expect(result.environment).toContainEqual({ varName: "res1", secret: "res1" });
   });
 
+  it("maneja formResources de tipo secret con key (montado en path)", () => {
+    const result = handleParametersToGenerateData([], [
+      { name: "mySuperSecretSecret", type: "secret", key: "/mysecret" },
+    ]);
+    expect(result.resources).toContainEqual({ secret: { name: "mySuperSecretSecret" } });
+    expect(result.fileSystem).toContainEqual({ path: "/mysecret", resourceSecret: "mySuperSecretSecret" });
+    expect(result.environment).not.toContainEqual({ varName: "mySuperSecretSecret", secret: "mySuperSecretSecret" });
+  });
+
   it("maneja formResources de tipo volume", () => {
     const result = handleParametersToGenerateData([], [
       { name: "vol1", type: "volume", key: "/mnt/data" },

package/websocket-manager.ts

@@ -1,10 +1,12 @@
 import { v7 as uuidv7 } from "uuid";
 import { environment } from "./environment";
+import { AccountStatus } from "@kumori/aurora-interfaces/enums/accountStatusEnum";
 import {
   Account,
   Channel,
   ClusterToken,
   Environment,
+  errors,
   Instance,
   MarketplaceItem,
   Notification,
@@ -151,6 +153,7 @@ let currentToken: string | null = null;
 let connectionPromise: Promise<WebSocket> | null = null;
 let userData: UserData = {
   id: "",
+  created: "",
   name: "",
   surname: "",
   provider: [],
@@ -661,6 +664,17 @@ export const closeGlobalWebSocketConnection = () => {
   });
 };
 
+const computePromotionInfo = (
+  tenants: Tenant[],
+): { completedSteps: number; remainingDays: number } => {
+  const hasValidCredentialsAccount = tenants.some((tenant) =>
+    tenant.accounts?.some((account) => account.status === AccountStatus.ACTIVE),
+  );
+  const hasDeployedService = tenants.some((tenant) => tenant.services?.length > 0);
+  const completedSteps = (hasValidCredentialsAccount ? 1 : 0) + (hasDeployedService ? 1 : 0);
+  return { completedSteps, remainingDays: 7 };
+};
+
 const rebuildHierarchy = () => {
   const preservedUserData = { ...userData };
 
@@ -695,6 +709,7 @@ const rebuildHierarchy = () => {
   });
   userData = {
     id: preservedUserData.id,
+    created: preservedUserData.created,
     name: preservedUserData.name,
     surname: preservedUserData.surname,
     provider: preservedUserData.provider.map((p) => ({ ...p })),
@@ -715,6 +730,7 @@ const rebuildHierarchy = () => {
     notifications: preservedUserData.notifications || [],
     plans: preservedUserData.plans || [],
     discoveryMethod: preservedUserData.discoveryMethod,
+    promotionInfo: computePromotionInfo(Array.from(tenantsMap.values())),
   };
 };
 const handleEvent = async (message: WSMessage) => {
@@ -947,7 +963,7 @@ const handleEvent = async (message: WSMessage) => {
         ) {
           const roleNotification: Notification = {
             type: "info",
-            subtype: "tenant-role-changed",
+            subtype: errors.tenant.roleChanged.subtype,
             date: Date.now().toString(),
             status: "unread",
             notificationType: "regular",
@@ -1749,7 +1765,7 @@ const handleDeleteEvent = async (message: WSMessage) => {
     eventHelper.environment.publish.deleted(deletedEnv);
     const envNotification: Notification = {
       type: "success",
-      subtype: "environment-deleted",
+      subtype: errors.environment.deleted.subtype,
       date: Date.now().toString(),
       notificationType: "regular",
       status: "unread",
@@ -1769,7 +1785,7 @@ const handleDeleteEvent = async (message: WSMessage) => {
     eventHelper.account.publish.deleted(deletedAccount);
     const accountNotification: Notification = {
       type: "success",
-      subtype: "account-deleted",
+      subtype: errors.account.deleted.subtype,
       date: Date.now().toString(),
       notificationType: "regular",
       status: "unread",
@@ -1907,7 +1923,7 @@ const handleDeleteEvent = async (message: WSMessage) => {
         tenantsMap.set(tenantName, registryTenant);
         const registryNotification: Notification = {
           type: "success",
-          subtype: "registry-deleted",
+          subtype: errors.registry.deleted.subtype,
           date: Date.now().toString(),
           status: "unread",
           notificationType: "regular",
@@ -1963,7 +1979,7 @@ const handleDeleteEvent = async (message: WSMessage) => {
     if (deletedLinkInfo) {
       const unlinkNotification: Notification = {
         type: "success",
-        subtype: "service-unlinked",
+        subtype: errors.service.unlinked.subtype,
         date: Date.now().toString(),
         status: "unread",
         notificationType: "regular",
@@ -2130,6 +2146,7 @@ export const updateUserComplete = (updatedUserData: UserData): User => {
 
     userData = {
       id: updatedUserData.id || userData.id,
+      created: updatedUserData.created || userData.created,
       name: updatedUserData.name || userData.name,
       surname: updatedUserData.surname || userData.surname,
       provider: updatedUserData.provider || userData.provider || [],
@@ -2150,6 +2167,7 @@ export const updateUserComplete = (updatedUserData: UserData): User => {
       status: updatedUserData.status,
       discoveryMethod:
         updatedUserData.discoveryMethod || userData.discoveryMethod,
+      promotionInfo: computePromotionInfo(updatedUserData.tenants || userData.tenants || []),
     };
     user = new User(
       userData,