@drax/identity-back 0.1.8 → 0.3.0

package/dist/graphql/resolvers/role.resolvers.js

@@ -64,7 +64,7 @@ export default {
                 throw new GraphQLError('error.server');
             }
         },
-        paginateRole: async (_, { options = { page: 1, limit: 5, orderBy: "", orderDesc: false, search: "", filters: [] } }, { rbac }) => {
+        paginateRole: async (_, { options = { page: 1, limit: 5, orderBy: "", order: false, search: "", filters: [] } }, { rbac }) => {
             try {
                 rbac.assertPermission(IdentityPermissions.ViewRole);
                 const roleService = RoleServiceFactory();

package/dist/graphql/resolvers/tenant.resolvers.js

@@ -50,7 +50,7 @@ export default {
                 throw new GraphQLError('error.server');
             }
         },
-        paginateTenant: async (_, { options = { page: 1, limit: 5, orderBy: "", orderDesc: false, search: "", filters: [] } }, { rbac }) => {
+        paginateTenant: async (_, { options = { page: 1, limit: 5, orderBy: "", order: false, search: "", filters: [] } }, { rbac }) => {
             try {
                 rbac.assertPermission(IdentityPermissions.ViewTenant);
                 const tenantService = TenantServiceFactory();

package/dist/graphql/resolvers/user-api-key.resolvers.js

@@ -6,7 +6,7 @@ import UnauthorizedError from "../../errors/UnauthorizedError.js";
 import * as crypto from "node:crypto";
 export default {
     Query: {
-        paginateUserApiKey: async (_, { options = { page: 1, limit: 5, orderBy: "", orderDesc: false, search: "", filters: [] } }, { rbac, authUser }) => {
+        paginateUserApiKey: async (_, { options = { page: 1, limit: 5, orderBy: "", order: false, search: "", filters: [] } }, { rbac, authUser }) => {
             try {
                 rbac.assertAuthenticated();
                 rbac.assertOrPermissions([

package/dist/graphql/resolvers/user.resolvers.js

@@ -38,7 +38,7 @@ export default {
                 throw new GraphQLError('error.server');
             }
         },
-        paginateUser: async (_, { options = { page: 1, limit: 5, orderBy: "", orderDesc: false, search: "", filters: [] } }, { rbac }) => {
+        paginateUser: async (_, { options = { page: 1, limit: 5, orderBy: "", order: false, search: "", filters: [] } }, { rbac }) => {
             try {
                 rbac.assertPermission(IdentityPermissions.ViewUser);
                 let userService = UserServiceFactory();
@@ -46,7 +46,7 @@ export default {
                     options.filters = [];
                 }
                 if (rbac.getAuthUser.tenantId) {
-                    options.filters.push({ field: 'tenant', operator: '$eq', value: rbac.getAuthUser.tenantId });
+                    options.filters.push({ field: 'tenant', operator: 'eq', value: rbac.getAuthUser.tenantId });
                 }
                 return await userService.paginate(options);
             }

package/dist/repository/mongo/RoleMongoRepository.js

@@ -1,4 +1,5 @@
 import { RoleModel } from "../../models/RoleModel.js";
+import { MongooseQueryFilter, MongooseSort } from "@drax/common-back";
 class RoleMongoRepository {
     async create(roleData) {
         const role = new RoleModel(roleData);
@@ -26,14 +27,16 @@ class RoleMongoRepository {
         const roles = await RoleModel.find().populate('childRoles').exec();
         return roles;
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         const query = {};
         if (search) {
             query['$or'] = [
                 { name: new RegExp(search, 'i') },
             ];
         }
-        const options = { populate: ['childRoles'], page, limit };
+        MongooseQueryFilter.applyFilters(query, filters);
+        const sort = MongooseSort.applySort(orderBy, order);
+        const options = { populate: ['childRoles'], page, limit, sort };
         const roles = await RoleModel.paginate(query, options);
         return {
             page: page,

package/dist/repository/mongo/TenantMongoRepository.js

@@ -1,4 +1,5 @@
 import { TenantModel } from "../../models/TenantModel.js";
+import { MongooseSort, MongooseQueryFilter } from "@drax/common-back";
 class TenantMongoRepository {
     async create(tenantData) {
         const tenant = new TenantModel(tenantData);
@@ -25,14 +26,16 @@ class TenantMongoRepository {
         const tenants = await TenantModel.find().exec();
         return tenants;
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         const query = {};
         if (search) {
             query['$or'] = [
                 { name: new RegExp(search, 'i') },
             ];
         }
-        const options = { page, limit };
+        MongooseQueryFilter.applyFilters(query, filters);
+        const sort = MongooseSort.applySort(orderBy, order);
+        const options = { page, limit, sort };
         const tenants = await TenantModel.paginate(query, options);
         return {
             page: page,

package/dist/repository/mongo/UserApiKeyMongoRepository.js

@@ -1,5 +1,5 @@
 import { UserApiKeyModel } from "../../models/UserApiKeyModel.js";
-import { mongoose, MongooseErrorToValidationError, MongoServerErrorToValidationError } from "@drax/common-back";
+import { mongoose, MongooseErrorToValidationError, MongooseQueryFilter, MongooseSort, MongoServerErrorToValidationError } from "@drax/common-back";
 import { MongoServerError } from "mongodb";
 class UserMongoRepository {
     constructor() {
@@ -47,7 +47,7 @@ class UserMongoRepository {
         const userApiKey = await UserApiKeyModel.findOne({ secret: { $eq: secret }, deleted: { $ne: true } }).populate({ path: 'user', populate: { path: 'tenant role' } }).exec();
         return userApiKey;
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         const query = {
             deleted: false
         };
@@ -56,20 +56,9 @@ class UserMongoRepository {
                 { name: new RegExp(search, 'i') },
             ];
         }
-        if (filters) {
-            for (const filter of filters) {
-                if (['eq', '$eq'].includes(filter.operator)) {
-                    query[filter.field] = { $eq: filter.value };
-                }
-                if (['ne', '$ne'].includes(filter.operator)) {
-                    query[filter.field] = { $ne: filter.value };
-                }
-                if (['in', '$in'].includes(filter.operator)) {
-                    query[filter.field] = { $in: filter.value };
-                }
-            }
-        }
-        const options = { populate: ['user', 'user.tenant', 'user.role'], page: page, limit: limit };
+        MongooseQueryFilter.applyFilters(query, filters);
+        const sort = MongooseSort.applySort(orderBy, order);
+        const options = { populate: ['user', 'user.tenant', 'user.role'], page, limit, sort };
         const userApiKeyPaginated = await UserApiKeyModel.paginate(query, options);
         return {
             page: page,

package/dist/repository/mongo/UserMongoRepository.js

@@ -1,5 +1,5 @@
 import { UserModel } from "../../models/UserModel.js";
-import { mongoose, MongooseErrorToValidationError, MongoServerErrorToValidationError, ValidationError } from "@drax/common-back";
+import { mongoose, MongooseErrorToValidationError, MongooseQueryFilter, MongooseSort, MongoServerErrorToValidationError, ValidationError } from "@drax/common-back";
 import { MongoServerError } from "mongodb";
 import RoleMongoRepository from "./RoleMongoRepository.js";
 class UserMongoRepository {
@@ -50,7 +50,7 @@ class UserMongoRepository {
         const user = await UserModel.findOne({ username: username }).populate(['role', 'tenant']).exec();
         return user;
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         const query = {};
         if (search) {
             query['$or'] = [
@@ -59,20 +59,9 @@ class UserMongoRepository {
                 { name: new RegExp(search, 'i') },
             ];
         }
-        if (filters) {
-            for (const filter of filters) {
-                if (['eq', '$eq'].includes(filter.operator)) {
-                    query[filter.field] = { $eq: filter.value };
-                }
-                if (['ne', '$ne'].includes(filter.operator)) {
-                    query[filter.field] = { $ne: filter.value };
-                }
-                if (['in', '$in'].includes(filter.operator)) {
-                    query[filter.field] = { $in: filter.value };
-                }
-            }
-        }
-        const options = { populate: ['role', 'tenant'], page: page, limit: limit };
+        MongooseQueryFilter.applyFilters(query, filters);
+        const sort = MongooseSort.applySort(orderBy, order);
+        const options = { populate: ['role', 'tenant'], page, limit, sort };
         const userPaginated = await UserModel.paginate(query, options);
         return {
             page: page,

package/dist/repository/sqlite/RoleSqliteRepository.js

@@ -1,6 +1,6 @@
 import sqlite from "better-sqlite3";
 import { randomUUID } from "node:crypto";
-import { SqliteErrorToValidationError, SqliteTableBuilder } from "@drax/common-back";
+import { SqliteErrorToValidationError, SqliteTableBuilder, SqlQueryFilter, SqlSort } from "@drax/common-back";
 const tableFields = [
     { name: "name", type: "TEXT", unique: true, primary: false },
     { name: "permissions", type: "TEXT", unique: false, primary: false },
@@ -67,13 +67,16 @@ class RoleSqliteRepository {
             throw SqliteErrorToValidationError(e, roleData);
         }
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         const offset = page > 1 ? (page - 1) * limit : 0;
         let where = "";
         if (search) {
             where = ` WHERE name LIKE '%${search}%'`;
         }
+        where = SqlQueryFilter.applyFilters(where, filters);
+        const sort = SqlSort.applySort(orderBy, order);
         const rCount = this.db.prepare('SELECT COUNT(*) as count FROM roles' + where).get();
+        where += sort;
         const roles = this.db.prepare('SELECT * FROM roles ' + where + ' LIMIT ? OFFSET ?').all([limit, offset]);
         for (const role of roles) {
             await this.populateRole(role);

package/dist/repository/sqlite/TenantSqliteRepository.js

@@ -1,6 +1,6 @@
 import sqlite from "better-sqlite3";
 import { randomUUID } from "node:crypto";
-import { SqliteErrorToValidationError, SqliteTableBuilder } from "@drax/common-back";
+import { SqliteErrorToValidationError, SqliteTableBuilder, SqlQueryFilter, SqlSort } from "@drax/common-back";
 const tableFields = [
     { name: "name", type: "TEXT", unique: false, primary: false },
     { name: "createdAt", type: "TEXT", unique: false, primary: false },
@@ -78,13 +78,16 @@ class TenantSqliteRepository {
         }
         return tenants;
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         const offset = page > 1 ? (page - 1) * limit : 0;
         let where = "";
         if (search) {
             where = ` WHERE name LIKE '%${search}%'`;
         }
+        where = SqlQueryFilter.applyFilters(where, filters);
+        const sort = SqlSort.applySort(orderBy, order);
         const rCount = this.db.prepare('SELECT COUNT(*) as count FROM tenants' + where).get();
+        where += sort;
         const tenants = this.db.prepare('SELECT * FROM tenants ' + where + ' LIMIT ? OFFSET ?').all([limit, offset]);
         return {
             page: page,

package/dist/repository/sqlite/UserApiKeySqliteRepository.js

@@ -1,6 +1,6 @@
 import sqlite from "better-sqlite3";
 import { randomUUID } from "node:crypto";
-import { SqliteErrorToValidationError, SqliteTableBuilder } from "@drax/common-back";
+import { SqliteErrorToValidationError, SqliteTableBuilder, SqlQueryFilter, SqlSort } from "@drax/common-back";
 import UserSqliteRepository from "./UserSqliteRepository.js";
 const tableFields = [
     { name: "secret", type: "TEXT", unique: true, primary: false },
@@ -107,29 +107,17 @@ class UserApiKeySqliteRepository {
         stmt.run(id);
         return true;
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         const offset = page > 1 ? (page - 1) * limit : 0;
         let where = "";
         if (search) {
             where = ` WHERE name LIKE '%${search}%'`;
         }
-        let whereFilters = [];
-        if (filters && filters.length > 0) {
-            where = where ? ` AND ` : ` WHERE `;
-            for (const filter of filters) {
-                if (['eq', '$eq'].includes(filter.operator)) {
-                    whereFilters.push(` ${filter.field} = '${filter.value}' `);
-                }
-                if (['ne', '$ne'].includes(filter.operator)) {
-                    whereFilters.push(` ${filter.field} != '${filter.value}' `);
-                }
-                if (['in', '$in'].includes(filter.operator)) {
-                    whereFilters.push(` ${filter.field} LIKE '%${filter.value}%' `);
-                }
-            }
-            where += whereFilters.join(" AND ");
-        }
+        where = SqlQueryFilter.applyFilters(where, filters);
+        const sort = SqlSort.applySort(orderBy, order);
+        console.log("where", where);
         const rCount = this.db.prepare('SELECT COUNT(*) as count FROM user_api_keys' + where).get();
+        where += sort;
         const userApiKeys = this.db.prepare('SELECT * FROM user_api_keys ' + where + ' LIMIT ? OFFSET ?').all([limit, offset]);
         for (const userApiKey of userApiKeys) {
             userApiKey.ipv4 = userApiKey.ipv4 != "" ? userApiKey.ipv4.split(',') : [];

package/dist/repository/sqlite/UserSqliteRepository.js

@@ -1,6 +1,6 @@
 import sqlite from "better-sqlite3";
 import { randomUUID } from "node:crypto";
-import { SqliteErrorToValidationError, SqliteTableBuilder, ValidationError } from "@drax/common-back";
+import { SqliteErrorToValidationError, SqliteTableBuilder, SqlQueryFilter, SqlSort, ValidationError } from "@drax/common-back";
 import RoleSqliteRepository from "./RoleSqliteRepository.js";
 import TenantSqliteRepository from "./TenantSqliteRepository.js";
 const tableFields = [
@@ -110,30 +110,17 @@ class UserSqliteRepository {
         user.tenant = await this.findTenantById(user.tenant);
         return user;
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         const offset = page > 1 ? (page - 1) * limit : 0;
         let where = "";
         if (search) {
             where = ` WHERE (name LIKE '%${search}%' OR username LIKE '%${search}%') `;
         }
-        let whereFilters = [];
-        if (filters && filters.length > 0) {
-            where = where ? ` AND ` : ` WHERE `;
-            for (const filter of filters) {
-                if (['eq', '$eq'].includes(filter.operator)) {
-                    whereFilters.push(` ${filter.field} = '${filter.value}' `);
-                }
-                if (['ne', '$ne'].includes(filter.operator)) {
-                    whereFilters.push(` ${filter.field} != '${filter.value}' `);
-                }
-                if (['in', '$in'].includes(filter.operator)) {
-                    whereFilters.push(` ${filter.field} LIKE '%${filter.value}%' `);
-                }
-            }
-            where += whereFilters.join(" AND ");
-        }
-        console.log("paginate where ", where, "search", search, "filters", filters, "whereFilters", whereFilters);
+        where = SqlQueryFilter.applyFilters(where, filters);
+        const sort = SqlSort.applySort(orderBy, order);
+        console.log("paginate where ", where, "search", search, "filters", filters);
         const rCount = this.db.prepare('SELECT COUNT(*) as count FROM users' + where).get();
+        where += sort;
         const users = this.db.prepare('SELECT * FROM users' + where + ' LIMIT ? OFFSET ?').all([limit, offset]);
         for (const user of users) {
             let role = await this.findRoleById(user.role);

package/dist/routes/RoleRoutes.js

@@ -104,10 +104,10 @@ async function RoleRoutes(fastify, options) {
             const page = request.query.page;
             const limit = request.query.limit;
             const orderBy = request.query.orderBy;
-            const orderDesc = request.query.orderDesc;
+            const order = request.query.order;
             const search = request.query.search;
             const roleService = RoleServiceFactory();
-            let paginateResult = await roleService.paginate({ page, limit, search, orderBy, orderDesc });
+            let paginateResult = await roleService.paginate({ page, limit, search, orderBy, order });
             return paginateResult;
         }
         catch (e) {

package/dist/routes/TenantRoutes.js

@@ -85,10 +85,10 @@ async function TenantRoutes(fastify, options) {
             const page = request.query.page;
             const limit = request.query.limit;
             const orderBy = request.query.orderBy;
-            const orderDesc = request.query.orderDesc;
+            const order = request.query.order;
             const search = request.query.search;
             const tenantService = TenantServiceFactory();
-            let paginateResult = await tenantService.paginate({ page, limit, orderBy, orderDesc, search });
+            let paginateResult = await tenantService.paginate({ page, limit, orderBy, order, search });
             return paginateResult;
         }
         catch (e) {

package/dist/routes/UserApiKeyRoutes.js

@@ -17,10 +17,10 @@ async function UserApiKeyRoutes(fastify, options) {
             const page = request.query.page;
             const limit = request.query.limit;
             const orderBy = request.query.orderBy;
-            const orderDesc = request.query.orderDesc;
+            const order = request.query.order;
             const search = request.query.search;
             const userApiKeyService = UserApiKeyServiceFactory();
-            let paginateResult = await userApiKeyService.paginate({ page, limit, orderBy, orderDesc, search, filters });
+            let paginateResult = await userApiKeyService.paginate({ page, limit, orderBy, order, search, filters });
             return paginateResult;
         }
         catch (e) {

package/dist/routes/UserRoutes.js

@@ -55,14 +55,14 @@ async function UserRoutes(fastify, options) {
             const page = request.query.page;
             const limit = request.query.limit;
             const orderBy = request.query.orderBy;
-            const orderDesc = request.query.orderDesc;
+            const order = request.query.order;
             const search = request.query.search;
             const userService = UserServiceFactory();
             const filters = [];
             if (request.rbac.getAuthUser.tenantId) {
-                filters.push({ field: 'tenant', operator: '$eq', value: request.rbac.getAuthUser.tenantId });
+                filters.push({ field: 'tenant', operator: 'eq', value: request.rbac.getAuthUser.tenantId });
             }
-            let paginateResult = await userService.paginate({ page, limit, orderBy, orderDesc, search, filters });
+            let paginateResult = await userService.paginate({ page, limit, orderBy, order, search, filters });
             for (let item of paginateResult.items) {
                 item.password = undefined;
                 delete item.password;

package/dist/services/RoleService.js

@@ -70,9 +70,9 @@ class RoleService {
         const roles = await this._repository.fetchAll();
         return roles;
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         try {
-            const pagination = await this._repository.paginate({ page, limit, orderBy, orderDesc, search, filters });
+            const pagination = await this._repository.paginate({ page, limit, orderBy, order, search, filters });
             return pagination;
         }
         catch (e) {

package/dist/services/TenantService.js

@@ -76,9 +76,9 @@ class TenantService {
             throw e;
         }
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         try {
-            const pagination = await this._repository.paginate({ page, limit, orderBy, orderDesc, search, filters });
+            const pagination = await this._repository.paginate({ page, limit, orderBy, order, search, filters });
             return pagination;
         }
         catch (e) {

package/dist/services/UserApiKeyService.js

@@ -76,9 +76,9 @@ class UserApiKeyService {
             throw e;
         }
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         try {
-            const pagination = await this._repository.paginate({ page, limit, orderBy, orderDesc, search, filters });
+            const pagination = await this._repository.paginate({ page, limit, orderBy, order, search, filters });
             return pagination;
         }
         catch (e) {

package/dist/services/UserService.js

@@ -129,9 +129,9 @@ class UserService {
             throw e;
         }
     }
-    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
+    async paginate({ page = 1, limit = 5, orderBy = '', order = false, search = '', filters = [] }) {
         try {
-            const pagination = await this._repository.paginate({ page, limit, orderBy, orderDesc, search, filters });
+            const pagination = await this._repository.paginate({ page, limit, orderBy, order, search, filters });
             return pagination;
         }
         catch (e) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.1.8",
+  "version": "0.3.0",
   "description": "Identity module for user management, authentication and authorization.",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -28,9 +28,9 @@
   "author": "Cristian Incarnato & Drax Team",
   "license": "ISC",
   "dependencies": {
-    "@drax/common-back": "^0.1.0",
-    "@drax/common-share": "^0.1.0",
-    "@drax/identity-share": "^0.1.6",
+    "@drax/common-back": "^0.3.0",
+    "@drax/common-share": "^0.3.0",
+    "@drax/identity-share": "^0.3.0",
     "bcryptjs": "^2.4.3",
     "express-jwt": "^8.4.1",
     "graphql": "^16.8.2",
@@ -61,5 +61,5 @@
       "debug": "0"
     }
   },
-  "gitHead": "49d18089274338c11037531131d8e2d6bf631859"
+  "gitHead": "5ec8cb15b649fb29c69fbb7f248346487e0e9be2"
 }

package/src/graphql/resolvers/role.resolvers.ts

@@ -62,7 +62,7 @@ export default {
                 throw new GraphQLError('error.server')
             }
         },
-        paginateRole: async (_, {options= {page:1, limit:5, orderBy:"", orderDesc:false, search:"", filters: []} }, {rbac}) => {
+        paginateRole: async (_, {options= {page:1, limit:5, orderBy:"", order:false, search:"", filters: []} }, {rbac}) => {
             try {
                 rbac.assertPermission(IdentityPermissions.ViewRole)
                 const roleService = RoleServiceFactory()

package/src/graphql/resolvers/tenant.resolvers.ts

@@ -49,7 +49,7 @@ export default {
                 throw new GraphQLError('error.server')
             }
         },
-        paginateTenant: async (_, {options= {page:1, limit:5, orderBy:"", orderDesc:false, search:"", filters: []} }, {rbac}) => {
+        paginateTenant: async (_, {options= {page:1, limit:5, orderBy:"", order:false, search:"", filters: []} }, {rbac}) => {
             try {
                 rbac.assertPermission(IdentityPermissions.ViewTenant)
                 const tenantService = TenantServiceFactory()

package/src/graphql/resolvers/user-api-key.resolvers.ts

@@ -8,7 +8,7 @@ import * as crypto from "node:crypto";
 
 export default {
     Query: {
-        paginateUserApiKey: async (_, {options= {page:1, limit:5, orderBy:"", orderDesc:false, search:"", filters: []} }, {rbac, authUser}) => {
+        paginateUserApiKey: async (_, {options= {page:1, limit:5, orderBy:"", order:false, search:"", filters: []} }, {rbac, authUser}) => {
             try {
                 rbac.assertAuthenticated()
 

package/src/graphql/resolvers/user.resolvers.ts

@@ -45,7 +45,7 @@ export default {
             }
 
         },
-        paginateUser: async (_, { options= {page:1, limit:5, orderBy:"", orderDesc:false, search:"", filters: []} }, {rbac}) => {
+        paginateUser: async (_, { options= {page:1, limit:5, orderBy:"", order:false, search:"", filters: []} }, {rbac}) => {
             try {
                 rbac.assertPermission(IdentityPermissions.ViewUser)
                 let userService = UserServiceFactory()
@@ -55,7 +55,7 @@ export default {
                 }
 
                 if (rbac.getAuthUser.tenantId) {
-                    options.filters.push({field: 'tenant', operator: '$eq', value: rbac.getAuthUser.tenantId})
+                    options.filters.push({field: 'tenant', operator: 'eq', value: rbac.getAuthUser.tenantId})
                 }
                 return await userService.paginate(options)
             } catch (e) {

package/src/repository/mongo/RoleMongoRepository.ts

@@ -1,7 +1,7 @@
 import {RoleModel} from "../../models/RoleModel.js";
 import {IRoleRepository} from '../../interfaces/IRoleRepository'
-import { mongoose} from "@drax/common-back";
-import {FilterQuery, PaginateOptions, PaginateResult} from "mongoose";
+import {mongoose, MongooseQueryFilter, MongooseSort} from "@drax/common-back";
+import {PaginateOptions, PaginateResult} from "mongoose";
 import {DeleteResult} from "mongodb";
 import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/common-share";
 import {IRoleBase, IRole} from "@drax/identity-share";
@@ -44,7 +44,7 @@ class RoleMongoRepository implements IRoleRepository{
                        page= 1,
                        limit= 5,
                        orderBy= '',
-                       orderDesc= false,
+                       order= false,
                        search= '',
                        filters= []} : IDraxPaginateOptions): Promise<IDraxPaginateResult<IRole>> {
         const query = {}
@@ -55,7 +55,11 @@ class RoleMongoRepository implements IRoleRepository{
             ]
         }
 
-        const options = {populate: ['childRoles'], page, limit} as PaginateOptions
+        MongooseQueryFilter.applyFilters(query, filters)
+
+        const sort = MongooseSort.applySort(orderBy, order)
+
+        const options = {populate: ['childRoles'], page, limit, sort} as PaginateOptions
         const roles: PaginateResult<IRole> = await RoleModel.paginate(query, options)
         return {
             page: page,

package/src/repository/mongo/TenantMongoRepository.ts

@@ -1,7 +1,7 @@
 import {TenantModel} from "../../models/TenantModel.js";
 import {ITenantRepository} from '../../interfaces/ITenantRepository'
-import { mongoose} from "@drax/common-back";
-import {FilterQuery, PaginateOptions, PaginateResult} from "mongoose";
+import {mongoose, MongooseSort, MongooseQueryFilter} from "@drax/common-back";
+import { PaginateOptions, PaginateResult} from "mongoose";
 import {DeleteResult} from "mongodb";
 import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/common-share";
 import {ITenant, ITenantBase} from "@drax/identity-share";
@@ -43,7 +43,7 @@ class TenantMongoRepository implements ITenantRepository{
                        page= 1,
                        limit= 5,
                        orderBy= '',
-                       orderDesc= false,
+                       order= false,
                        search= '',
                        filters= []} : IDraxPaginateOptions): Promise<IDraxPaginateResult<ITenant>> {
 
@@ -55,7 +55,11 @@ class TenantMongoRepository implements ITenantRepository{
             ]
         }
 
-        const options = {page, limit} as PaginateOptions
+        MongooseQueryFilter.applyFilters(query, filters)
+
+        const sort = MongooseSort.applySort(orderBy, order)
+
+        const options = {page, limit, sort} as PaginateOptions
         const tenants: PaginateResult<ITenant> = await TenantModel.paginate(query, options)
         return {
             page: page,

package/src/repository/mongo/UserApiKeyMongoRepository.ts

@@ -1,7 +1,7 @@
 import {UserApiKeyModel} from "../../models/UserApiKeyModel.js";
 import {
     mongoose,
-    MongooseErrorToValidationError,
+    MongooseErrorToValidationError, MongooseQueryFilter, MongooseSort,
     MongoServerErrorToValidationError,
     ValidationError
 } from "@drax/common-back"
@@ -69,7 +69,7 @@ class UserMongoRepository implements IUserApiKeyRepository {
                        page = 1,
                        limit = 5,
                        orderBy = '',
-                       orderDesc = false,
+                       order = false,
                        search = '',
                        filters = []
                    }: IDraxPaginateOptions): Promise<IDraxPaginateResult<IUserApiKey>> {
@@ -84,21 +84,11 @@ class UserMongoRepository implements IUserApiKeyRepository {
             ]
         }
 
-        if(filters){
-            for(const filter of filters){
-                if(['eq','$eq'].includes(filter.operator)){
-                    query[filter.field] = {$eq: filter.value}
-                }
-                if(['ne','$ne'].includes(filter.operator)){
-                    query[filter.field] = {$ne: filter.value}
-                }
-                if(['in','$in'].includes(filter.operator)){
-                    query[filter.field] = {$in: filter.value}
-                }
-            }
-        }
+        MongooseQueryFilter.applyFilters(query, filters)
+
+        const sort = MongooseSort.applySort(orderBy, order)
 
-        const options = {populate: ['user', 'user.tenant', 'user.role'], page: page, limit: limit}
+        const options = {populate: ['user', 'user.tenant', 'user.role'], page, limit, sort}
 
         const userApiKeyPaginated: PaginateResult<IUserApiKey> = await UserApiKeyModel.paginate(query, options)
         return {