@drax/identity-back 0.11.4 → 0.12.1

package/dist/services/PermissionService.js

@@ -1,19 +1,19 @@
-const permissions = [];
 class PermissionService {
     static addPermission(permission) {
         if (PermissionService.hasPermission(permission))
             return;
-        permissions.push(permission);
+        PermissionService.permissions.push(permission);
     }
     static removePermission(permission) {
-        permissions.splice(permissions.indexOf(permission), 1);
+        PermissionService.permissions.splice(PermissionService.permissions.indexOf(permission), 1);
     }
     static hasPermission(permission) {
-        return permissions.includes(permission);
+        return PermissionService.permissions.includes(permission);
     }
     static getPermissions() {
-        return permissions;
+        return PermissionService.permissions;
     }
 }
+PermissionService.permissions = [];
 export default PermissionService;
 export { PermissionService };

package/dist/services/RoleService.js

@@ -1,17 +1,17 @@
 import { UnauthorizedError, ValidationError, ZodErrorToValidationError } from "@drax/common-back";
 import { AbstractService } from "@drax/crud-back";
-import { roleSchema } from "../zod/RoleZod.js";
+import { RoleBaseSchema } from "../schemas/RoleSchema.js";
 import { ZodError } from "zod";
 class RoleService extends AbstractService {
     constructor(roleRepostitory) {
-        super(roleRepostitory, roleSchema);
+        super(roleRepostitory, RoleBaseSchema);
         this._repository = roleRepostitory;
         console.log("RoleService constructor");
     }
     async create(roleData) {
         try {
             roleData.name = roleData?.name?.trim();
-            await roleSchema.parseAsync(roleData);
+            await RoleBaseSchema.parseAsync(roleData);
             const role = await this._repository.create(roleData);
             return role;
         }
@@ -26,7 +26,7 @@ class RoleService extends AbstractService {
     async update(id, roleData) {
         try {
             roleData.name = roleData?.name?.trim();
-            await roleSchema.parseAsync(roleData);
+            await RoleBaseSchema.parseAsync(roleData);
             const currentRole = await this.findById(id);
             if (currentRole.readonly) {
                 throw new ValidationError([{ field: 'name', reason: "role.readonly", value: roleData.name }]);
@@ -45,7 +45,7 @@ class RoleService extends AbstractService {
     async systemUpdate(id, roleData) {
         try {
             roleData.name = roleData?.name?.trim();
-            await roleSchema.parseAsync(roleData);
+            await RoleBaseSchema.parseAsync(roleData);
             const role = await this._repository.update(id, roleData);
             return role;
         }
@@ -109,7 +109,7 @@ class RoleService extends AbstractService {
         const roles = await this._repository.search(value, limit, filters);
         return roles;
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 5, orderBy = '', order = "asc", search = '', filters = [] }) {
         try {
             const pagination = await this._repository.paginate({ page, limit, orderBy, order, search, filters });
             return pagination;

package/dist/services/TenantService.js

@@ -1,17 +1,17 @@
 import { ZodErrorToValidationError } from "@drax/common-back";
-import { tenantSchema } from "../zod/TenantZod.js";
-import { ZodError } from "zod";
 import { AbstractService } from "@drax/crud-back";
+import { TenantBaseSchema } from "../schemas/TenantSchema.js";
+import { ZodError } from "zod";
 class TenantService extends AbstractService {
     constructor(tenantRepostitory) {
-        super(tenantRepostitory, tenantSchema);
+        super(tenantRepostitory, TenantBaseSchema);
         this._repository = tenantRepostitory;
         console.log("TenantService constructor");
     }
     async create(tenantData) {
         try {
             tenantData.name = tenantData?.name?.trim();
-            await tenantSchema.parseAsync(tenantData);
+            await TenantBaseSchema.parseAsync(tenantData);
             const tenant = await this._repository.create(tenantData);
             return tenant;
         }
@@ -26,7 +26,7 @@ class TenantService extends AbstractService {
     async update(id, tenantData) {
         try {
             tenantData.name = tenantData?.name?.trim();
-            await tenantSchema.parseAsync(tenantData);
+            await TenantBaseSchema.parseAsync(tenantData);
             const tenant = await this._repository.update(id, tenantData);
             return tenant;
         }
@@ -82,7 +82,7 @@ class TenantService extends AbstractService {
         const tenants = await this._repository.search(value, limit, filters);
         return tenants;
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 5, orderBy = '', order = "asc", search = '', filters = [] }) {
         try {
             const pagination = await this._repository.paginate({ page, limit, orderBy, order, search, filters });
             return pagination;

package/dist/services/UserApiKeyService.js

@@ -1,5 +1,5 @@
 import { DraxConfig, ZodErrorToValidationError } from "@drax/common-back";
-import { userApiKeySchema } from "../zod/UserApiKeyZod.js";
+import { UserApiKeyBaseSchema } from "../schemas/UserApiKeySchema.js";
 import { ZodError } from "zod";
 import crypto from "node:crypto";
 import AuthUtils from "../utils/AuthUtils.js";
@@ -7,7 +7,7 @@ import IdentityConfig from "../config/IdentityConfig.js";
 import { AbstractService } from "@drax/crud-back";
 class UserApiKeyService extends AbstractService {
     constructor(userApiKeyRepostitory) {
-        super(userApiKeyRepostitory, userApiKeySchema);
+        super(userApiKeyRepostitory, UserApiKeyBaseSchema);
         this._repository = userApiKeyRepostitory;
         console.log("UserApiKeyService constructor");
     }
@@ -20,7 +20,7 @@ class UserApiKeyService extends AbstractService {
                 throw new Error('ApiKey miss configuration');
             }
             userApiKeyData.secret = AuthUtils.generateHMAC(APIKEY_SECRET, secret);
-            await userApiKeySchema.parseAsync(userApiKeyData);
+            await UserApiKeyBaseSchema.parseAsync(userApiKeyData);
             const userApiKey = await this._repository.create(userApiKeyData);
             userApiKey.secret = secret;
             return userApiKey;
@@ -37,7 +37,7 @@ class UserApiKeyService extends AbstractService {
         try {
             userApiKeyData.name = userApiKeyData?.name?.trim();
             delete userApiKeyData.secret;
-            await userApiKeySchema.parseAsync(userApiKeyData);
+            await UserApiKeyBaseSchema.parseAsync(userApiKeyData);
             const userApiKey = await this._repository.update(id, userApiKeyData);
             return userApiKey;
         }
@@ -84,7 +84,7 @@ class UserApiKeyService extends AbstractService {
             throw e;
         }
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 5, orderBy = '', order = "asc", search = '', filters = [] }) {
         try {
             const pagination = await this._repository.paginate({ page, limit, orderBy, order, search, filters });
             return pagination;

package/dist/services/UserService.js

@@ -1,13 +1,13 @@
 import { ZodError } from "zod";
 import { SecuritySensitiveError, ValidationError, ZodErrorToValidationError } from "@drax/common-back";
 import AuthUtils from "../utils/AuthUtils.js";
-import { createUserSchema, editUserSchema, userBaseSchema } from "../zod/UserZod.js";
+import { UserCreateSchema, UserUpdateSchema, UserBaseSchema } from "../schemas/UserSchema.js";
 import BadCredentialsError from "../errors/BadCredentialsError.js";
 import { AbstractService } from "@drax/crud-back";
 import { randomUUID } from "crypto";
 class UserService extends AbstractService {
     constructor(userRepository) {
-        super(userRepository, userBaseSchema);
+        super(userRepository, UserBaseSchema);
         this._repository = userRepository;
         console.log("UserService constructor");
     }
@@ -18,7 +18,7 @@ class UserService extends AbstractService {
         if (user && user.active && AuthUtils.checkPassword(password, user.password)) {
             //TODO: Generar session
             const session = randomUUID();
-            const accessToken = AuthUtils.generateToken(user.id.toString(), user.username, user.role.id, user.tenant?.id, session);
+            const accessToken = AuthUtils.generateToken(user._id.toString(), user.username, user.role._id, user.tenant?._id, session);
             return { accessToken: accessToken };
         }
         else {
@@ -36,7 +36,7 @@ class UserService extends AbstractService {
         }
         if (user && user.active) {
             const session = randomUUID();
-            const accessToken = AuthUtils.generateToken(user.id.toString(), user.username, user.role.id, user.tenant?.id, session);
+            const accessToken = AuthUtils.generateToken(user._id.toString(), user.username, user.role._id, user.tenant?._id, session);
             return { accessToken: accessToken };
         }
         else {
@@ -44,7 +44,7 @@ class UserService extends AbstractService {
         }
     }
     async changeUserPassword(userId, newPassword) {
-        const user = await this.findById(userId);
+        const user = await this._repository.findByIdWithPassword(userId);
         if (user) {
             newPassword = AuthUtils.hashPassword(newPassword);
             await this._repository.changePassword(userId, newPassword);
@@ -55,7 +55,7 @@ class UserService extends AbstractService {
         }
     }
     async changeOwnPassword(userId, currentPassword, newPassword) {
-        const user = await this.findById(userId);
+        const user = await this._repository.findByIdWithPassword(userId);
         if (user && user.active) {
             if (currentPassword === newPassword) {
                 throw new ValidationError([{ field: 'newPassword', reason: 'validation.password.currentDifferent' }]);
@@ -88,7 +88,7 @@ class UserService extends AbstractService {
             const recoveryCode = randomUUID();
             const user = await this._repository.findByEmail(email);
             if (user && user.active) {
-                await this._repository.updatePartial(user.id, { recoveryCode: recoveryCode });
+                await this._repository.updatePartial(user._id, { recoveryCode: recoveryCode });
                 return recoveryCode;
             }
             else {
@@ -107,8 +107,8 @@ class UserService extends AbstractService {
             console.log("changeUserPasswordByCode user", user);
             if (user && user.active) {
                 newPassword = AuthUtils.hashPassword(newPassword);
-                await this._repository.changePassword(user.id, newPassword);
-                await this._repository.updatePartial(user.id, { recoveryCode: null });
+                await this._repository.changePassword(user._id, newPassword);
+                await this._repository.updatePartial(user._id, { recoveryCode: null });
                 return true;
             }
             else {
@@ -141,7 +141,7 @@ class UserService extends AbstractService {
     async verifyEmail(emailCode) {
         const user = await this._repository.findByEmailCode(emailCode);
         if (user && user.emailVerified === false) {
-            await this._repository.updatePartial(user.id, {
+            await this._repository.updatePartial(user._id, {
                 emailVerified: true,
                 active: true
             });
@@ -154,7 +154,7 @@ class UserService extends AbstractService {
     async verifyPhone(phoneCode) {
         const user = await this._repository.findByPhoneCode(phoneCode);
         if (user && user.phoneVerified === false) {
-            await this._repository.updatePartial(user.id, {
+            await this._repository.updatePartial(user._id, {
                 phoneVerified: true,
                 active: true
             });
@@ -170,7 +170,7 @@ class UserService extends AbstractService {
             userData.username = userData?.username.trim();
             userData.password = userData?.password.trim();
             userData.tenant = userData.tenant === "" ? null : userData.tenant;
-            await createUserSchema.parseAsync(userData);
+            await UserCreateSchema.parseAsync(userData);
             userData.password = AuthUtils.hashPassword(userData.password.trim());
             const user = await this._repository.create(userData);
             return user;
@@ -189,7 +189,7 @@ class UserService extends AbstractService {
             userData.username = userData?.username.trim();
             delete userData.password;
             userData.tenant = userData.tenant === "" ? null : userData.tenant;
-            await editUserSchema.parseAsync(userData);
+            await UserUpdateSchema.parseAsync(userData);
             const user = await this._repository.update(id, userData);
             return user;
         }
@@ -254,7 +254,7 @@ class UserService extends AbstractService {
             throw e;
         }
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 10, orderBy = '', order = "asc", search = '', filters = [] }) {
         try {
             const pagination = await this._repository.paginate({ page, limit, orderBy, order, search, filters });
             return pagination;

package/dist/setup/CreateOrUpdateRole.js

@@ -7,7 +7,7 @@ async function CreateOrUpdateRole(roleData) {
         roleData.childRoles = await Promise.all(roleData.childRoles.map(async (childRole) => {
             const role = await roleService.findByName(childRole);
             if (role) {
-                return role.id;
+                return role._id.toString();
             }
             else {
                 return childRole;
@@ -15,12 +15,15 @@ async function CreateOrUpdateRole(roleData) {
         }));
     }
     if (role) {
-        const r = await roleService.systemUpdate(role.id, roleData);
+        console.log("RoleData", roleData);
+        const r = await roleService.systemUpdate(role._id.toString(), roleData);
         console.log("Role Updated. Name: " + roleData.name);
+        return r;
     }
     else {
         const r = await roleService.create(roleData);
         console.log("Role Created. Name: " + roleData.name);
+        return r;
     }
 }
 export default CreateOrUpdateRole;

package/dist/setup/CreateUserIfNotExist.js

@@ -5,12 +5,14 @@ async function CreateUserIfNotExist(userData) {
     const roleService = RoleServiceFactory();
     const user = await userService.findByUsername(userData.username);
     if (user) {
+        return user;
     }
     else {
         const role = await roleService.findByName(userData.role);
-        userData.role = role.id;
+        userData.role = role._id.toString();
         const r = await userService.create(userData);
         console.log("User Created. Username: " + userData.username);
+        return r;
     }
 }
 export default CreateUserIfNotExist;

package/dist/setup/RecoveryUserPassword.js

@@ -2,7 +2,7 @@ import UserServiceFactory from "../factory/UserServiceFactory.js";
 async function RecoveryUserPassword(username, password) {
     const userService = UserServiceFactory();
     const user = await userService.findByUsername(username);
-    const r = await userService.changeUserPassword(user.id, password);
+    const r = await userService.changeUserPassword(user._id, password);
     console.log("User password recovered. Username: " + username);
 }
 export default RecoveryUserPassword;

package/dist/zod/EndpointZod.js

@@ -0,0 +1,9 @@
+import z from "zod";
+const loginBodyRequestSchema = z.object({
+    username: z.string(),
+    password: z.string(),
+});
+const loginBodyResponseSchema = z.object({
+    accessToken: z.string()
+});
+export { loginBodyRequestSchema, loginBodyResponseSchema };

package/dist/zod/TenantSchema.js

@@ -0,0 +1,12 @@
+import { object, string, date } from "zod";
+const TenantBaseSchema = object({
+    name: string({ required_error: "validation.required" })
+        .min(1, "validation.required")
+        .regex(/^[A-Z]/, "validation.startWithUpperCase"),
+});
+const TenantSchema = TenantBaseSchema.extend({
+    id: string(),
+    createdAt: date(),
+    updatedAt: date()
+});
+export { TenantSchema, TenantBaseSchema };

package/dist/zod/TenantZod.js

@@ -1,8 +1,10 @@
 import { object, string } from "zod";
-const tenantSchema = object({
+const TenantBaseSchema = object({
     name: string({ required_error: "validation.required" })
         .min(1, "validation.required")
         .regex(/^[A-Z]/, "validation.startWithUpperCase"),
 });
-export default tenantSchema;
-export { tenantSchema };
+const TenantSchema = TenantBaseSchema.extend({
+    id: string(),
+});
+export { TenantSchema, TenantBaseSchema };

package/dist/zod/UserApiKeyZod.js

@@ -1,9 +1,13 @@
 import { array, object, string } from "zod";
-const userApiKeySchema = object({
+const userApiKeyBaseSchema = object({
     name: string({ required_error: "validation.required" })
         .min(1, "validation.required"),
     ipv4: array(string().ip({ version: "v4", message: 'validation.invalidIpv4' })),
     ipv6: array(string().ip({ version: "v6", message: 'validation.invalidIpv6' })),
 });
-export default userApiKeySchema;
-export { userApiKeySchema };
+const userApiKeySchema = userApiKeyBaseSchema.extend({
+    id: string(),
+    createdBy: string(),
+});
+export default userApiKeyBaseSchema;
+export { userApiKeyBaseSchema, userApiKeySchema };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.11.4",
+  "version": "0.12.1",
   "description": "Identity module for user management, authentication and authorization.",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -28,11 +28,11 @@
   "author": "Cristian Incarnato & Drax Team",
   "license": "ISC",
   "dependencies": {
-    "@drax/common-back": "^0.11.3",
-    "@drax/crud-back": "^0.11.4",
-    "@drax/crud-share": "^0.11.4",
-    "@drax/email-back": "^0.11.3",
-    "@drax/identity-share": "^0.11.3",
+    "@drax/common-back": "^0.12.1",
+    "@drax/crud-back": "^0.12.1",
+    "@drax/crud-share": "^0.12.1",
+    "@drax/email-back": "^0.12.1",
+    "@drax/identity-share": "^0.12.1",
     "bcryptjs": "^2.4.3",
     "express-jwt": "^8.4.1",
     "graphql": "^16.8.2",
@@ -41,7 +41,7 @@
   },
   "peerDependencies": {
     "better-sqlite3": "^11.0.0",
-    "fastify": "^4.27.0",
+    "fastify": "^5.2.1",
     "mongoose": "^8.6.3",
     "mongoose-paginate-v2": "^1.8.3",
     "mongoose-unique-validator": "^5.0.1"
@@ -56,12 +56,13 @@
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.10",
     "tsx": "^3.12.7",
-    "typescript": "^5.4.5"
+    "typescript": "^5.4.5",
+    "vitest": "^3.0.8"
   },
   "config": {
     "mongodbMemoryServer": {
       "debug": "0"
     }
   },
-  "gitHead": "543e9fc9947da228d0f2dc37d2bae3a39ec32250"
+  "gitHead": "76fd366e12449f5f605662197f985a28d98058a2"
 }

package/src/controllers/RoleController.ts

@@ -1,6 +1,6 @@
 import type {IRole, IRoleBase} from "@drax/identity-share";
 import {AbstractFastifyController} from "@drax/crud-back";
-import {ValidationError, UnauthorizedError} from "@drax/common-back";
+import { NotFoundError} from "@drax/common-back";
 
 import RoleServiceFactory from "../factory/RoleServiceFactory.js";
 import RoleService from "../services/RoleService.js";
@@ -21,19 +21,12 @@ class RoleController extends AbstractFastifyController<IRole, IRoleBase, IRoleBa
             const name = request.params.name
             const roleService = RoleServiceFactory()
             let role = await roleService.findByName(name)
+            if(!role){
+                throw new NotFoundError()
+            }
             return role
         } catch (e) {
-            console.error(e)
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message, inputErrors: e.errors})
-            } else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message})
-            } else {
-                reply.statusCode = 500
-                reply.send({error: 'INTERNAL_SERVER_ERROR'})
-            }
+            this.handleError(e,reply)
         }
     }
 
@@ -43,22 +36,12 @@ class RoleController extends AbstractFastifyController<IRole, IRoleBase, IRoleBa
             const roleService = RoleServiceFactory()
             let roles = await roleService.fetchAll()
             if(request.rbac.getRole?.childRoles?.length > 0) {
-                return roles.filter(role => request.rbac.getRole.childRoles.some(childRole => childRole.id === role.id));
+                return roles.filter(role => request.rbac.getRole.childRoles.some(childRole => childRole._id === role._id));
             }else{
                 return roles
             }
         } catch (e) {
-            console.error(e)
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message, inputErrors: e.errors})
-            } else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message})
-            } else {
-                reply.statusCode = 500
-                reply.send({error: 'INTERNAL_SERVER_ERROR'})
-            }
+            this.handleError(e,reply)
         }
     }
 
@@ -68,23 +51,12 @@ class RoleController extends AbstractFastifyController<IRole, IRoleBase, IRoleBa
             let permissions = PermissionService.getPermissions()
             return permissions
         }catch (e){
-            console.error(e)
-            if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message})
-            } else {
-                reply.statusCode = 500
-                reply.send({error: 'INTERNAL_SERVER_ERROR'})
-            }
+            this.handleError(e,reply)
         }
     }
 
 
 
-    async xxxx(request, reply) {
-
-    }
-
 }
 
 export default RoleController;

package/src/controllers/TenantController.ts

@@ -14,37 +14,14 @@ class TenantController extends AbstractFastifyController<ITenant, ITenantBase, I
         super(TenantServiceFactory(), TenantPermissions)
     }
 
-    async findByName(request, reply) {
-        try {
-            request.rbac.assertPermission(this.permission.View)
-            if(!request.params.id){
-                reply.statusCode = 400
-                reply.send({error: 'BAD REQUEST'})
-            }
-            const name = request.params.name
-            let item = await this.service.findByName(name)
-            return item
-        } catch (e) {
-            console.error(e)
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message, inputErrors: e.errors})
-            } else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message})
-            } else {
-                reply.statusCode = 500
-                reply.send({error: 'INTERNAL_SERVER_ERROR'})
-            }
-        }
-    }
+
 
     async all(request, reply) {
         try {
             request.rbac.assertPermission(this.permission.View)
             let tenants = await this.service.fetchAll()
             if(request.rbac.getAuthUser.tenantId){
-                return tenants.filter(t => t.id === request.rbac.getAuthUser.tenantId)
+                return tenants.filter(t => t._id === request.rbac.getAuthUser.tenantId)
             }else{
                 return tenants
             }

package/src/controllers/UserApiKeyController.ts

@@ -27,7 +27,7 @@ class UserApiKeyController extends AbstractFastifyController<IUserApiKey, IUserA
             const filters = []
 
             if(!request.rbac.hasPermission(UserApiKeyPermissions.View)){
-                filters.push({field: "user", operator: "eq", value: request.rbac.authUser.id})
+                filters.push({field: "user", operator: "eq", value: request.rbac.userId})
             }
 
             const page = request.query.page
@@ -58,9 +58,14 @@ class UserApiKeyController extends AbstractFastifyController<IUserApiKey, IUserA
 
     async create(request, reply) {
         try {
-            request.rbac.assertPermission(UserApiKeyPermissions.Create)
+            request.rbac.assertOrPermissions([UserApiKeyPermissions.Create, UserApiKeyPermissions.CreateMy])
             const payload = request.body
-            payload.user = request.rbac.authUser.id
+
+            if(!request.rbac.hasPermission(UserApiKeyPermissions.Create) || !payload.user){
+                payload.user = request.rbac.userId
+            }
+
+            payload.createdBy = request.rbac.userId
 
             const userApiKeyService = UserApiKeyServiceFactory()