@drax/identity-back 0.0.22 → 0.0.25

package/dist/factory/RoleServiceFactory.js

@@ -14,7 +14,6 @@ const RoleServiceFactory = (verbose = false) => {
             case DbEngine.Sqlite:
                 console.log("RoleServiceFactory DB ENGINE SQLITE");
                 roleRepository = new RoleSqliteRepository(DbSetupUtils.getDbConfig(), verbose);
-                roleRepository.table();
                 break;
         }
         roleService = new RoleService(roleRepository);

package/dist/factory/TenantServiceFactory.js

@@ -14,7 +14,6 @@ const TenantServiceFactory = (verbose = false) => {
             case DbEngine.Sqlite:
                 console.log("TenantServiceFactory DB ENGINE SQLITE");
                 tenantRepository = new TenantSqliteRepository(DbSetupUtils.getDbConfig(), verbose);
-                tenantRepository.table();
                 break;
         }
         tenantService = new TenantService(tenantRepository);

package/dist/factory/UserServiceFactory.js

@@ -14,7 +14,6 @@ const UserServiceFactory = (verbose = false) => {
             case DbEngine.Sqlite:
                 console.log("UserServiceFactory DB ENGINE SQLITE");
                 userRepository = new UserSqliteRepository(DbSetupUtils.getDbConfig(), verbose);
-                userRepository.table();
                 break;
         }
         userService = new UserService(userRepository);

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

@@ -64,11 +64,11 @@ export default {
                 throw new GraphQLError('error.server');
             }
         },
