@drax/identity-back 0.5.6 → 0.5.12

package/dist/controllers/UserController.js

@@ -92,6 +92,33 @@ class UserController extends AbstractFastifyController {
             }
         }
     }
+    async search(request, reply) {
+        try {
+            request.rbac.assertPermission(UserPermissions.View);
+            const filters = [];
+            if (request.rbac.getAuthUser.tenantId) {
+                filters.push({ field: 'tenant', operator: 'eq', value: request.rbac.getAuthUser.tenantId });
+            }
+            const search = request.query.search;
+            let item = await this.service.search(search, 1000, filters);
+            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 create(request, reply) {
         try {
             request.rbac.assertPermission(UserPermissions.Create);

package/dist/repository/mongo/UserMongoRepository.js

@@ -4,6 +4,7 @@ import { MongoServerError } from "mongodb";
 import RoleMongoRepository from "./RoleMongoRepository.js";
 class UserMongoRepository {
     constructor() {
+        this._searchFields = ['name', 'username', 'email', 'phone'];
         this.roleRepository = new RoleMongoRepository();
     }
     async create(userData) {
@@ -53,11 +54,7 @@ class UserMongoRepository {
     async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         const query = {};
         if (search) {
-            query['$or'] = [
-                { username: new RegExp(search, 'i') },
-                { email: new RegExp(search, 'i') },
-                { name: new RegExp(search, 'i') },
-            ];
+            query['$or'] = this._searchFields.map(field => ({ [field]: new RegExp(search.toString(), 'i') }));
         }
         MongooseQueryFilter.applyFilters(query, filters);
         const sort = MongooseSort.applySort(orderBy, order);
@@ -70,6 +67,15 @@ class UserMongoRepository {
             items: userPaginated.docs
         };
     }
+    async search(value, limit = 1000, filters = []) {
+        const query = {};
+        if (value) {
+            query['$or'] = this._searchFields.map(field => ({ [field]: new RegExp(value.toString(), 'i') }));
+        }
+        MongooseQueryFilter.applyFilters(query, filters);
+        const items = await UserModel.find(query).limit(limit).exec();
+        return items;
+    }
     async changePassword(id, password) {
         try {
             await UserModel.findOneAndUpdate({ _id: id }, { password }).exec();

package/dist/routes/UserRoutes.js

@@ -3,6 +3,7 @@ async function UserRoutes(fastify, options) {
     const controller = new UserController();
     fastify.post('/api/auth', (req, rep) => controller.auth(req, rep));
     fastify.get('/api/me', (req, rep) => controller.me(req, rep));
+    fastify.get('/api/users/search', (req, rep) => controller.search(req, rep));
     fastify.get('/api/users/export', (req, rep) => controller.export(req, rep));
     fastify.get('/api/users', (req, rep) => controller.paginate(req, rep));
     fastify.post('/api/users', (req, rep) => controller.create(req, rep));

package/dist/services/RoleService.js

@@ -105,9 +105,8 @@ class RoleService extends AbstractService {
         const roles = await this._repository.fetchAll();
         return roles;
     }
-    async search(value) {
-        const limit = 100;
-        const roles = await this._repository.search(value, limit);
+    async search(value, limit = 1000, filters = []) {
+        const roles = await this._repository.search(value, limit, filters);
         return roles;
     }
     async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {

package/dist/services/TenantService.js

@@ -78,9 +78,8 @@ class TenantService extends AbstractService {
             throw e;
         }
     }
-    async search(value) {
-        const limit = 100;
-        const tenants = await this._repository.search(value, limit);
+    async search(value, limit = 1000, filters = []) {
+        const tenants = await this._repository.search(value, limit, filters);
         return tenants;
     }
     async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {

package/dist/services/UserService.js

@@ -144,9 +144,8 @@ class UserService extends AbstractService {
             throw e;
         }
     }
-    async search(value) {
-        const limit = 100;
-        const users = await this._repository.search(value, limit);
+    async search(value, limit = 1000, filters = []) {
+        const users = await this._repository.search(value, limit, filters);
         return users;
     }
 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.5.6",
+  "version": "0.5.12",
   "description": "Identity module for user management, authentication and authorization.",
   "main": "dist/index.js",
   "types": "dist/types/index.d.ts",
@@ -29,8 +29,8 @@
   "license": "ISC",
   "dependencies": {
     "@drax/common-back": "^0.5.6",
-    "@drax/crud-back": "^0.5.6",
-    "@drax/crud-share": "^0.5.5",
+    "@drax/crud-back": "^0.5.12",
+    "@drax/crud-share": "^0.5.12",
     "@drax/identity-share": "^0.5.1",
     "bcryptjs": "^2.4.3",
     "express-jwt": "^8.4.1",
@@ -62,5 +62,5 @@
       "debug": "0"
     }
   },
-  "gitHead": "ecb0ad934d7e7b25ee3e74e91a7fbba768305e01"
+  "gitHead": "440be142d8877498814d5c4914e645004fd60f90"
 }

package/src/controllers/UserController.ts

@@ -8,6 +8,7 @@ import UserPermissions from "../permissions/UserPermissions.js";
 import BadCredentialsError from "../errors/BadCredentialsError.js";
 import {join} from "path";
 import {IdentityConfig} from "../config/IdentityConfig.js";
+import type {FastifyReply} from "fastify";
 
 const BASE_FILE_DIR = DraxConfig.getOrLoad(CommonConfig.FileDir) || 'files';
 const AVATAR_DIR = DraxConfig.getOrLoad(IdentityConfig.AvatarDir) || 'avatar';
@@ -98,6 +99,32 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
         }
     }
 
+
+    async search(request, reply) {
+        try {
+            request.rbac.assertPermission(UserPermissions.View)
+            const filters = []
+            if(request.rbac.getAuthUser.tenantId){
+                filters.push({field: 'tenant', operator: 'eq', value: request.rbac.getAuthUser.tenantId})
+            }
+            const search = request.query.search
+            let item = await this.service.search(search,1000,filters)
+            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 create(request, reply) {
         try {
             request.rbac.assertPermission(UserPermissions.Create)

package/src/interfaces/IUserRepository.ts

@@ -1,5 +1,5 @@
 import {IUser, IUserCreate, IUserUpdate} from '@drax/identity-share'
-import {IDraxCrud} from "@drax/crud-share";
+import {IDraxCrud, IDraxFieldFilter} from "@drax/crud-share";
 
 interface IUserRepository extends IDraxCrud<IUser, IUserCreate, IUserUpdate>{
     findById(id: string): Promise<IUser | null>;

package/src/repository/mongo/UserMongoRepository.ts

@@ -12,11 +12,12 @@ import type {IUserRepository} from "../../interfaces/IUserRepository";
 import {Cursor, PaginateResult} from "mongoose";
 import RoleMongoRepository from "./RoleMongoRepository.js";
 import {IDraxFindOptions, IDraxPaginateOptions, IDraxPaginateResult} from "@drax/crud-share";
-import {IRole} from "@drax/identity-share";
+import {IRole, ITenant} from "@drax/identity-share";
+import type {IDraxFieldFilter} from "@drax/crud-share/dist";
 
 class UserMongoRepository implements IUserRepository {
     private roleRepository: RoleMongoRepository;
-
+    _searchFields = ['name','username','email','phone']
 
     constructor() {
         this.roleRepository = new RoleMongoRepository()
@@ -84,11 +85,7 @@ class UserMongoRepository implements IUserRepository {
         const query = {}
 
         if(search){
-            query['$or'] = [
-                {username: new RegExp(search, 'i')},
-                {email: new RegExp(search, 'i')},
-                {name: new RegExp(search, 'i')},
-            ]
+            query['$or'] = this._searchFields.map(field => ({[field]: new RegExp(search.toString(), 'i')}))
         }
 
         MongooseQueryFilter.applyFilters(query, filters)
@@ -106,6 +103,17 @@ class UserMongoRepository implements IUserRepository {
         }
     }
 
+
+    async search(value: string, limit: number = 1000, filters: IDraxFieldFilter[] = []): Promise<IUser[]> {
+        const query = {}
+        if(value){
+            query['$or'] = this._searchFields.map(field => ({[field]: new RegExp(value.toString(), 'i')}))
+        }
+        MongooseQueryFilter.applyFilters(query, filters)
+        const items: mongoose.HydratedDocument<IUser>[] = await UserModel.find(query).limit(limit).exec()
+        return items
+    }
+
     async changePassword(id: string, password: string):Promise<boolean> {
         try{
         await UserModel.findOneAndUpdate({_id: id}, {password}).exec()

package/src/routes/UserRoutes.ts

@@ -8,6 +8,8 @@ async function UserRoutes(fastify, options) {
 
     fastify.get('/api/me', (req,rep) => controller.me(req,rep))
 
+    fastify.get('/api/users/search', (req,rep) => controller.search(req,rep) )
+
     fastify.get('/api/users/export', (req,rep) => controller.export(req,rep) )
 
     fastify.get('/api/users', (req,rep) => controller.paginate(req,rep))

package/src/services/RoleService.ts

@@ -116,9 +116,8 @@ class RoleService extends AbstractService<IRole, IRoleBase, IRoleBase> {
         return roles
     }
 
-    async search(value: any): Promise<IRole[]> {
-        const limit = 100
-        const roles: IRole[] = await this._repository.search(value, limit);
+    async search(value: any, limit=1000, filters=[]): Promise<IRole[]> {
+        const roles: IRole[] = await this._repository.search(value, limit, filters);
         return roles;
     }
 

package/src/services/TenantService.ts

@@ -90,9 +90,8 @@ class TenantService extends AbstractService<ITenant,ITenantBase,ITenantBase> {
 
     }
 
-    async search(value: any): Promise<ITenant[]> {
-        const limit = 100
-        const tenants: ITenant[] = await this._repository.search(value, limit);
+    async search(value: any, limit=1000, filters=[]): Promise<ITenant[]> {
+        const tenants: ITenant[] = await this._repository.search(value, limit,filters);
         return tenants;
     }
 

package/src/services/UserService.ts

@@ -178,9 +178,8 @@ class UserService extends AbstractService<IUser, IUserCreate, IUserUpdate>{
 
     }
 
-    async search(value: any): Promise<IUser[]> {
-        const limit = 100
-        const users: IUser[] = await this._repository.search(value, limit);
+    async search(value: any, limit: number = 1000, filters = []): Promise<IUser[]> {
+        const users: IUser[] = await this._repository.search(value, limit, filters);
         return users;
     }
 }