@drax/identity-back 0.40.0 → 0.43.0

package/dist/controllers/UserController.js

@@ -1,6 +1,6 @@
 import { AbstractFastifyController } from "@drax/crud-back";
 import RegistrationCompleteHtml from "../html/RegistrationCompleteHtml.js";
-import { CommonConfig, DraxConfig, StoreManager, ValidationError, UnauthorizedError, SecuritySensitiveError, BadRequestError, } from "@drax/common-back";
+import { CommonConfig, DraxConfig, StoreManager, ValidationError, UnauthorizedError, SecuritySensitiveError, } from "@drax/common-back";
 import UserServiceFactory from "../factory/UserServiceFactory.js";
 import RoleServiceFactory from "../factory/RoleServiceFactory.js";
 import UserPermissions from "../permissions/UserPermissions.js";
@@ -116,13 +116,7 @@ class UserController extends AbstractFastifyController {
             request.rbac.assertPermission(UserPermissions.SwitchTenant);
             if (request.authUser && request.token) {
                 const tenantId = request.body.tenantId;
-                if (!tenantId) {
-                    throw new BadRequestError('Missing tenantId');
-                }
-                const tenant = await TenantServiceFactory().findById(tenantId);
-                if (!tenant) {
-                    throw new BadRequestError('Invalid tenantId');
-                }
+                const tenant = tenantId ? await TenantServiceFactory().findById(tenantId) : undefined;
                 const tenantName = tenant?.name;
                 const userService = UserServiceFactory();
                 let { accessToken } = await userService.switchTenant(request.token, tenantId, tenantName);

package/dist/middleware/rbacMiddleware.js

@@ -17,10 +17,12 @@ async function rbacMiddleware(request, reply) {
             const role = await draxCache.getOrLoad(cacheKey, roleLoader);
             const rbac = new Rbac(authUser, role);
             request.rbac = rbac;
+            reply.rbac = rbac;
         }
         else {
             const rbac = new Rbac(null, null);
             request.rbac = rbac;
+            reply.rbac = rbac;
         }
         return;
     }

package/dist/routes/UserAvatarRoutes.js

@@ -50,7 +50,7 @@ async function UserAvatarRoutes(fastify, options) {
             const filename = request.params.filename;
             const subPath = 'avatar';
             const fileDir = join(BASE_FILE_DIR, subPath);
-            console.log("FILE_DIR: ", fileDir, " FILENAME:", filename);
+            //console.log("FILE_DIR: ", fileDir, " FILENAME:", filename);
             return reply.sendFile(filename, fileDir);
         }
         catch (e) {

package/dist/services/RoleService.js

@@ -6,7 +6,6 @@ class RoleService extends AbstractService {
     constructor(roleRepostitory) {
         super(roleRepostitory, RoleBaseSchema);
         this._repository = roleRepostitory;
-        console.log("RoleService constructor");
     }
     async create(roleData) {
         try {

package/dist/services/TenantService.js

@@ -6,7 +6,6 @@ class TenantService extends AbstractService {
     constructor(tenantRepostitory) {
         super(tenantRepostitory, TenantBaseSchema);
         this._repository = tenantRepostitory;
-        console.log("TenantService constructor");
     }
     async create(tenantData) {
         try {

package/dist/services/UserApiKeyService.js

@@ -9,7 +9,6 @@ class UserApiKeyService extends AbstractService {
     constructor(userApiKeyRepostitory) {
         super(userApiKeyRepostitory, UserApiKeyBaseSchema);
         this._repository = userApiKeyRepostitory;
-        console.log("UserApiKeyService constructor");
     }
     async create(userApiKeyData) {
         try {

package/dist/services/UserService.js

@@ -11,7 +11,6 @@ class UserService extends AbstractService {
     constructor(userRepository) {
         super(userRepository, UserBaseSchema);
         this._repository = userRepository;
-        console.log("UserService constructor");
     }
     async auth(username, password, { userAgent, ip }) {
         let user = null;

package/dist/setup/CreateOrUpdateRole.js

@@ -15,7 +15,6 @@ async function CreateOrUpdateRole(roleData) {
         }));
     }
     if (role) {
-        console.log("RoleData", roleData);
         const r = await roleService.systemUpdate(role._id.toString(), roleData);
         console.log("Role Updated. Name: " + roleData.name);
         return r;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.40.0",
+  "version": "0.43.0",
   "description": "Identity module for user management, authentication and authorization.",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -28,11 +28,11 @@
   "author": "Cristian Incarnato & Drax Team",
   "license": "ISC",
   "dependencies": {
-    "@drax/common-back": "^0.40.0",
-    "@drax/crud-back": "^0.40.0",
-    "@drax/crud-share": "^0.40.0",
-    "@drax/email-back": "^0.40.0",
-    "@drax/identity-share": "^0.40.0",
+    "@drax/common-back": "^0.43.0",
+    "@drax/crud-back": "^0.43.0",
+    "@drax/crud-share": "^0.43.0",
+    "@drax/email-back": "^0.43.0",
+    "@drax/identity-share": "^0.43.0",
     "bcryptjs": "^2.4.3",
     "graphql": "^16.8.2",
     "jsonwebtoken": "^9.0.2"
@@ -63,5 +63,5 @@
       "debug": "0"
     }
   },
-  "gitHead": "269ec7921d83364dfba091cd74bd3f45a8135c26"
+  "gitHead": "3451a1c66eaf3facd4fef67d96750bf5d38a1d5c"
 }

package/src/controllers/UserController.ts

@@ -141,15 +141,9 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
 
             if (request.authUser && request.token) {
                 const tenantId = request.body.tenantId
-                if (!tenantId) {
-                    throw new BadRequestError('Missing tenantId')
-                }
 
-                const tenant = await TenantServiceFactory().findById(tenantId);
 
-                if (!tenant) {
-                    throw new BadRequestError('Invalid tenantId')
-                }
+                const tenant = tenantId ? await TenantServiceFactory().findById(tenantId) : undefined;
 
                 const tenantName = tenant?.name;
                 const userService = UserServiceFactory()

package/src/middleware/rbacMiddleware.ts

@@ -22,9 +22,11 @@ async function rbacMiddleware (request, reply) {
                 const role : IRole = await draxCache.getOrLoad(cacheKey, roleLoader)
                 const rbac: IRbac = new Rbac(authUser,role)
                 request.rbac = rbac
+                reply.rbac = rbac
             }else{
                 const rbac: IRbac = new Rbac(null,null)
                 request.rbac = rbac
+                reply.rbac = rbac
             }
             return
         }catch (e) {

package/src/services/RoleService.ts

@@ -13,7 +13,6 @@ class RoleService extends AbstractService<IRole, IRoleBase, IRoleBase> {
     constructor(roleRepostitory: IRoleRepository) {
         super(roleRepostitory, RoleBaseSchema)
         this._repository = roleRepostitory
-        console.log("RoleService constructor")
     }
 
     async create(roleData: IRoleBase): Promise<IRole> {

package/src/services/TenantService.ts

@@ -13,7 +13,6 @@ class TenantService extends AbstractService<ITenant,ITenantBase,ITenantBase> {
     constructor(tenantRepostitory: ITenantRepository) {
         super(tenantRepostitory, TenantBaseSchema)
         this._repository = tenantRepostitory
-        console.log("TenantService constructor")
     }
 
     async create(tenantData: ITenantBase): Promise<ITenant> {

package/src/services/UserApiKeyService.ts

@@ -16,7 +16,6 @@ class UserApiKeyService extends AbstractService<IUserApiKey, IUserApiKeyBase, IU
     constructor(userApiKeyRepostitory: IUserApiKeyRepository) {
         super(userApiKeyRepostitory,UserApiKeyBaseSchema)
         this._repository = userApiKeyRepostitory
-        console.log("UserApiKeyService constructor")
     }
 
     async create(userApiKeyData: IUserApiKeyBase): Promise<IUserApiKey> {

package/src/services/UserService.ts

@@ -19,7 +19,6 @@ class UserService extends AbstractService<IUser, IUserCreate, IUserUpdate> {
     constructor(userRepository: IUserRepository) {
         super(userRepository, UserBaseSchema);
         this._repository = userRepository;
-        console.log("UserService constructor")
     }
 
     async auth(username: string, password: string, {userAgent, ip}) {

package/src/setup/CreateOrUpdateRole.ts

@@ -18,7 +18,6 @@ async function CreateOrUpdateRole(roleData: IRoleBase):Promise<IRole> {
     }
 
     if(role){
-        console.log("RoleData",roleData)
         const r = await roleService.systemUpdate(role._id.toString(), roleData)
         console.log("Role Updated. Name: "+ roleData.name)
         return r