@drax/identity-back 0.1.2 → 0.1.6

package/dist/middleware/apiKeyMiddleware.js

@@ -16,7 +16,7 @@ async function apiKeyMiddleware(request, reply) {
             if (userApiKey && userApiKey.user) {
                 request.authUser = userApiKey.user;
                 request.authUser.roleId = userApiKey.user.role.id;
-                request.authUser.tenantId = userApiKey.user.tenant.id;
+                request.authUser.tenantId = userApiKey.user?.tenant?.id;
             }
         }
         return;

package/dist/repository/mongo/UserApiKeyMongoRepository.js

@@ -44,7 +44,7 @@ class UserMongoRepository {
         return userApiKey;
     }
     async findBySecret(secret) {
-        const userApiKey = await UserApiKeyModel.findOne({ secret: secret }).populate({ path: 'user', populate: { path: 'tenant role' } }).exec();
+        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 = [] }) {

package/dist/routes/UserApiKeyRoutes.js

@@ -41,7 +41,7 @@ async function UserApiKeyRoutes(fastify, options) {
     });
     fastify.post('/api/user-api-keys', async (request, reply) => {
         try {
-            request.rbac.assertPermission(IdentityPermissions.CreateUser);
+            request.rbac.assertPermission(IdentityPermissions.CreateUserApiKey);
             const payload = request.body;
             payload.user = request.rbac.authUser.id;
             const userApiKeyService = UserApiKeyServiceFactory();
@@ -65,7 +65,7 @@ async function UserApiKeyRoutes(fastify, options) {
     });
     fastify.put('/api/user-api-keys/:id', async (request, reply) => {
         try {
-            request.rbac.assertPermission(IdentityPermissions.UpdateUser);
+            request.rbac.assertPermission(IdentityPermissions.UpdateUserApiKey);
             const id = request.params.id;
             const payload = request.body;
             const userApiKeyService = UserApiKeyServiceFactory();
@@ -93,7 +93,7 @@ async function UserApiKeyRoutes(fastify, options) {
     });
     fastify.delete('/api/user-api-keys/:id', async (request, reply) => {
         try {
-            request.rbac.assertPermission(IdentityPermissions.DeleteUser);
+            request.rbac.assertPermission(IdentityPermissions.DeleteUserApiKey);
             const id = request.params.id;
             const userApiKeyService = UserApiKeyServiceFactory();
             let r = await userApiKeyService.delete(id);

package/dist/services/RoleService.js

@@ -14,6 +14,7 @@ class RoleService {
             return role;
         }
         catch (e) {
+            console.error("Error creating role", e);
             if (e instanceof ZodError) {
                 throw ZodErrorToValidationError(e, roleData);
             }
@@ -28,6 +29,7 @@ class RoleService {
             return role;
         }
         catch (e) {
+            console.error("Error updating role", e);
             if (e instanceof ZodError) {
                 throw ZodErrorToValidationError(e, roleData);
             }
@@ -35,24 +37,48 @@ class RoleService {
         }
     }
     async delete(id) {
-        const deletedRole = await this._repository.delete(id);
-        return deletedRole;
+        try {
+            const deletedRole = await this._repository.delete(id);
+            return deletedRole;
+        }
+        catch (e) {
+            console.error("Error deleting role", e);
+            throw e;
+        }
     }
     async findById(id) {
-        const role = await this._repository.findById(id);
-        return role;
+        try {
+            const role = await this._repository.findById(id);
+            return role;
+        }
+        catch (e) {
+            console.error("Error finding role by id", e);
+            throw e;
+        }
     }
     async findByName(name) {
-        const role = await this._repository.findByName(name);
-        return role;
+        try {
+            const role = await this._repository.findByName(name);
+            return role;
+        }
+        catch (e) {
+            console.error("Error finding role by name", e);
+            throw e;
+        }
     }
     async fetchAll() {
         const roles = await this._repository.fetchAll();
         return roles;
     }
     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;
+        try {
+            const pagination = await this._repository.paginate({ page, limit, orderBy, orderDesc, search, filters });
+            return pagination;
+        }
+        catch (e) {
+            console.error("Error paginating roles", e);
+            throw e;
+        }
     }
 }
 export default RoleService;

package/package.json

@@ -3,13 +3,12 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.1.2",
+  "version": "0.1.6",
   "description": "Identity module for user management, authentication and authorization.",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
   "type": "module",
   "scripts": {
-    "serve": "nodemon --exec node --loader ts-node/esm src/index.ts",
     "prepublish": "tsc && npm run copygql",
     "clean": "rm -rf dist",
     "copygql": "copyfiles -u 1 ./**/*.graphql dist/",
@@ -29,7 +28,7 @@
   "dependencies": {
     "@drax/common-back": "^0.1.0",
     "@drax/common-share": "^0.1.0",
-    "@drax/identity-share": "^0.1.0",
+    "@drax/identity-share": "^0.1.6",
     "bcryptjs": "^2.4.3",
     "express-jwt": "^8.4.1",
     "graphql": "^16.8.2",
@@ -60,5 +59,5 @@
       "debug": "0"
     }
   },
-  "gitHead": "79fef47b0aa97b4c46f057396dcafeb132ed1258"
+  "gitHead": "7f3a48c237eab6837d6b620ac8bfb0dc395c9fa6"
 }

package/src/middleware/apiKeyMiddleware.ts

@@ -21,7 +21,7 @@ async function apiKeyMiddleware (request, reply) {
                 if(userApiKey && userApiKey.user){
                     request.authUser = userApiKey.user
                     request.authUser.roleId = userApiKey.user.role.id
-                    request.authUser.tenantId = userApiKey.user.tenant.id
+                    request.authUser.tenantId = userApiKey.user?.tenant?.id
                 }
             }
             return

package/src/repository/mongo/UserApiKeyMongoRepository.ts

@@ -61,7 +61,7 @@ class UserMongoRepository implements IUserApiKeyRepository {
     }
 
     async findBySecret(secret: string): Promise<IUserApiKey> {
-        const userApiKey: mongoose.HydratedDocument<IUserApiKey> = await UserApiKeyModel.findOne({secret: secret}).populate({path: 'user', populate: {path: 'tenant role'}}).exec()
+        const userApiKey: mongoose.HydratedDocument<IUserApiKey> = await UserApiKeyModel.findOne({secret: {$eq: secret}, deleted: {$ne: true} }).populate({path: 'user', populate: {path: 'tenant role'}}).exec()
         return userApiKey
     }
 

package/src/routes/UserApiKeyRoutes.ts

@@ -51,7 +51,7 @@ async function UserApiKeyRoutes(fastify, options) {
 
     fastify.post('/api/user-api-keys', async (request, reply): Promise<IUserApiKey> => {
         try {
-            request.rbac.assertPermission(IdentityPermissions.CreateUser)
+            request.rbac.assertPermission(IdentityPermissions.CreateUserApiKey)
             const payload = request.body
             payload.user = request.rbac.authUser.id
 
@@ -76,7 +76,7 @@ async function UserApiKeyRoutes(fastify, options) {
 
     fastify.put('/api/user-api-keys/:id', async (request, reply): Promise<IUserApiKey> => {
         try {
-            request.rbac.assertPermission(IdentityPermissions.UpdateUser)
+            request.rbac.assertPermission(IdentityPermissions.UpdateUserApiKey)
             const id = request.params.id
             const payload = request.body
             const userApiKeyService = UserApiKeyServiceFactory()
@@ -102,7 +102,7 @@ async function UserApiKeyRoutes(fastify, options) {
 
     fastify.delete('/api/user-api-keys/:id', async (request, reply): Promise<any> => {
         try {
-            request.rbac.assertPermission(IdentityPermissions.DeleteUser)
+            request.rbac.assertPermission(IdentityPermissions.DeleteUserApiKey)
             const id = request.params.id
             const userApiKeyService = UserApiKeyServiceFactory()
             let r = await userApiKeyService.delete(id)

package/src/services/RoleService.ts

@@ -1,5 +1,5 @@
 import {IRoleRepository} from "../interfaces/IRoleRepository";
-import { ValidationError, ZodErrorToValidationError} from "@drax/common-back"
+import {ValidationError, ZodErrorToValidationError} from "@drax/common-back"
 import {roleSchema} from "../zod/RoleZod.js";
 import {ZodError} from "zod";
 import UnauthorizedError from "../errors/UnauthorizedError.js";
@@ -22,6 +22,7 @@ class RoleService {
             const role = await this._repository.create(roleData)
             return role
         } catch (e) {
+            console.error("Error creating role", e)
             if (e instanceof ZodError) {
                 throw ZodErrorToValidationError(e, roleData)
             }
@@ -36,6 +37,7 @@ class RoleService {
             const role = await this._repository.update(id, roleData)
             return role
         } catch (e) {
+            console.error("Error updating role", e)
             if (e instanceof ZodError) {
                 throw ZodErrorToValidationError(e, roleData)
             }
@@ -44,19 +46,35 @@ class RoleService {
     }
 
     async delete(id: string): Promise<boolean> {
-
-        const deletedRole = await this._repository.delete(id);
-        return deletedRole;
+        try {
+            const deletedRole = await this._repository.delete(id);
+            return deletedRole;
+        } catch (e) {
+            console.error("Error deleting role", e)
+            throw e
+        }
     }
 
     async findById(id: string): Promise<IRole | null> {
-        const role: IRole = await this._repository.findById(id);
-        return role
+        try{
+            const role: IRole = await this._repository.findById(id);
+            return role
+        }catch (e){
+            console.error("Error finding role by id", e)
+            throw e;
+        }
+
     }
 
     async findByName(name: string): Promise<IRole | null> {
-        const role: IRole = await this._repository.findByName(name);
-        return role
+        try{
+            const role: IRole = await this._repository.findByName(name);
+            return role
+        }catch (e){
+            console.error("Error finding role by name", e)
+            throw e;
+        }
+
     }
 
     async fetchAll(): Promise<IRole[]> {
@@ -65,14 +83,21 @@ class RoleService {
     }
 
     async paginate({
-                       page= 1,
-                       limit= 5,
-                       orderBy= '',
-                       orderDesc= false,
-                       search= '',
-                       filters= []} : IDraxPaginateOptions): Promise<IDraxPaginateResult<IRole>>{
-        const pagination = await this._repository.paginate({page, limit, orderBy, orderDesc, search, filters});
-        return pagination;
+                       page = 1,
+                       limit = 5,
+                       orderBy = '',
+                       orderDesc = false,
+                       search = '',
+                       filters = []
+                   }: IDraxPaginateOptions): Promise<IDraxPaginateResult<IRole>> {
+        try{
+            const pagination = await this._repository.paginate({page, limit, orderBy, orderDesc, search, filters});
+            return pagination;
+        }catch (e){
+            console.error("Error paginating roles", e)
+            throw e;
+        }
+
     }