@drax/identity-back 2.11.0 → 3.1.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/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.11.0",
+  "version": "3.1.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.11.0",
-    "@drax/crud-back": "^2.11.0",
-    "@drax/crud-share": "^2.11.0",
-    "@drax/email-back": "^2.0.0",
-    "@drax/identity-share": "^2.0.0",
+    "@drax/common-back": "^3.0.0",
+    "@drax/crud-back": "^3.1.0",
+    "@drax/crud-share": "^3.1.0",
+    "@drax/email-back": "^3.1.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": "8919d31d4d9512e48ac461b0876dc85a5849daea"
+  "gitHead": "262ea8f861c84ca1ad4d555545c5a94b95dbf25e"
 }

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/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