@drax/identity-back 0.11.5 → 0.12.2

package/src/controllers/UserController.ts

@@ -5,10 +5,8 @@ import {
     CommonConfig,
     DraxConfig,
     StoreManager,
-    UploadFileError,
     ValidationError,
     UnauthorizedError,
-    SecuritySensitiveError
 } from "@drax/common-back";
 
 import UserServiceFactory from "../factory/UserServiceFactory.js";
@@ -19,6 +17,7 @@ import BadCredentialsError from "../errors/BadCredentialsError.js";
 import {join} from "path";
 import {IdentityConfig} from "../config/IdentityConfig.js";
 import UserEmailService from "../services/UserEmailService.js";
+import {IDraxFieldFilter} from "@drax/crud-share";
 
 const BASE_FILE_DIR = DraxConfig.getOrLoad(CommonConfig.FileDir) || 'files';
 const AVATAR_DIR = DraxConfig.getOrLoad(IdentityConfig.AvatarDir) || 'avatar';
@@ -42,8 +41,8 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
         } catch (e) {
             console.error('/api/auth error', e)
             if (e instanceof BadCredentialsError) {
-                reply.code(401)
-                reply.send({error: e.message})
+                reply.code(e.statusCode)
+                reply.send(e.body)
             }
             reply.code(500)
             reply.send({error: 'error.server'})
@@ -54,7 +53,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
         try {
             if (request.authUser) {
                 const userService = UserServiceFactory()
-                let user = await userService.findById(request.authUser.id)
+                let user = await userService.findById(request.rbac.userId)
                 user.password = undefined
                 delete user.password
                 return user
@@ -63,16 +62,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
 
             }
         } catch (e) {
-            if (e instanceof UnauthorizedError) {
-                reply.code(401)
-                reply.send({error: "Unauthorized"})
-            } else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message})
-            } else {
-                reply.statusCode = 500
-                reply.send({error: 'error.server'})
-            }
+            this.handleError(e,reply)
         }
     }
 
@@ -85,7 +75,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             const order = request.query.order
             const search = request.query.search
             const userService = UserServiceFactory()
-            const filters = []
+            const filters: IDraxFieldFilter[] = this.parseFilters(request.query.filters)
             if (request.rbac.getAuthUser.tenantId) {
                 filters.push({field: 'tenant', operator: 'eq', value: request.rbac.getAuthUser.tenantId})
             }
@@ -96,16 +86,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             }
             return paginateResult
         } catch (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: 'error.server'})
-            }
+            this.handleError(e,reply)
         }
     }
 
@@ -121,17 +102,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             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'})
-            }
+            this.handleError(e,reply)
         }
     }
 
@@ -158,28 +129,25 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
                 payload.tenant = null
             }
 
-            payload.role = role.id
+            payload.role = role._id.toString()
             payload.origin ??= 'Registry'
 
             const userService = UserServiceFactory()
             let user = await userService.register(payload)
 
-            //SEND EMAIL FOR EMAIL VERIFICATION
-            await UserEmailService.emailVerifyCode(user.emailCode, user.email)
+            if(user){
+                //SEND EMAIL FOR EMAIL VERIFICATION
+                await UserEmailService.emailVerifyCode(user.emailCode, user.email)
 
-            return user
-        } 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: 'error.server'})
+                return {
+                    success: true,
+                    message: 'User registered successfully.'
+                }
             }
+
+
+        } catch (e) {
+            this.handleError(e,reply)
         }
     }
 
@@ -193,13 +161,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
                 reply.header('Content-Type', 'text/html; charset=utf-8').send(html)
             }
         } catch (e) {
-            console.error(e)
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message, inputErrors: e.errors})
-            }
-            reply.code(500)
-            reply.send({error: 'error.server'})
+            this.handleError(e,reply)
         }
     }
 
@@ -209,13 +171,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             const userService = UserServiceFactory()
             return await userService.verifyPhone(phoneCode)
         } catch (e) {
-            console.error(e)
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message, inputErrors: e.errors})
-            }
-            reply.code(500)
-            reply.send({error: 'error.server'})
+            this.handleError(e,reply)
         }
     }
 
@@ -224,13 +180,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             request.rbac.assertPermission(UserPermissions.Create)
             const payload = request.body
 
