@drax/identity-back 2.9.0 → 3.0.0

package/dist/index.js

@@ -26,6 +26,7 @@ import { apiKeyMiddleware } from "./middleware/apiKeyMiddleware.js";
 import IdentityConfig from "./config/IdentityConfig.js";
 import BadCredentialsError from "./errors/BadCredentialsError.js";
 import CreateUserIfNotExist from "./setup/CreateUserIfNotExist.js";
+import CreateTenantIfNotExist from "./setup/CreateTenantIfNotExist.js";
 import CreateOrUpdateRole from "./setup/CreateOrUpdateRole.js";
 import LoadPermissions from "./setup/LoadPermissions.js";
 import LoadIdentityConfigFromEnv from "./setup/LoadIdentityConfigFromEnv.js";
@@ -89,4 +90,4 @@ IdentityConfig,
 //Errors
 BadCredentialsError, 
 //Setup
-LoadIdentityConfigFromEnv, LoadPermissions, CreateOrUpdateRole, CreateUserIfNotExist, RecoveryUserPassword };
+LoadIdentityConfigFromEnv, LoadPermissions, CreateOrUpdateRole, CreateUserIfNotExist, CreateTenantIfNotExist, RecoveryUserPassword };

package/dist/rbac/Rbac.js

@@ -41,6 +41,9 @@ class Rbac {
     get roleName() {
         return this?.authUser?.roleName;
     }
+    get hasTenant() {
+        return !!this?.authUser?.tenantId;
+    }
     get tenantId() {
         return this?.authUser?.tenantId?.toString();
     }

package/dist/repository/mongo/RoleMongoRepository.js

@@ -28,7 +28,7 @@ class RoleMongoRepository extends AbstractMongoRepository {
                 query['$or'] = this._searchFields.map(field => ({ [field]: new RegExp(search.toString(), 'i') }));
             }
         }
-        MongooseQueryFilter.applyFilters(query, filters);
+        MongooseQueryFilter.applyFilters(query, filters, RoleModel);
         const sort = MongooseSort.applySort(orderBy, order);
         return RoleModel.find(query).limit(limit).sort(sort).cursor();
     }

package/dist/repository/mongo/TenantMongoRepository.js

@@ -27,7 +27,7 @@ class TenantMongoRepository extends AbstractMongoRepository {
                 query['$or'] = this._searchFields.map(field => ({ [field]: new RegExp(search.toString(), 'i') }));
             }
         }
-        MongooseQueryFilter.applyFilters(query, filters);
+        MongooseQueryFilter.applyFilters(query, filters, TenantModel);
         const sort = MongooseSort.applySort(orderBy, order);
         return TenantModel.find(query).limit(limit).sort(sort).cursor();
     }

package/dist/repository/mongo/UserApiKeyMongoRepository.js

@@ -37,7 +37,7 @@ class UserApiKeyMongoRepository extends AbstractMongoRepository {
                 query['$or'] = this._searchFields.map(field => ({ [field]: new RegExp(search.toString(), 'i') }));
             }
         }
-        MongooseQueryFilter.applyFilters(query, filters);
+        MongooseQueryFilter.applyFilters(query, filters, UserApiKeyModel);
         const sort = MongooseSort.applySort(orderBy, order);
         const populate = ['user', 'user.tenant', 'user.role', 'createdBy'];
         const lean = this._lean;

package/dist/repository/mongo/UserMongoRepository.js

@@ -121,7 +121,7 @@ class UserMongoRepository extends AbstractMongoRepository {
                 query['$or'] = this._searchFields.map(field => ({ [field]: new RegExp(search.toString(), 'i') }));
             }
         }
-        MongooseQueryFilter.applyFilters(query, filters);
+        MongooseQueryFilter.applyFilters(query, filters, UserModel);
         const sort = MongooseSort.applySort(orderBy, order);
         return UserModel.find(query).populate(['role', 'tenant']).limit(limit).sort(sort).cursor();
     }

package/dist/setup/CreateTenantIfNotExist.js

@@ -0,0 +1,12 @@
+import TenantServiceFactory from "../factory/TenantServiceFactory.js";
+async function CreateTenantIfNotExist(tenantData) {
+    const tenantService = TenantServiceFactory();
+    const tenant = await tenantService.findByName(tenantData.name);
+    if (!tenant) {
+        const r = await tenantService.create(tenantData);
+        console.log("Tenant Created. Name: " + tenantData.name);
+        return r;
+    }
+}
+export default CreateTenantIfNotExist;
+export { CreateTenantIfNotExist };

package/dist/setup/CreateUserIfNotExist.js

@@ -1,8 +1,10 @@
 import RoleServiceFactory from "../factory/RoleServiceFactory.js";
 import UserServiceFactory from "../factory/UserServiceFactory.js";
