hh-contracts 0.0.19 → 0.0.21

package/build/common/constants/app-ability.constant.js

@@ -13,13 +13,13 @@ var AppAbility;
     };
     AppAbility.ACTION_VALUES = Object.values(AppAbility.ACTION);
     AppAbility.SUBJECT = {
-        users: 'Users',
-        roles: 'Roles',
-        permissions: 'Permissions',
-        hotels: 'Hotels',
-        rooms: 'Rooms',
-        roomCategories: 'Room categories',
-        hotelsWebsocketClients: 'Hotels websocket clients',
+        users: 'users',
+        roles: 'roles',
+        permissions: 'permissions',
+        hotels: 'hotels',
+        rooms: 'rooms',
+        roomCategories: 'roomCategories',
+        hotelsWebsocketClients: 'hotelsWebsocketClients',
         all: 'all',
     };
     AppAbility.SUBJECT_VALUES = Object.values(AppAbility.SUBJECT);

package/build/permissions/contracts/create-permission.contract.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreatePermissionContract = void 0;
+const zod_1 = require("zod");
 const common_1 = require("../../common");
 const permissions_api_1 = require("../permissions.api");
 const permission_model_1 = require("../permission.model");
@@ -9,7 +10,20 @@ const CreatePermissionContractRequestSchema = permission_model_1.PermissionSchem
     createdAt: true,
     updatedAt: true,
 }).extend({
-    conditions: common_1.JsonSchema.optional().nullable(),
+    conditions: zod_1.z
+        .string()
+        .optional()
+        .refine(value => {
+        if (value === undefined)
+            return true;
+        try {
+            JSON.parse(value);
+            return true;
+        }
+        catch (err) {
+            return false;
+        }
+    }, { message: 'invalidJson' }),
 });
 var CreatePermissionContract;
 (function (CreatePermissionContract) {

package/build/permissions/permission.model.js

@@ -5,10 +5,20 @@ const zod_1 = require("zod");
 const common_1 = require("../common");
 exports.PermissionSchema = zod_1.z
     .object({
-    id: zod_1.z.number().positive(),
-    name: zod_1.z.string().trim().min(1).max(50),
-    action: zod_1.z.nativeEnum(common_1.AppAbility.ACTION),
-    subject: zod_1.z.nativeEnum(common_1.AppAbility.SUBJECT),
-    conditions: zod_1.z.unknown().optional().nullable(),
+    id: zod_1.z
+        .number({ invalid_type_error: 'permissionIdInvalid' })
+        .positive({ message: 'permissionIdMustBePositive' }),
+    name: zod_1.z
+        .string({ required_error: 'permissionNameRequired' })
+        .trim()
+        .min(1, { message: 'permissionNameRequired' })
+        .max(50, { message: 'permissionNameTooLong' }),
+    action: zod_1.z.nativeEnum(common_1.AppAbility.ACTION, {
+        invalid_type_error: 'permissionActionInvalid',
+    }),
+    subject: zod_1.z.nativeEnum(common_1.AppAbility.SUBJECT, {
+        invalid_type_error: 'permissionSubjectInvalid',
+    }),
+    conditions: zod_1.z.string().optional().nullable(),
 })
     .merge(common_1.TimestampSchema);

package/common/constants/app-ability.constant.ts

@@ -11,13 +11,13 @@ export namespace AppAbility {
   export const ACTION_VALUES = Object.values(ACTION) as [TAction];
 
   export const SUBJECT = {
-    users: 'Users',
-    roles: 'Roles',
-    permissions: 'Permissions',
-    hotels: 'Hotels',
-    rooms: 'Rooms',
-    roomCategories: 'Room categories',
-    hotelsWebsocketClients: 'Hotels websocket clients',
+    users: 'users',
+    roles: 'roles',
+    permissions: 'permissions',
+    hotels: 'hotels',
+    rooms: 'rooms',
+    roomCategories: 'roomCategories',
+    hotelsWebsocketClients: 'hotelsWebsocketClients',
     all: 'all',
   } as const;
   export type TSubject = (typeof SUBJECT)[keyof typeof SUBJECT];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hh-contracts",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "",
   "main": "./build/index.js",
   "scripts": {

package/permissions/contracts/create-permission.contract.ts

@@ -8,7 +8,21 @@ const CreatePermissionContractRequestSchema = PermissionSchema.omit({
   createdAt: true,
   updatedAt: true,
 }).extend({
-  conditions: JsonSchema.optional().nullable(),
+  conditions: z
+    .string()
+    .optional()
+    .refine(
+      value => {
+        if (value === undefined) return true;
+        try {
+          JSON.parse(value);
+          return true;
+        } catch (err) {
+          return false;
+        }
+      },
+      { message: 'invalidJson' },
+    ),
 });
 
 export namespace CreatePermissionContract {

package/permissions/permission.model.ts

@@ -3,11 +3,21 @@ import { AppAbility, TimestampSchema } from '../common';
 
 export const PermissionSchema = z
   .object({
-    id: z.number().positive(),
-    name: z.string().trim().min(1).max(50),
-    action: z.nativeEnum(AppAbility.ACTION),
-    subject: z.nativeEnum(AppAbility.SUBJECT),
-    conditions: z.unknown().optional().nullable(),
+    id: z
+      .number({ invalid_type_error: 'permissionIdInvalid' })
+      .positive({ message: 'permissionIdMustBePositive' }),
+    name: z
+      .string({ required_error: 'permissionNameRequired' })
+      .trim()
+      .min(1, { message: 'permissionNameRequired' })
+      .max(50, { message: 'permissionNameTooLong' }),
+    action: z.nativeEnum(AppAbility.ACTION, {
+      invalid_type_error: 'permissionActionInvalid',
+    }),
+    subject: z.nativeEnum(AppAbility.SUBJECT, {
+      invalid_type_error: 'permissionSubjectInvalid',
+    }),
+    conditions: z.string().optional().nullable(),
   })
   .merge(TimestampSchema);
 export type TPersistedPermission = z.infer<typeof PermissionSchema>;