@kumori/aurora-backend-handler 1.0.111 → 1.0.112

package/api/user-api-service.ts

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

package/backend-handler.ts

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

package/helpers/account-helper.ts

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

package/helpers/environment-helper.ts

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

package/helpers/token-helper.ts

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

package/helpers/user-helper.ts

@@ -1,5 +1,4 @@
 import {
-  errors,
   Notification,
   Plan,
   Tenant,
@@ -62,9 +61,9 @@ export const handleUserEvent = ({
             eventHelper.tenant.publish.deleted(tenantToDelete);
             const tenantDeletedNotification: Notification = {
               type: "success",
-              subtype: errors.tenant.deleted.subtype,
+              subtype: "tenant-deleted",
               date: Date.now().toString(),
-              callToAction: false,
+              notificationType: "regular",
               status: "unread",
               data: {
                 tenant: tenantToDelete.name,
@@ -76,9 +75,9 @@ export const handleUserEvent = ({
           } else {
             const userRemovedNotification: Notification = {
               type: "info",
-              subtype: errors.tenant.accessRevoked.subtype,
+              subtype: "user-removed-from-tenant",
               date: Date.now().toString(),
-              callToAction: false,
+              notificationType: "regular",
               status: "unread",
               data: {
                 tenant: tenantToDelete.name,

package/package.json

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

package/websocket-manager.ts

@@ -6,7 +6,6 @@ import {
   Channel,
   ClusterToken,
   Environment,
-  errors,
   Instance,
   MarketplaceItem,
   Notification,
@@ -963,7 +962,7 @@ const handleEvent = async (message: WSMessage) => {
         ) {
           const roleNotification: Notification = {
             type: "info",
-            subtype: errors.tenant.roleChanged.subtype,
+            subtype: "tenant-role-changed",
             date: Date.now().toString(),
             status: "unread",
             callToAction: false,
@@ -1784,7 +1783,7 @@ const handleDeleteEvent = async (message: WSMessage) => {
     eventHelper.environment.publish.deleted(deletedEnv);
     const envNotification: Notification = {
       type: "success",
-      subtype: errors.environment.deleted.subtype,
+      subtype: "environment-deleted",
       date: Date.now().toString(),
       callToAction: false,
       status: "unread",
@@ -1804,7 +1803,7 @@ const handleDeleteEvent = async (message: WSMessage) => {
     eventHelper.account.publish.deleted(deletedAccount);
     const accountNotification: Notification = {
       type: "success",
-      subtype: errors.account.deleted.subtype,
+      subtype: "account-deleted",
       date: Date.now().toString(),
       callToAction: false,
       status: "unread",
@@ -1942,7 +1941,7 @@ const handleDeleteEvent = async (message: WSMessage) => {
         tenantsMap.set(tenantName, registryTenant);
         const registryNotification: Notification = {
           type: "success",
-          subtype: errors.registry.deleted.subtype,
+          subtype: "registry-deleted",
           date: Date.now().toString(),
           status: "unread",
           callToAction: false,
@@ -1998,7 +1997,7 @@ const handleDeleteEvent = async (message: WSMessage) => {
     if (deletedLinkInfo) {
       const unlinkNotification: Notification = {
         type: "success",
-        subtype: errors.service.unlinked.subtype,
+        subtype: "service-unlinked",
         date: Date.now().toString(),
         status: "unread",
         callToAction: false,