@drax/identity-back 0.1.0 → 0.1.4

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/dist/services/TenantService.js

@@ -14,6 +14,7 @@ class TenantService {
             return tenant;
         }
         catch (e) {
+            console.error("Error creating tenant", e);
             if (e instanceof ZodError) {
                 throw ZodErrorToValidationError(e, tenantData);
             }
@@ -28,6 +29,7 @@ class TenantService {
             return tenant;
         }
         catch (e) {
+            console.error("Error updating tenant", e);
             if (e instanceof ZodError) {
                 throw ZodErrorToValidationError(e, tenantData);
             }
@@ -35,25 +37,54 @@ class TenantService {
         }
     }
     async delete(id) {
-        const currentTenant = await this.findById(id);
-        const deletedTenant = await this._repository.delete(id);
-        return deletedTenant;
+        try {
+            const deletedTenant = await this._repository.delete(id);
+            return deletedTenant;
+        }
+        catch (e) {
+            console.error("Error deleting tenant", e);
+            throw e;
+        }
     }
     async findById(id) {
-        const tenant = await this._repository.findById(id);
-        return tenant;
+        try {
+            const tenant = await this._repository.findById(id);
+            return tenant;
+        }
+        catch (e) {
+            console.error("Error finding tenant by id", e);
+            throw e;
+        }
     }
     async findByName(name) {
-        const tenant = await this._repository.findByName(name);
-        return tenant;
+        try {
+            const tenant = await this._repository.findByName(name);
+            return tenant;
+        }
+        catch (e) {
+            console.error("Error finding tenant by name", e);
+            throw e;
+        }
     }
     async fetchAll() {
-        const tenants = await this._repository.fetchAll();
-        return tenants;
+        try {
+            const tenants = await this._repository.fetchAll();
+            return tenants;
+        }
+        catch (e) {
+            console.error("Error fetching all tenants", e);
+            throw e;
+        }
     }
     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 tenants", e);
+            throw e;
+        }
     }
 }
 export default TenantService;

package/dist/services/UserApiKeyService.js

@@ -21,6 +21,7 @@ class UserApiKeyService {
             return userApiKey;
         }
         catch (e) {
+            console.error("Error creating userApiKey", e);
             if (e instanceof ZodError) {
                 throw ZodErrorToValidationError(e, userApiKeyData);
             }
@@ -36,6 +37,7 @@ class UserApiKeyService {
             return userApiKey;
         }
         catch (e) {
+            console.error("Error updating userApiKey", e);
             if (e instanceof ZodError) {
                 throw ZodErrorToValidationError(e, userApiKeyData);
             }
@@ -43,23 +45,46 @@ class UserApiKeyService {
         }
     }
     async delete(id) {
-        const currentUserApiKey = await this.findById(id);
-        const deletedUserApiKey = await this._repository.delete(id);
-        return deletedUserApiKey;
+        try {
+            const deletedUserApiKey = await this._repository.delete(id);
+            return deletedUserApiKey;
+        }
+        catch (e) {
+            console.error("Error deleting userApiKey", e);
+            throw e;
+        }
     }
     async findById(id) {
-        const userApiKey = await this._repository.findById(id);
-        return userApiKey;
+        try {
+            const userApiKey = await this._repository.findById(id);
+            return userApiKey;
+        }
+        catch (e) {
+            console.error("Error finding userApiKey by id", e);
+            throw e;
+        }
     }
     async findBySecret(secret) {
-        const APIKEY_SECRET = DraxConfig.getOrLoad(IdentityConfig.ApiKeySecret);
-        const hashedSecret = AuthUtils.generateHMAC(APIKEY_SECRET, secret);
-        const userApiKey = await this._repository.findBySecret(hashedSecret);
-        return userApiKey;
+        try {
+            const APIKEY_SECRET = DraxConfig.getOrLoad(IdentityConfig.ApiKeySecret);
+            const hashedSecret = AuthUtils.generateHMAC(APIKEY_SECRET, secret);
+            const userApiKey = await this._repository.findBySecret(hashedSecret);
+            return userApiKey;
+        }
+        catch (e) {
+            console.error("Error finding userApiKey by secret", e);
+            throw e;
+        }
     }
     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 userApiKeys", e);
+            throw e;
+        }
     }
 }
 export default UserApiKeyService;