+import TenantServiceFactory from "../factory/TenantServiceFactory.js";
 async function CreateUserIfNotExist(userData) {
     const userService = UserServiceFactory();
     const roleService = RoleServiceFactory();
+    const tenantService = TenantServiceFactory();
     const user = await userService.findByUsername(userData.username);
     if (user) {
         return user;
@@ -10,6 +12,10 @@ async function CreateUserIfNotExist(userData) {
     else {
         const role = await roleService.findByName(userData.role);
         userData.role = role._id.toString();
+        if (userData.tenant) {
+            const tenant = await tenantService.findByName(userData.tenant);
+            userData.tenant = tenant._id.toString();
+        }
         const r = await userService.create(userData);
         console.log("User Created. Username: " + userData.username);
         return r;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.9.0",
+  "version": "3.0.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": "^2.8.0",
-    "@drax/crud-back": "^2.9.0",
-    "@drax/crud-share": "^2.8.0",
-    "@drax/email-back": "^2.0.0",
-    "@drax/identity-share": "^2.0.0",
+    "@drax/common-back": "^3.0.0",
+    "@drax/crud-back": "^3.0.0",
+    "@drax/crud-share": "^3.0.0",
+    "@drax/email-back": "^3.0.0",
+    "@drax/identity-share": "^3.0.0",
     "bcryptjs": "^2.4.3",
     "graphql": "^16.8.2",
     "jsonwebtoken": "^9.0.2"
@@ -63,5 +63,5 @@
       "debug": "0"
     }
   },
-  "gitHead": "2bc9b59a45c762bd32403dce14db2693be34dcc7"
+  "gitHead": "63ae718b24ea25ae80b1a9a5dfb84a3abbb95199"
 }

package/src/index.ts

@@ -32,6 +32,7 @@ import IdentityConfig from "./config/IdentityConfig.js";
 import BadCredentialsError from "./errors/BadCredentialsError.js";
 
 import CreateUserIfNotExist from "./setup/CreateUserIfNotExist.js";
+import CreateTenantIfNotExist from "./setup/CreateTenantIfNotExist.js";
 import CreateOrUpdateRole from "./setup/CreateOrUpdateRole.js";
 import LoadPermissions from "./setup/LoadPermissions.js";
 import LoadIdentityConfigFromEnv from "./setup/LoadIdentityConfigFromEnv.js";
@@ -197,6 +198,7 @@ export {
     LoadPermissions,
     CreateOrUpdateRole,
     CreateUserIfNotExist,
+    CreateTenantIfNotExist,
     RecoveryUserPassword
 }
 

package/src/rbac/Rbac.ts

@@ -56,6 +56,10 @@ class Rbac implements IRbac{
         return this?.authUser?.roleName
     }
 
+    get hasTenant(): boolean  {
+        return !!this?.authUser?.tenantId;
+    }
+
     get tenantId(): string | undefined  {
         return this?.authUser?.tenantId?.toString();
     }

package/src/repository/mongo/RoleMongoRepository.ts

@@ -47,7 +47,7 @@ class RoleMongoRepository extends AbstractMongoRepository<IRole, IRoleBase,IRole
             }
         }
 
-        MongooseQueryFilter.applyFilters(query, filters)
+        MongooseQueryFilter.applyFilters(query, filters,RoleModel)
 
         const sort = MongooseSort.applySort(orderBy, order)
 

package/src/repository/mongo/TenantMongoRepository.ts

@@ -41,7 +41,7 @@ class TenantMongoRepository extends AbstractMongoRepository<ITenant, ITenantBase
             }
         }
 
-        MongooseQueryFilter.applyFilters(query, filters)
+        MongooseQueryFilter.applyFilters(query, filters, TenantModel)
 
         const sort = MongooseSort.applySort(orderBy, order)
 

package/src/repository/mongo/UserApiKeyMongoRepository.ts

@@ -59,7 +59,7 @@ class UserApiKeyMongoRepository extends AbstractMongoRepository<IUserApiKey,IUse
             }
         }
 
-        MongooseQueryFilter.applyFilters(query, filters)
+        MongooseQueryFilter.applyFilters(query, filters, UserApiKeyModel)
 
         const sort = MongooseSort.applySort(orderBy, order)
         const populate = ['user', 'user.tenant', 'user.role', 'createdBy']

package/src/repository/mongo/UserMongoRepository.ts

@@ -153,7 +153,7 @@ class UserMongoRepository extends AbstractMongoRepository<IUser,IUserCreate,IUse
             }
         }
 
-        MongooseQueryFilter.applyFilters(query, filters)
+        MongooseQueryFilter.applyFilters(query, filters, UserModel)
 
         const sort = MongooseSort.applySort(orderBy, order)
 

package/src/setup/CreateTenantIfNotExist.ts

@@ -0,0 +1,18 @@
+import type {ITenantBase, ITenant} from "@drax/identity-share"
+import TenantServiceFactory from "../factory/TenantServiceFactory.js"
+
+async function CreateTenantIfNotExist(tenantData: ITenantBase):Promise<ITenant> {
+    const tenantService = TenantServiceFactory()
+    const tenant = await tenantService.findByName(tenantData.name)
+
+    if(!tenant){
+        const r = await tenantService.create(tenantData)
+        console.log("Tenant Created. Name: "+ tenantData.name)
+        return r
+    }
+}
+
+export default CreateTenantIfNotExist
+export {
+    CreateTenantIfNotExist
+}

package/src/setup/CreateUserIfNotExist.ts

@@ -1,16 +1,24 @@
 import RoleServiceFactory from "../factory/RoleServiceFactory.js"
 import UserServiceFactory from "../factory/UserServiceFactory.js"
+import TenantServiceFactory from "../factory/TenantServiceFactory.js"
 import {IUserCreate, IUser} from "@drax/identity-share";
 
 async function CreateUserIfNotExist(userData: IUserCreate): Promise<IUser> {
     const userService = UserServiceFactory()
     const roleService = RoleServiceFactory()
+    const tenantService = TenantServiceFactory()
     const user = await userService.findByUsername(userData.username)
     if (user) {
         return user
     } else {
         const role = await roleService.findByName(userData.role as string)
         userData.role = role._id.toString()
+
+        if(userData.tenant){
+            const tenant = await tenantService.findByName(userData.tenant as string)
+            userData.tenant = tenant._id.toString()
+        }
+
         const r = await userService.create(userData)
         console.log("User Created. Username: " + userData.username)
         return r