-        paginateRole: async (_, { page, limit, seach }, { rbac }) => {
+        paginateRole: async (_, { page, limit, orderBy, orderDesc, search }, { rbac }) => {
             try {
                 rbac.assertPermission(IdentityPermissions.ViewRole);
                 const roleService = RoleServiceFactory();
-                return await roleService.paginate(page, limit, seach);
+                return await roleService.paginate({ page, limit, orderBy, orderDesc, search });
             }
             catch (e) {
                 console.error("paginateRole", e);

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

@@ -50,11 +50,11 @@ export default {
                 throw new GraphQLError('error.server');
             }
         },
-        paginateTenant: async (_, { page, limit, seach }, { rbac }) => {
+        paginateTenant: async (_, { page, limit, orderBy, orderDesc, search }, { rbac }) => {
             try {
                 rbac.assertPermission(IdentityPermissions.ViewTenant);
                 const tenantService = TenantServiceFactory();
-                return await tenantService.paginate(page, limit, seach);
+                return await tenantService.paginate({ page, limit, orderBy, orderDesc, search });
             }
             catch (e) {
                 console.error("paginateTenant", e);

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

@@ -34,14 +34,14 @@ export default {
                 throw new GraphQLError('error.server');
             }
         },
-        paginateUser: async (_, { page, limit, search, filters = [] }, { rbac }) => {
+        paginateUser: async (_, { page, limit, orderBy, orderDesc, search, filters = [] }, { rbac }) => {
             try {
                 rbac.assertPermission(IdentityPermissions.ViewUser);
                 let userService = UserServiceFactory();
                 if (rbac.getAuthUser.tenantId) {
                     filters.push({ field: 'tenant', operator: '$eq', value: rbac.getAuthUser.tenantId });
                 }
-                return await userService.paginate(page, limit, search, filters);
+                return await userService.paginate({ page, limit, orderBy, orderDesc, search, filters });
             }
             catch (e) {
                 if (e instanceof UnauthorizedError) {

package/dist/graphql/types/role.graphql

@@ -14,7 +14,7 @@ type RolePaginated{
 }
 
 type Query{
-    paginateRole(page:Int, limit:Int, search:String): RolePaginated
+    paginateRole(options: PaginateOptions): RolePaginated
     fetchRole: [Role]
     fetchPermissions: [String]
     findRoleById(id: ID): Role

package/dist/graphql/types/tenant.graphql

@@ -11,7 +11,7 @@ type TenantPaginated{
 }
 
 type Query{
-    paginateTenant(page:Int, limit:Int, search:String): TenantPaginated
+    paginateTenant(options: PaginateOptions): TenantPaginated
     fetchTenant: [Tenant]
     findTenantById(id: ID): Tenant
     findTenantByName(name: String!): Tenant

package/dist/graphql/types/user.graphql

@@ -21,7 +21,7 @@ type Query{
     me: User
     findUserByUsername(username: String!): User
     findUserById(id: ID!): User
-    paginateUser(page: Int, limit: Int, search: String): UserPaginated
+    paginateUser(options: PaginateOptions): UserPaginated
 }
 
 input UserCreateInput{

package/dist/models/UserModel.js

@@ -30,7 +30,6 @@ const UserSchema = new mongoose.Schema({
         }
     },
     password: { type: String, required: true, index: false },
-    code: { type: String, required: false, index: false },
     name: { type: String, required: false, index: false },
     active: { type: Boolean, required: true, default: false, index: false },
     phone: {

package/dist/repository/mongo/RoleMongoRepository.js

@@ -26,7 +26,7 @@ class RoleMongoRepository {
         const roles = await RoleModel.find().populate('childRoles').exec();
         return roles;
     }
-    async paginate(page = 1, limit = 5, search) {
+    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
         const query = {};
         if (search) {
             query['$or'] = [

package/dist/repository/mongo/TenantMongoRepository.js

@@ -25,7 +25,7 @@ class TenantMongoRepository {
         const tenants = await TenantModel.find().exec();
         return tenants;
     }
-    async paginate(page = 1, limit = 5, search) {
+    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
         const query = {};
         if (search) {
             query['$or'] = [

package/dist/repository/mongo/UserMongoRepository.js

@@ -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, search, filters) {
+    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
         const query = {};
         if (search) {
             query['$or'] = [

package/dist/repository/sqlite/RoleSqliteRepository.js

@@ -53,22 +53,6 @@ class RoleSqliteRepository {
             throw SqliteErrorToValidationError(e, roleData);
         }
     }
-    async findById(id) {
-        const role = this.db.prepare('SELECT * FROM roles WHERE id = ?').get(id);
-        if (role) {
-            await this.populateRole(role);
-            return role;
-        }
-        return undefined;
-    }
-    async findByName(name) {
-        const role = this.db.prepare('SELECT * FROM roles WHERE name = ?').get(name);
-        if (role) {
-            await this.populateRole(role);
-            return role;
-        }
-        return undefined;
-    }
     async update(id, roleData) {
         try {
             this.normalizeData(roleData);
@@ -85,6 +69,24 @@ class RoleSqliteRepository {
             throw SqliteErrorToValidationError(e, roleData);
         }
     }
+    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
+        const offset = page > 1 ? (page - 1) * limit : 0;
+        let where = "";
+        if (search) {
+            where = ` WHERE name LIKE '%${search}%'`;
+        }
+        const rCount = this.db.prepare('SELECT COUNT(*) as count FROM roles' + where).get();
+        const roles = this.db.prepare('SELECT * FROM roles LIMIT ? OFFSET ?' + where).all([limit, offset]);
+        for (const role of roles) {
+            await this.populateRole(role);
+        }
+        return {
+            page: page,
+            limit: limit,
+            total: rCount.count,
+            items: roles
+        };
+    }
     async delete(id) {
         const stmt = this.db.prepare('DELETE FROM roles WHERE id = ?');
         stmt.run(id);
@@ -95,30 +97,28 @@ class RoleSqliteRepository {
         stmt.run();
         return true;
     }
-    async fetchAll() {
-        const roles = this.db.prepare('SELECT * FROM roles').all();
-        for (const role of roles) {
+    async findById(id) {
+        const role = this.db.prepare('SELECT * FROM roles WHERE id = ?').get(id);
+        if (role) {
             await this.populateRole(role);
+            return role;
         }
-        return roles;
+        return undefined;
     }
-    async paginate(page = 1, limit = 5, search = "") {
-        const offset = page > 1 ? (page - 1) * limit : 0;
-        let where = "";
-        if (search) {
-            where = ` WHERE name LIKE '%${search}%'`;
+    async findByName(name) {
+        const role = this.db.prepare('SELECT * FROM roles WHERE name = ?').get(name);
+        if (role) {
+            await this.populateRole(role);
+            return role;
         }
-        const rCount = this.db.prepare('SELECT COUNT(*) as count FROM roles' + where).get();
-        const roles = this.db.prepare('SELECT * FROM roles LIMIT ? OFFSET ?' + where).all([limit, offset]);
+        return undefined;
+    }
+    async fetchAll() {
+        const roles = this.db.prepare('SELECT * FROM roles').all();
         for (const role of roles) {
             await this.populateRole(role);
         }
-        return {
-            page: page,
-            limit: limit,
-            total: rCount.count,
-            items: roles
-        };
+        return roles;
     }
     async findWithoutPopulateById(id) {
         const role = this.db.prepare('SELECT * FROM roles WHERE id = ?').get(id);

package/dist/repository/sqlite/TenantSqliteRepository.js

@@ -76,7 +76,7 @@ class TenantSqliteRepository {
         }
         return tenants;
     }
-    async paginate(page = 1, limit = 5, search = "") {
+    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
         const offset = page > 1 ? (page - 1) * limit : 0;
         let where = "";
         if (search) {

package/dist/repository/sqlite/UserSqliteRepository.js

@@ -107,7 +107,7 @@ class UserSqliteRepository {
         user.tenant = await this.findTenantById(user.tenant);
         return user;
     }
-    async paginate(page = 1, limit = 5, search = "", filters = []) {
+    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
         const offset = page > 1 ? (page - 1) * limit : 0;
         let where = "";
         if (search) {

package/dist/routes/RoleRoutes.js

@@ -103,9 +103,11 @@ async function RoleRoutes(fastify, options) {
             request.rbac.assertPermission(IdentityPermissions.ViewRole);
             const page = request.query.page;
             const limit = request.query.limit;
+            const orderBy = request.query.orderBy;
+            const orderDesc = request.query.orderDesc;
             const search = request.query.search;
             const roleService = RoleServiceFactory();
-            let paginateResult = await roleService.paginate(page, limit, search);
+            let paginateResult = await roleService.paginate({ page, limit, search, orderBy, orderDesc });
             return paginateResult;
         }
         catch (e) {

package/dist/routes/TenantRoutes.js

@@ -84,9 +84,11 @@ async function TenantRoutes(fastify, options) {
             request.rbac.assertPermission(IdentityPermissions.ViewTenant);
             const page = request.query.page;
             const limit = request.query.limit;
+            const orderBy = request.query.orderBy;
+            const orderDesc = request.query.orderDesc;
             const search = request.query.search;
             const tenantService = TenantServiceFactory();
-            let paginateResult = await tenantService.paginate(page, limit, search);
+            let paginateResult = await tenantService.paginate({ page, limit, orderBy, orderDesc, search });
             return paginateResult;
         }
         catch (e) {

package/dist/routes/UserRoutes.js

@@ -53,13 +53,15 @@ async function UserRoutes(fastify, options) {
             request.rbac.assertPermission(IdentityPermissions.ViewUser);
             const page = request.query.page;
             const limit = request.query.limit;
+            const orderBy = request.query.orderBy;
+            const orderDesc = request.query.orderDesc;
             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 });
             }
-            let paginateResult = await userService.paginate(page, limit, search, filters);
+            let paginateResult = await userService.paginate({ page, limit, orderBy, orderDesc, search, filters });
             return paginateResult;
         }
         catch (e) {

package/dist/services/RoleService.js

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

package/dist/services/TenantService.js

@@ -51,8 +51,8 @@ class TenantService {
         const tenants = await this._repository.fetchAll();
         return tenants;
     }
-    async paginate(page = 1, limit = 5, search, filters) {
-        const pagination = await this._repository.paginate(page, limit, search, filters);
+    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
+        const pagination = await this._repository.paginate({ page, limit, orderBy, orderDesc, search, filters });
         return pagination;
     }
 }

package/dist/services/UserService.js

@@ -96,8 +96,8 @@ class UserService {
         const user = await this._repository.findByUsername(username);
         return user;
     }
-    async paginate(page = 1, limit = 10, search, filters) {
-        const pagination = await this._repository.paginate(page, limit, search, filters);
+    async paginate({ page = 1, limit = 5, orderBy = '', orderDesc = false, search = '', filters = [] }) {
+        const pagination = await this._repository.paginate({ page, limit, orderBy, orderDesc, search, filters });
         return pagination;
     }
 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.22",
+  "version": "0.0.25",
   "description": "Identity module for user management, authentication and authorization.",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -26,6 +26,9 @@
   "author": "Cristian Incarnato & Drax Team",
   "license": "ISC",
   "dependencies": {
+    "@drax/common-back": "^0.0.25",
+    "@drax/common-share": "^0.0.25",
+    "@drax/identity-share": "^0.0.25",
     "bcryptjs": "^2.4.3",
     "express-jwt": "^8.4.1",
     "graphql": "^16.8.2",
@@ -56,5 +59,5 @@
       "debug": "0"
     }
   },
-  "gitHead": "2ff21dad6e1e9cc9119bf3c3095c3b291d850e53"
+  "gitHead": "606497ae64684b17c757a72ed57a4a7dda0f1f8e"
 }

package/src/factory/RoleServiceFactory.ts

@@ -20,7 +20,6 @@ const RoleServiceFactory = (verbose: boolean = false) : RoleService => {
             case DbEngine.Sqlite:
                 console.log("RoleServiceFactory DB ENGINE SQLITE")
                 roleRepository = new RoleSqliteRepository(DbSetupUtils.getDbConfig(), verbose)
-                roleRepository.table()
                 break;
         }
 

package/src/factory/TenantServiceFactory.ts

@@ -20,7 +20,6 @@ const TenantServiceFactory = (verbose: boolean = false) : TenantService => {
             case DbEngine.Sqlite:
                 console.log("TenantServiceFactory DB ENGINE SQLITE")
                 tenantRepository = new TenantSqliteRepository(DbSetupUtils.getDbConfig(), verbose)
-                tenantRepository.table()
                 break;
         }
 

package/src/factory/UserServiceFactory.ts

@@ -17,7 +17,6 @@ const UserServiceFactory = (verbose:boolean = false) : UserService => {
             case DbEngine.Sqlite:
                 console.log("UserServiceFactory DB ENGINE SQLITE")
                 userRepository = new UserSqliteRepository(DbSetupUtils.getDbConfig(),verbose)
-                userRepository.table()
                 break;
         }
 

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

@@ -62,11 +62,11 @@ export default {
                 throw new GraphQLError('error.server')
             }
         },
-        paginateRole: async (_, {page, limit, seach}, {rbac}) => {
+        paginateRole: async (_, {page, limit, orderBy, orderDesc, search}, {rbac}) => {
             try {
                 rbac.assertPermission(IdentityPermissions.ViewRole)
                 const roleService = RoleServiceFactory()
-                return await roleService.paginate(page, limit, seach)
+                return await roleService.paginate({page, limit, orderBy, orderDesc, search})
             } catch (e) {
                 console.error("paginateRole",e)
                 if (e instanceof UnauthorizedError) {

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

@@ -50,11 +50,11 @@ export default {
                 throw new GraphQLError('error.server')
             }
         },
-        paginateTenant: async (_, {page, limit, seach}, {rbac}) => {
+        paginateTenant: async (_, {page, limit, orderBy, orderDesc, search}, {rbac}) => {
             try {
                 rbac.assertPermission(IdentityPermissions.ViewTenant)
                 const tenantService = TenantServiceFactory()
-                return await tenantService.paginate(page, limit, seach)
+                return await tenantService.paginate({page, limit, orderBy, orderDesc, search})
             } catch (e) {
                 console.error("paginateTenant",e)
                 if (e instanceof UnauthorizedError) {

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

@@ -35,14 +35,14 @@ export default {
             }
 
         },
-        paginateUser: async (_, {page, limit, search, filters = []}, {rbac}) => {
+        paginateUser: async (_, {page, limit, orderBy, orderDesc, search, filters = []}, {rbac}) => {
             try {
                 rbac.assertPermission(IdentityPermissions.ViewUser)
                 let userService= UserServiceFactory()
                 if(rbac.getAuthUser.tenantId){
                     filters.push({field: 'tenant', operator: '$eq', value: rbac.getAuthUser.tenantId})
                 }
-                return await userService.paginate(page, limit, search, filters)
+                return await userService.paginate({page, limit, orderBy, orderDesc, search, filters})
             } catch (e) {
                 if (e instanceof UnauthorizedError) {
                     throw new GraphQLError(e.message)

package/src/graphql/types/role.graphql

@@ -14,7 +14,7 @@ type RolePaginated{
 }
 
 type Query{
-    paginateRole(page:Int, limit:Int, search:String): RolePaginated
+    paginateRole(options: PaginateOptions): RolePaginated
     fetchRole: [Role]
     fetchPermissions: [String]
     findRoleById(id: ID): Role

package/src/graphql/types/tenant.graphql

@@ -11,7 +11,7 @@ type TenantPaginated{
 }
 
 type Query{
-    paginateTenant(page:Int, limit:Int, search:String): TenantPaginated
+    paginateTenant(options: PaginateOptions): TenantPaginated
     fetchTenant: [Tenant]
     findTenantById(id: ID): Tenant
     findTenantByName(name: String!): Tenant

package/src/graphql/types/user.graphql

@@ -21,7 +21,7 @@ type Query{
     me: User
     findUserByUsername(username: String!): User
     findUserById(id: ID!): User
-    paginateUser(page: Int, limit: Int, search: String): UserPaginated
+    paginateUser(options: PaginateOptions): UserPaginated
 }
 
 input UserCreateInput{

package/src/index.ts

@@ -25,23 +25,20 @@ import LoadPermissions from "./setup/LoadPermissions.js";
 import LoadIdentityConfigFromEnv from "./setup/LoadIdentityConfigFromEnv.js";
 import RecoveryUserPassword from "./setup/RecoveryUserPassword.js";
 
-import type {IJwtUser} from "./interfaces/IJwtUser";
-import type {IRole, IRoleBase} from "./interfaces/IRole";
-import type {IUser, IUserCreate, IUserUpdate} from "./interfaces/IUser";
-import type {IUserRepository} from "./interfaces/IUserRepository";
 import type {IRoleRepository} from "./interfaces/IRoleRepository";
+import type {ITenantRepository} from "./interfaces/ITenantRepository";
+import type {IUserRepository} from "./interfaces/IUserRepository";
+
 
 const graphqlMergeResult = await GraphqlMerge()
 const identityTypeDefs = await graphqlMergeResult.typeDefs;
 const identityResolvers = await graphqlMergeResult.resolvers;
 
+
 export type {
-    IJwtUser,
-    IRole,
-    IRoleBase,
     IRoleRepository,
-    IUser, IUserCreate, IUserUpdate,
-    IUserRepository
+    ITenantRepository,
+    IUserRepository,
 }
 
 export {

package/src/interfaces/IRoleRepository.ts

@@ -1,15 +1,10 @@
-import {IRole} from './IRole'
-import {IPaginateFilter, IPaginateResult} from "@drax/common-back";
-import {IID} from "./IID";
-interface IRoleRepository{
-    create(role: IRole): Promise<IRole>;
-    update(id: IID, updatedRole: IRole): Promise<IRole | null>;
-    delete(id: IID): Promise<boolean>;
-    findById(id: IID): Promise<IRole | null>;
+import {IRole, IRoleBase} from "@drax/identity-share";
+import {IDraxCrud} from "@drax/common-share";
+
+interface IRoleRepository extends IDraxCrud<IRole, IRoleBase, IRoleBase> {
+    findById(id: string): Promise<IRole | null>;
     findByName(name: string): Promise<IRole | null>;
     fetchAll(): Promise<IRole[]>;
-    paginate(page?: number, limit?: number, search?:string, filters?: IPaginateFilter[]): Promise<IPaginateResult>;
-    table?():void
 }
 
 export {IRoleRepository}

package/src/interfaces/ITenantRepository.ts

@@ -1,15 +1,9 @@
-import {ITenant} from './ITenant'
-import {IPaginateFilter, IPaginateResult} from "@drax/common-back";
-import {IID} from "./IID";
-interface ITenantRepository{
-    create(role: ITenant): Promise<ITenant>;
-    update(id: IID, updatedRole: ITenant): Promise<ITenant | null>;
-    delete(id: IID): Promise<boolean>;
-    findById(id: IID): Promise<ITenant | null>;
+import {ITenant, ITenantBase} from '@drax/identity-share'
+import {IDraxCrud} from "@drax/common-share";
+interface ITenantRepository extends IDraxCrud<ITenant,ITenantBase,ITenantBase>{
+    findById(id: string): Promise<ITenant | null>;
     findByName(name: string): Promise<ITenant | null>;
     fetchAll(): Promise<ITenant[]>;
-    paginate(page?: number, limit?: number, search?:string, filters?: IPaginateFilter[]): Promise<IPaginateResult>;
-    table?():void
 }
 
 export {ITenantRepository}

package/src/interfaces/IUserRepository.ts

@@ -1,16 +1,10 @@
-import {IUser, IUserCreate, IUserUpdate} from './IUser'
-import {IPaginateFilter, IPaginateResult} from "@drax/common-back";
-import {IID} from "./IID";
-interface IUserRepository{
-    create(role: IUserCreate): Promise<IUser>;
-    update(id: IID, updatedRole: IUserUpdate): Promise<IUser | null>;
-    delete(id: IID): Promise<boolean>;
-    findById(id: IID): Promise<IUser | null>;
-    findByUsername(username: string): Promise<IUser | null>;
-    paginate(page?: number, limit?: number, search?: string, filters?: IPaginateFilter[]): Promise<IPaginateResult>;
-    changePassword(id: IID, password:string):Promise<Boolean>;
-    table?():void
+import {IUser, IUserCreate, IUserUpdate} from '@drax/identity-share'
+import {IDraxCrud} from "@drax/common-share";
 
+interface IUserRepository extends IDraxCrud<IUser, IUserCreate, IUserUpdate>{
+    findById(id: string): Promise<IUser | null>;
+    findByUsername(username: string): Promise<IUser | null>;
+    changePassword(id: string, password:string):Promise<Boolean>;
 }
 
 export {IUserRepository}

package/src/middleware/jwtMiddleware.ts

@@ -1,5 +1,5 @@
 import AuthUtils from "../utils/AuthUtils.js";
-import {IJwtUser} from "../interfaces/IJwtUser";
+import {IJwtUser} from "@drax/identity-share";
 
 function jwtMiddleware (request, reply, done) {
         try{

package/src/middleware/rbacMiddleware.ts

@@ -1,5 +1,4 @@
-import type {IJwtUser} from "../interfaces/IJwtUser";
-import type {IRole} from "../interfaces/IRole";
+import {IJwtUser, IRole} from "@drax/identity-share";
 import {DraxCache, DraxConfig} from "@drax/common-back";
 import RoleServiceFactory from "../factory/RoleServiceFactory.js";
 import Rbac from "../rbac/Rbac.js";

package/src/models/RoleModel.ts

@@ -1,7 +1,7 @@
 import {mongoose, MongooseSoftDelete} from '@drax/common-back';
 import uniqueValidator from 'mongoose-unique-validator';
 import mongoosePaginate from 'mongoose-paginate-v2'
-import {IRole} from '../interfaces/IRole'
+import {IRole} from '@drax/identity-share'
 const Schema = mongoose.Schema
 import {PaginateModel} from "mongoose";
 

package/src/models/TenantModel.ts

@@ -1,7 +1,7 @@
 import {mongoose, MongooseSoftDelete} from '@drax/common-back';
 import uniqueValidator from 'mongoose-unique-validator';
 import mongoosePaginate from 'mongoose-paginate-v2'
-import {ITenant} from '../interfaces/ITenant'
+import {ITenant} from '@drax/identity-share'
 const Schema = mongoose.Schema
 import {PaginateModel} from "mongoose";
 

package/src/models/UserGroupModel.ts

@@ -1,5 +1,5 @@
 import {mongoose, MongooseSoftDelete} from '@drax/common-back';
-import {IUserGroup} from "../interfaces/IUserGroup";
+import {IUserGroup} from "@drax/identity-share";
 import uniqueValidator from 'mongoose-unique-validator';
 import mongoosePaginate from 'mongoose-paginate-v2'
 import {PaginateModel} from "mongoose";

package/src/models/UserModel.ts

@@ -1,5 +1,5 @@
 import {mongoose, MongooseSoftDelete} from '@drax/common-back';
-import {IUser} from "../interfaces/IUser";
+import {IUser} from "@drax/identity-share";
 import uniqueValidator from 'mongoose-unique-validator';
 import mongoosePaginate from 'mongoose-paginate-v2'
 import {PaginateModel} from "mongoose";
@@ -34,7 +34,6 @@ const UserSchema = new mongoose.Schema<IUser>({
         }
     },
     password: {type: String, required: true,  index: false},
-    code: {type: String, required: false,  index: false},
     name: {type: String, required: false,  index: false},
     active: {type: Boolean, required: true, default: false,  index: false},
     phone: {