-            const roleService = RoleServiceFactory()
-            const role = await roleService.findById(payload.role)
-            if (!role) {
-                throw new ValidationError([{field: 'role', reason: 'Role not found'}])
-            } else if (role.name === 'Admin') {
-                payload.tenant = null
-            } else if (request.rbac.getAuthUser.tenantId) {
+            if (request.rbac.getAuthUser.tenantId) {
                 payload.tenant = request.rbac.getAuthUser.tenantId
             }
 
@@ -240,17 +190,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             let user = await userService.create(payload)
             return user
         } 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: 'error.server'})
-            }
+            this.handleError(e,reply)
         }
     }
 
@@ -260,14 +200,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             const id = request.params.id
             const payload = request.body
 
-
-            const roleService = RoleServiceFactory()
-            const role = await roleService.findById(payload.role)
-            if (!role) {
-                throw new ValidationError([{field: 'role', reason: 'Role not found'}])
-            } else if (role.name === 'Admin') {
-                payload.tenant = null
-            } else if (request.rbac.getAuthUser.tenantId) {
+            if (request.rbac.getAuthUser.tenantId) {
                 payload.tenant = request.rbac.getAuthUser.tenantId
             }
 
@@ -275,21 +208,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             let user = await userService.update(id, payload)
             return user
         } catch (e) {
-            console.error(e)
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message, inputErrors: e.errors})
-            }
-            if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message})
-            } else if (e instanceof UnauthorizedError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message})
-            } else {
-                reply.statusCode = 500
-                reply.send({error: 'error.server'})
-            }
+            this.handleError(e,reply)
         }
     }
 
@@ -300,22 +219,22 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             const userService = UserServiceFactory()
             let r: boolean = await userService.delete(id)
             if (r) {
-                reply.send({message: 'Deleted successfully'})
+                reply.send({
+                    id: id,
+                    message: 'Item deleted successfully',
+                    deleted: true,
+                    deletedAt: new Date(),
+                })
             } else {
-                reply.statusCode(400).send({message: 'Not deleted'})
+                reply.send({
+                    id: id,
+                    message: 'Item not deleted',
+                    deleted: false,
+                    deletedAt: new Date(),
+                })
             }
         } 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: 'error.server'})
-            }
+            this.handleError(e,reply)
         }
     }
 
@@ -341,17 +260,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             reply.send({message})
 
         } catch (e) {
-            console.error('recoveryPassword error', e)
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message, inputErrors: e.errors})
-            }else if (e instanceof SecuritySensitiveError) {
-                reply.statusCode = e.statusCode
-                reply.send({message})
-            } else {
-                reply.statusCode = 500
-                reply.send({error: 'error.server'})
-            }
+            this.handleError(e,reply)
         }
     }
 
@@ -379,14 +288,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             }
 
         } catch (e) {
-            console.error('recoveryPassword error', e)
-            if (e instanceof ValidationError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message, inputErrors: e.errors})
-            } else {
-                reply.statusCode = 500
-                reply.send({error: 'error.server'})
-            }
+            this.handleError(e,reply)
         }
     }
 
@@ -400,19 +302,10 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             const currentPassword = request.body.currentPassword
             const newPassword = request.body.newPassword
             const userService = UserServiceFactory()
-            return await userService.changeOwnPassword(userId, currentPassword, newPassword)
+            await userService.changeOwnPassword(userId, currentPassword, newPassword)
+            return {message: 'Password updated successfully'}
         } catch (e) {
-            console.error('changeMyPassword 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: 'error.server'})
-            }
+            this.handleError(e,reply)
         }
     }
 
@@ -425,19 +318,10 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             }
             const newPassword = request.body.newPassword
             const userService = UserServiceFactory()
-            return await userService.changeUserPassword(userId, newPassword)
+            await userService.changeUserPassword(userId, newPassword)
+            return {message: 'Password updated successfully'}
         } catch (e) {
-            console.error('/api/password 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: 'error.server'})
-            }
+            this.handleError(e,reply)
         }
     }
 
@@ -445,7 +329,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
     async updateAvatar(request, reply) {
         try {
             request.rbac.assertAuthenticated()
-            const userId = request.rbac.getAuthUser.id
+            const userId = request.rbac.userId
 
             const data = await request.file()
 
@@ -470,17 +354,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
                 url: urlFile,
             }
         } catch (e) {
-            console.error(e)
-            if (e instanceof UploadFileError) {
-                reply.statusCode = e.statusCode
-                reply.send({error: e.message})
-            } 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)
         }
 
     }