package/dist/services/UserService.js

@@ -74,6 +74,7 @@ class UserService {
             return user;
         }
         catch (e) {
+            console.error("Error creating user", e);
             if (e instanceof ZodError) {
                 throw ZodErrorToValidationError(e, userData);
             }
@@ -91,6 +92,7 @@ class UserService {
             return user;
         }
         catch (e) {
+            console.error("Error updating user", e);
             if (e instanceof ZodError) {
                 throw ZodErrorToValidationError(e, userData);
             }
@@ -98,20 +100,44 @@ class UserService {
         }
     }
     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 user", e);
+            throw e;
+        }
     }
     async findById(id) {
-        const user = await this._repository.findById(id);
-        return user;
+        try {
+            const user = await this._repository.findById(id);
+            return user;
+        }
+        catch (e) {
+            console.error("Error finding user by id", e);
+            throw e;
+        }
     }
     async findByUsername(username) {
-        const user = await this._repository.findByUsername(username);
-        return user;
+        try {
+            const user = await this._repository.findByUsername(username);
+            return user;
+        }
+        catch (e) {
+            console.error("Error finding user by username", e);
+            throw e;
+        }
     }
     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 users", e);
+            throw e;
+        }
     }
 }
 export default UserService;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.1.0",
+  "version": "0.1.4",
   "description": "Identity module for user management, authentication and authorization.",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -60,5 +60,5 @@
       "debug": "0"
     }
   },
-  "gitHead": "bec2a22554155ef5deab5a55245878a4449932ad"
+  "gitHead": "c9b0f92abc19463226d7faa8aa5c4f6631910740"
 }

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;
+        }
+
     }
 
 

package/src/services/TenantService.ts