@@ -493,14 +367,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             //console.log("FILE_DIR: ",fileDir, " FILENAME:", filename)
             return reply.sendFile(filename, fileDir)
         } 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)
         }
 
     }

package/src/errors/BadCredentialsError.ts

@@ -1,13 +1,30 @@
-class BadCredentialsError extends Error {
+import type {IError} from "@drax/common-back";
+
+class BadCredentialsError extends Error implements IError{
     constructor() {
         super('error.badCredentials')
         this.name = 'BadCredentialsError';
+        this.message = 'error.badCredentials'
     }
 
     get statusCode(){
         return 401
     }
 
+
+    get i18nMessage(){
+        return 'error.badCredentials'
+    }
+
+    get body(){
+        return {
+            statusCode: this.statusCode,
+            error: this.name,
+            message: this.message,
+            i18nMessage: this.i18nMessage,
+        }
+    }
+
 }
 
 export default BadCredentialsError

package/src/factory/RoleServiceFactory.ts

@@ -18,6 +18,7 @@ const RoleServiceFactory = (verbose: boolean = false): RoleService => {
             case COMMON.DB_ENGINES.SQLITE:
                 const dbFile = DraxConfig.getOrLoad(CommonConfig.SqliteDbFile)
                 roleRepository = new RoleSqliteRepository(dbFile, verbose)
+                roleRepository.build()
                 break;
             default:
                 throw new Error("DraxConfig.DB_ENGINE must be one of " + Object.values(COMMON.DB_ENGINES).join(", "));

package/src/factory/TenantServiceFactory.ts

@@ -18,6 +18,7 @@ const TenantServiceFactory = (verbose: boolean = false): TenantService => {
             case COMMON.DB_ENGINES.SQLITE:
                 const dbFile = DraxConfig.getOrLoad(CommonConfig.SqliteDbFile)
                 tenantRepository = new TenantSqliteRepository(dbFile, verbose)
+                tenantRepository.build()
                 break;
             default:
                 throw new Error("DraxConfig.DB_ENGINE must be one of " + Object.values(COMMON.DB_ENGINES).join(", "));

package/src/factory/UserApiKeyServiceFactory.ts

@@ -8,20 +8,21 @@ let userService: UserApiKeyService
 
 const UserApiKeyServiceFactory = (verbose: boolean = false): UserApiKeyService => {
     if (!userService) {
-        let userRepository: IUserApiKeyRepository
+        let userApiKeyRepository: IUserApiKeyRepository
         switch (DraxConfig.getOrLoad(CommonConfig.DbEngine)) {
             case COMMON.DB_ENGINES.MONGODB:
-                userRepository = new UserApiKeyMongoRepository()
+                userApiKeyRepository = new UserApiKeyMongoRepository()
                 break;
             case COMMON.DB_ENGINES.SQLITE:
                 const dbFile = DraxConfig.getOrLoad(CommonConfig.SqliteDbFile)
-                userRepository = new UserApiKeySqliteRepository(dbFile, verbose)
+                userApiKeyRepository = new UserApiKeySqliteRepository(dbFile, verbose)
+                userApiKeyRepository.build()
                 break;
             default:
                 throw new Error("DraxConfig.DB_ENGINE must be one of " + Object.values(COMMON.DB_ENGINES).join(", "));
         }
 
-        userService = new UserApiKeyService(userRepository)
+        userService = new UserApiKeyService(userApiKeyRepository)
     }
 
     return userService

package/src/factory/UserServiceFactory.ts

@@ -16,6 +16,7 @@ const UserServiceFactory = (verbose:boolean = false) : UserService => {
             case COMMON.DB_ENGINES.SQLITE:
                 const dbFile = DraxConfig.getOrLoad(CommonConfig.SqliteDbFile)
                 userRepository = new UserSqliteRepository(dbFile,verbose)
+                userRepository.build()
                 break;
             default:
                 throw new Error("DraxConfig.DB_ENGINE must be one of " + Object.values(COMMON.DB_ENGINES).join(", "));

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

@@ -3,6 +3,7 @@ import {IdentityPermissions} from "../../permissions/IdentityPermissions.js";
 import {ValidationError, ValidationErrorToGraphQLError, UnauthorizedError} from "@drax/common-back";
 import {GraphQLError} from "graphql";
 import {PermissionService} from "../../services/PermissionService.js";
+import {IDraxPaginateOptions} from "@drax/crud-share";
 
 
 export default {
@@ -37,7 +38,7 @@ export default {
                 const roleService = RoleServiceFactory()
                 const roles = await roleService.fetchAll()
                 if(rbac.getRole?.childRoles?.length > 0) {
-                    return roles.filter(role => rbac.getRole.childRoles.some(childRole => childRole.id === role.id));
+                    return roles.filter(role => rbac.getRole.childRoles.some(childRole => childRole._id === role._id));
                 }else{
                     return roles
                 }
@@ -61,7 +62,7 @@ export default {
                 throw new GraphQLError('error.server')
             }
         },
-        paginateRole: async (_, {options= {page:1, limit:5, orderBy:"", order:false, search:"", filters: []} }, {rbac}) => {
+        paginateRole: async (_, {options= {page:1, limit:5, orderBy:"", order:"asc", search:"", filters: []} as IDraxPaginateOptions }, {rbac}) => {
             try {
                 rbac.assertPermission(IdentityPermissions.ViewRole)
                 const roleService = RoleServiceFactory()

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

@@ -2,6 +2,7 @@ import TenantServiceFactory from "../../factory/TenantServiceFactory.js";
 import {IdentityPermissions} from "../../permissions/IdentityPermissions.js";
 import {ValidationError, ValidationErrorToGraphQLError, UnauthorizedError} from "@drax/common-back";
 import {GraphQLError} from "graphql";
+import {IDraxPaginateOptions} from "@drax/crud-share";
 
 
 export default {
@@ -36,7 +37,7 @@ export default {
                 const tenantService = TenantServiceFactory()
                 const tenants =  await tenantService.fetchAll()
                 if(rbac.getAuthUser.tenantId){
-                    return tenants.filter(t => t.id === rbac.getAuthUser.tenantId)
+                    return tenants.filter(t => t._id === rbac.getAuthUser.tenantId)
                 }else{
                     return tenants
                 }
@@ -48,7 +49,7 @@ export default {
                 throw new GraphQLError('error.server')
             }
         },
-        paginateTenant: async (_, {options= {page:1, limit:5, orderBy:"", order:false, search:"", filters: []} }, {rbac}) => {
+        paginateTenant: async (_, {options= {page:1, limit:5, orderBy:"", order:"asc", search:"", filters: []} as IDraxPaginateOptions }, {rbac}) => {
             try {
                 rbac.assertPermission(IdentityPermissions.ViewTenant)
                 const tenantService = TenantServiceFactory()

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

@@ -3,11 +3,12 @@ import {IdentityPermissions} from "../../permissions/IdentityPermissions.js";
 import {ValidationError, ValidationErrorToGraphQLError, UnauthorizedError} from "@drax/common-back";
 import {GraphQLError} from "graphql";
 import * as crypto from "node:crypto";
+import {IDraxPaginateOptions} from "@drax/crud-share";
 
 
 export default {
     Query: {
-        paginateUserApiKey: async (_, {options= {page:1, limit:5, orderBy:"", order:false, search:"", filters: []} }, {rbac, authUser}) => {
+        paginateUserApiKey: async (_, {options= {page:1, limit:5, orderBy:"", order:"asc", search:"", filters: []} as IDraxPaginateOptions }, {rbac, authUser}) => {
             try {
                 rbac.assertAuthenticated()
 
@@ -22,7 +23,7 @@ export default {
                 }
 
                 if(!rbac.hasPermission(IdentityPermissions.ViewUserApiKey)){
-                    options.filters.push({field: "user", operator: "eq", value: rbac.authUser.id})
+                    options.filters.push({field: "user", operator: "eq", value: rbac.userId})
                 }
 
                 const userApiKeyService = UserApiKeyServiceFactory()

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

@@ -12,6 +12,7 @@ import {UnauthorizedError} from "@drax/common-back";
 import BadCredentialsError from "../../errors/BadCredentialsError.js";
 import {join} from "path";
 import IdentityConfig from "../../config/IdentityConfig.js";
+import {IDraxPaginateOptions} from "@drax/crud-share";
 
 export default {
     Query: {
@@ -45,7 +46,7 @@ export default {
             }
 
         },
-        paginateUser: async (_, { options= {page:1, limit:5, orderBy:"", order:false, search:"", filters: []} }, {rbac}) => {
+        paginateUser: async (_, { options= {page:1, limit:5, orderBy:"", order:"asc", search:"", filters: []} as IDraxPaginateOptions }, {rbac}) => {
             try {
                 rbac.assertPermission(IdentityPermissions.ViewUser)
                 let userService = UserServiceFactory()

package/src/index.ts

@@ -42,6 +42,11 @@ import {TenantPermissions} from "./permissions/TenantPermissions.js";
 import {UserPermissions} from "./permissions/UserPermissions.js";
 import {UserApiKeyPermissions} from "./permissions/UserApiKeyPermissions.js";
 
+import {UserSchema, UserBaseSchema} from "./schemas/UserSchema.js";
+import {TenantSchema,TenantBaseSchema} from "./schemas/TenantSchema.js";
+import {RoleSchema, RoleBaseSchema} from "./schemas/RoleSchema.js";
+import {UserApiKeySchema, UserApiKeyBaseSchema} from "./schemas/UserApiKeySchema.js";
+
 
 const graphqlMergeResult = await GraphqlMerge()
 const identityTypeDefs = await graphqlMergeResult.typeDefs;
@@ -56,6 +61,17 @@ export type {
 }
 
 export {
+
+    //Schemas
+    UserSchema,
+    UserBaseSchema,
+    TenantSchema,
+    TenantBaseSchema,
+    RoleSchema,
+    RoleBaseSchema,
+    UserApiKeyBaseSchema,
+    UserApiKeySchema,
+
     //Service
     UserService,
     RoleService,

package/src/interfaces/ITenantRepository.ts

@@ -1,6 +1,6 @@
 import {ITenant, ITenantBase} from '@drax/identity-share'
-import {IDraxCrud} from "@drax/crud-share";
-interface ITenantRepository extends IDraxCrud<ITenant,ITenantBase,ITenantBase>{
+import {IDraxCrudRepository} from "@drax/crud-share";
+interface ITenantRepository extends IDraxCrudRepository<ITenant,ITenantBase,ITenantBase>{
     findById(id: string): Promise<ITenant | null>;
     findByName(name: string): Promise<ITenant | null>;
     fetchAll(): Promise<ITenant[]>;

package/src/interfaces/IUserApiKeyRepository.ts

@@ -1,7 +1,7 @@
 import {IUserApiKey, IUserApiKeyBase} from '@drax/identity-share'
-import {IDraxCrud} from "@drax/crud-share";
+import {IDraxCrudRepository} from "@drax/crud-share";
 
-interface IUserApiKeyRepository extends IDraxCrud<IUserApiKey, IUserApiKeyBase, IUserApiKeyBase>{
+interface IUserApiKeyRepository extends IDraxCrudRepository<IUserApiKey, IUserApiKeyBase, IUserApiKeyBase>{
     findBySecret(username: string): Promise<IUserApiKey | null>;
 }
 

package/src/interfaces/IUserRepository.ts

@@ -1,10 +1,11 @@
 import {IUser, IUserCreate, IUserUpdate} from '@drax/identity-share'
-import {IDraxCrud, IDraxFieldFilter} from "@drax/crud-share";
+import {IDraxCrudRepository} from "@drax/crud-share";
 
-interface IUserRepository extends IDraxCrud<IUser, IUserCreate, IUserUpdate>{
+interface IUserRepository extends IDraxCrudRepository<IUser, IUserCreate, IUserUpdate>{
     findById(id: string): Promise<IUser | null>;
     findByUsername(username: string): Promise<IUser | null>;
     findByUsernameWithPassword(username: string): Promise<IUser | null>;
+    findByIdWithPassword(id: string): Promise<IUser | null>;
     findByEmail(email: string): Promise<IUser | null>;
     changePassword(id: string, password:string):Promise<Boolean>;
     changeAvatar(id: string, avatarUrl: string): Promise<Boolean>;

package/src/middleware/apiKeyMiddleware.ts

@@ -30,8 +30,8 @@ async function apiKeyMiddleware (request, reply) {
                 const userApiKey = await draxCache.getOrLoad(apiKey, userApiKeyLoader)
                 if(userApiKey && userApiKey.user){
                     request.authUser = userApiKey.user
-                    request.authUser.roleId = userApiKey.user.role.id
-                    request.authUser.tenantId = userApiKey.user?.tenant?.id
+                    request.authUser.roleId = userApiKey.user.role._id
+                    request.authUser.tenantId = userApiKey.user?.tenant?._id
                 }
             }
             return