@@ -21,6 +21,7 @@ class TenantService {
             const tenant = await this._repository.create(tenantData)
             return tenant
         } catch (e) {
+            console.error("Error creating tenant", e)
             if (e instanceof ZodError) {
                 throw ZodErrorToValidationError(e, tenantData)
             }
@@ -35,6 +36,7 @@ class TenantService {
             const tenant = await this._repository.update(id, tenantData)
             return tenant
         } catch (e) {
+            console.error("Error updating tenant", e)
             if (e instanceof ZodError) {
                 throw ZodErrorToValidationError(e, tenantData)
             }
@@ -43,35 +45,65 @@ class TenantService {
     }
 
     async delete(id: string): Promise<boolean> {
-        const currentTenant = await this.findById(id)
-        const deletedTenant = await this._repository.delete(id);
-        return deletedTenant;
+        try {
+            const deletedTenant = await this._repository.delete(id);
+            return deletedTenant;
+        } catch (e) {
+            console.error("Error deleting tenant", e)
+            throw e;
+        }
+
     }
 
     async findById(id: string): Promise<ITenant | null> {
-        const tenant: ITenant = await this._repository.findById(id);
-        return tenant
+        try {
+            const tenant: ITenant = await this._repository.findById(id);
+            return tenant
+        } catch (e) {
+            console.error("Error finding tenant by id", e)
+            throw e;
+        }
+
     }
 
     async findByName(name: string): Promise<ITenant | null> {
-        const tenant: ITenant = await this._repository.findByName(name);
-        return tenant
+        try {
+            const tenant: ITenant = await this._repository.findByName(name);
+            return tenant
+        } catch (e) {
+            console.error("Error finding tenant by name", e)
+            throw e;
+        }
+
     }
 
     async fetchAll(): Promise<ITenant[]> {
-        const tenants: ITenant[] = await this._repository.fetchAll();
-        return tenants
+        try {
+            const tenants: ITenant[] = await this._repository.fetchAll();
+            return tenants
+        } catch (e) {
+            console.error("Error fetching all tenants", e)
+            throw e;
+        }
+
     }
 
     async paginate({
-                       page= 1,
-                       limit= 5,
-                       orderBy= '',
-                       orderDesc= false,
-                       search= '',
-                       filters= []} : IDraxPaginateOptions): Promise<IDraxPaginateResult<ITenant>>{
-        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<ITenant>> {
+        try {
+            const pagination = await this._repository.paginate({page, limit, orderBy, orderDesc, search, filters});
+            return pagination;
+        } catch (e) {
+            console.error("Error paginating tenants", e)
+            throw e;
+        }
+
     }
 
 

package/src/services/UserApiKeyService.ts

@@ -28,6 +28,7 @@ class UserApiKeyService {
             userApiKey.secret = secret
             return userApiKey
         } catch (e) {
+            console.error("Error creating userApiKey", e)
             if (e instanceof ZodError) {
                 throw ZodErrorToValidationError(e, userApiKeyData)
             }
@@ -43,6 +44,7 @@ class UserApiKeyService {
             const userApiKey = await this._repository.update(id, userApiKeyData)
             return userApiKey
         } catch (e) {
+            console.error("Error updating userApiKey", e)
             if (e instanceof ZodError) {
                 throw ZodErrorToValidationError(e, userApiKeyData)
             }
@@ -51,33 +53,56 @@ class UserApiKeyService {
     }
 
     async delete(id: string): Promise<boolean> {
-        const currentUserApiKey = await this.findById(id)
-        const deletedUserApiKey = await this._repository.delete(id);
-        return deletedUserApiKey;
+        try {
+            const deletedUserApiKey = await this._repository.delete(id);
+            return deletedUserApiKey;
+        } catch (e) {
+            console.error("Error deleting userApiKey", e)
+            throw e
+        }
+
     }
 
     async findById(id: string): Promise<IUserApiKey | null> {
-        const userApiKey: IUserApiKey = await this._repository.findById(id);
-        return userApiKey
+        try{
+            const userApiKey: IUserApiKey = await this._repository.findById(id);
+            return userApiKey
+        }catch (e){
+            console.error("Error finding userApiKey by id", e)
+            throw e
+        }
+
     }
 
     async findBySecret(secret: string): Promise<IUserApiKey | null> {
-        const APIKEY_SECRET = DraxConfig.getOrLoad(IdentityConfig.ApiKeySecret)
-        const hashedSecret = AuthUtils.generateHMAC(APIKEY_SECRET, secret)
-        const userApiKey: IUserApiKey = await this._repository.findBySecret(hashedSecret);
-        return userApiKey
+        try{
+            const APIKEY_SECRET = DraxConfig.getOrLoad(IdentityConfig.ApiKeySecret)
+            const hashedSecret = AuthUtils.generateHMAC(APIKEY_SECRET, secret)
+            const userApiKey: IUserApiKey = await this._repository.findBySecret(hashedSecret);
+            return userApiKey
+        }catch (e){
+            console.error("Error finding userApiKey by secret", e)
+            throw e
+        }
+
     }
 
 
     async paginate({
-                       page= 1,
-                       limit= 5,
-                       orderBy= '',
-                       orderDesc= false,
-                       search= '',
-                       filters= []} : IDraxPaginateOptions): Promise<IDraxPaginateResult<IUserApiKey>>{
-        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<IUserApiKey>> {
+        try {
+            const pagination = await this._repository.paginate({page, limit, orderBy, orderDesc, search, filters});
+            return pagination;
+        } catch (e) {
+            console.error("Error paginating userApiKeys", e)
+            throw e
+        }
     }