@forklaunch/implementation-iam-base 0.8.21 → 0.9.0

package/lib/services/index.mjs

@@ -35,7 +35,7 @@ var BaseOrganizationService = class {
     if (em) {
       await em.persist(organization);
     } else {
-      await this.em.persistAndFlush(organization);
+      await this.em.persist(organization).flush();
     }
     return this.mappers.OrganizationMapper.toDto(organization);
   }
@@ -44,11 +44,8 @@ var BaseOrganizationService = class {
       this.openTelemetryCollector.info("Getting organization", idDto);
     }
     const organization = await (em ?? this.em).findOneOrFail(
-      "Organization",
-      idDto,
-      {
-        populate: ["id", "*"]
-      }
+      this.mappers.OrganizationMapper.entity,
+      idDto
     );
     return this.mappers.OrganizationMapper.toDto(
       organization
@@ -69,7 +66,7 @@ var BaseOrganizationService = class {
     if (em) {
       await em.persist(updatedOrganization);
     } else {
-      await this.em.persistAndFlush(updatedOrganization);
+      await this.em.persist(updatedOrganization).flush();
     }
     return this.mappers.OrganizationMapper.toDto(updatedOrganization);
   }
@@ -78,9 +75,15 @@ var BaseOrganizationService = class {
       this.openTelemetryCollector.info("Deleting organization", idDto);
     }
     if (em) {
-      await em.nativeDelete("Organization", idDto);
+      await em.nativeDelete(
+        this.mappers.OrganizationMapper.entity,
+        idDto
+      );
     } else {
-      await this.em.nativeDelete("Organization", idDto);
+      await this.em.nativeDelete(
+        this.mappers.OrganizationMapper.entity,
+        idDto
+      );
     }
   }
 };
@@ -112,7 +115,7 @@ var BasePermissionService = class {
   async updateRolesWithPermissions(roles, permissions) {
     return Promise.all(
       roles.map(async (role) => {
-        permissions.forEach((permission) => role.permissions.add(permission));
+        permissions.forEach((permission) => role.permissions?.add(permission));
         return role;
       })
     );
@@ -121,7 +124,7 @@ var BasePermissionService = class {
     return Promise.all(
       roles.map(async (role) => {
         permissions.forEach(
-          (permission) => role.permissions.remove(permission)
+          (permission) => role.permissions?.remove(permission)
         );
         return role;
       })
@@ -151,7 +154,10 @@ var BasePermissionService = class {
     if (addToRoles) {
       roles = await this.updateRolesWithPermissions(addToRoles, [permission]);
     }
-    return { permission, roles };
+    return {
+      permission,
+      roles
+    };
   }
   async extractCreatePermissionEntityToEntityData(permissionDto, em, ...args) {
     return {
@@ -183,7 +189,7 @@ var BasePermissionService = class {
     if (em) {
       await em.persist([permission, ...roles]);
     } else {
-      await this.em.persistAndFlush([permission, ...roles]);
+      await this.em.persist([permission, ...roles]).flush();
     }
     return this.mappers.PermissionMapper.toDto(permission);
   }
@@ -205,23 +211,23 @@ var BasePermissionService = class {
       );
       await Promise.all(
         roles.map(async (role) => {
-          if (!role.permissions.isInitialized()) {
-            return role.permissions.init();
+          if (!role.permissions?.isInitialized()) {
+            return role.permissions?.init();
           }
         })
       );
       await Promise.all(
         roles.map(async (role) => {
-          if (!role.permissions.isInitialized()) {
-            return role.permissions.init();
+          if (!role.permissions?.isInitialized()) {
+            return role.permissions?.init();
           }
         })
       );
       roles.forEach((role) => {
         if (rolesCache[role.id] && role.permissions !== rolesCache[role.id].permissions) {
-          role.permissions.getItems().forEach((permission2) => {
-            if (!rolesCache[role.id].permissions.contains(permission2)) {
-              rolesCache[role.id].permissions.add(permission2);
+          role.permissions?.getItems().forEach((permission2) => {
+            if (!rolesCache[role.id].permissions?.contains(permission2)) {
+              rolesCache[role.id].permissions?.add(permission2);
             }
           });
         } else {
@@ -234,7 +240,7 @@ var BasePermissionService = class {
     if (em) {
       await em.persist(entities);
     } else {
-      await this.em.persistAndFlush(entities);
+      await this.em.persist(entities).flush();
     }
     return Promise.all(
       permissions.map(
@@ -246,7 +252,10 @@ var BasePermissionService = class {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Getting permission", idDto);
     }
-    const permission = await (em ?? this.em).findOneOrFail("Permission", idDto);
+    const permission = await (em ?? this.em).findOneOrFail(
+      this.mappers.PermissionMapper.entity,
+      idDto
+    );
     return this.mappers.PermissionMapper.toDto(
       permission
     );
@@ -256,9 +265,12 @@ var BasePermissionService = class {
       this.openTelemetryCollector.info("Getting batch permissions", idsDto);
     }
     return Promise.all(
-      (await (em ?? this.em).find("Permission", {
-        id: { $in: idsDto.ids }
-      })).map(
+      (await (em ?? this.em).find(
+        this.mappers.PermissionMapper.entity,
+        {
+          id: { $in: idsDto.ids }
+        }
+      )).map(
         (permission) => this.mappers.PermissionMapper.toDto(
           permission
         )
@@ -276,10 +288,14 @@ var BasePermissionService = class {
     const removeFromRoles = permissionDto.removeFromRolesIds ? await this.getBatchRoles({ ids: permissionDto.removeFromRolesIds }, em) : [];
     let roles = [];
     roles = roles.concat(
-      await this.updateRolesWithPermissions(addToRoles, [permission])
+      await this.updateRolesWithPermissions(addToRoles, [
+        permission
+      ])
     );
     roles = roles.concat(
-      await this.removePermissionsFromRoles(removeFromRoles, [permission])
+      await this.removePermissionsFromRoles(removeFromRoles, [
+        permission
+      ])
     );
     return {
       permission,
@@ -296,7 +312,7 @@ var BasePermissionService = class {
     if (em) {
       await em.persist(entities);
     } else {
-      await this.em.persistAndFlush(entities);
+      await this.em.persist(entities).flush();
     }
     return this.mappers.PermissionMapper.toDto(permission);
   }
@@ -314,9 +330,9 @@ var BasePermissionService = class {
         const { permission, roles } = await this.updatePermissionDto(updatePermissionDto);
         roles.forEach((role) => {
           if (rolesCache[role.id] && role.permissions !== rolesCache[role.id].permissions) {
-            role.permissions.getItems().forEach((permission2) => {
-              if (!rolesCache[role.id].permissions.contains(permission2)) {
-                rolesCache[role.id].permissions.add(permission2);
+            role.permissions?.getItems().forEach((permission2) => {
+              if (!rolesCache[role.id].permissions?.contains(permission2)) {
+                rolesCache[role.id].permissions?.add(permission2);
               }
             });
           } else {
@@ -329,7 +345,7 @@ var BasePermissionService = class {
       if (em2) {
         await em2.persist(entities);
       } else {
-        await this.em.persistAndFlush(entities);
+        await this.em.persist(entities).flush();
       }
     });
     return Promise.all(
@@ -342,15 +358,21 @@ var BasePermissionService = class {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Deleting permission", idDto);
     }
-    await (em ?? this.em).nativeDelete("Permission", idDto);
+    await (em ?? this.em).nativeDelete(
+      this.mappers.PermissionMapper.entity,
+      idDto
+    );
   }
   async deleteBatchPermissions(idsDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Deleting batch permissions", idsDto);
     }
-    await (em ?? this.em).nativeDelete("Permission", {
-      id: { $in: idsDto.ids }
-    });
+    await (em ?? this.em).nativeDelete(
+      this.mappers.PermissionMapper.entity,
+      {
+        id: { $in: idsDto.ids }
+      }
+    );
   }
 };
 
@@ -387,7 +409,7 @@ var BaseRoleService = class {
     if (em) {
       await em.persist(role);
     } else {
-      await this.em.persistAndFlush(role);
+      await this.em.persist(role).flush();
     }
     return this.mappers.RoleMapper.toDto(role);
   }
@@ -403,7 +425,7 @@ var BaseRoleService = class {
     if (em) {
       await em.persist(roles);
     } else {
-      await this.em.persistAndFlush(roles);
+      await this.em.persist(roles).flush();
     }
     return Promise.all(
       roles.map((role) => this.mappers.RoleMapper.toDto(role))
@@ -413,10 +435,16 @@ var BaseRoleService = class {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Getting role", { id });
     }
-    const role = await (em ?? this.em).findOneOrFail("Role", id, {
-      populate: ["id", "*"]
-    });
-    return this.mappers.RoleMapper.toDto(role);
+    const role = await (em ?? this.em).findOneOrFail(
+      this.mappers.RoleMapper.entity,
+      id,
+      {
+        populate: ["id", "*"]
+      }
+    );
+    return this.mappers.RoleMapper.toDto(
+      role
+    );
   }
   async getBatchRoles({ ids }, em) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -424,7 +452,7 @@ var BaseRoleService = class {
     }
     return Promise.all(
       (await (em ?? this.em).find(
-        "Role",
+        this.mappers.RoleMapper.entity,
         {
           id: { $in: ids }
         },
@@ -432,7 +460,9 @@ var BaseRoleService = class {
           populate: ["id", "*"]
         }
       )).map(
-        (role) => this.mappers.RoleMapper.toDto(role)
+        (role) => this.mappers.RoleMapper.toDto(
+          role
+        )
       )
     );
   }
@@ -448,7 +478,7 @@ var BaseRoleService = class {
     if (em) {
       await em.persist(role);
     } else {
-      await this.em.persistAndFlush(role);
+      await this.em.persist(role).flush();
     }
     return this.mappers.RoleMapper.toDto(role);
   }
@@ -464,25 +494,31 @@ var BaseRoleService = class {
     if (em) {
       await em.persist(roles);
     } else {
-      await this.em.persistAndFlush(roles);
+      await this.em.persist(roles).flush();
     }
     return Promise.all(
-      roles.map(
-        (role) => this.mappers.RoleMapper.toDto(role)
-      )
+      roles.map((role) => this.mappers.RoleMapper.toDto(role))
     );
   }
   async deleteRole(idDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Deleting role", idDto);
     }
-    await (em ?? this.em).nativeDelete("Role", idDto);
+    await (em ?? this.em).nativeDelete(
+      this.mappers.RoleMapper.entity,
+      idDto
+    );
   }
   async deleteBatchRoles(idsDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Deleting batch roles", idsDto);
     }
-    await (em ?? this.em).nativeDelete("Role", { id: { $in: idsDto.ids } });
+    await (em ?? this.em).nativeDelete(
+      this.mappers.RoleMapper.entity,
+      {
+        id: { $in: idsDto.ids }
+      }
+    );
   }
 };
 
@@ -523,7 +559,7 @@ var BaseUserService = class {
     if (em) {
       await em.persist(user);
     } else {
-      await this.em.persistAndFlush(user);
+      await this.em.persist(user).flush();
     }
     return this.mappers.UserMapper.toDto(user);
   }
@@ -543,42 +579,52 @@ var BaseUserService = class {
     if (em) {
       await em.persist(users);
     } else {
-      await this.em.persistAndFlush(users);
+      await this.em.persist(users).flush();
     }
     return Promise.all(
       users.map((user) => this.mappers.UserMapper.toDto(user))
     );
   }
   async getOrganizationIdByUserId(idDto, em) {
-    const user = await (em ?? this.em).findOne("User", idDto, {
-      populate: ["id", "organization"]
-    });
+    const user = await (em ?? this.em).findOne(
+      this.mappers.UserMapper.entity,
+      idDto,
+      {
+        populate: ["id", "organization"]
+      }
+    );
     return user?.organization?.id;
   }
   async getUser(idDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Getting user", idDto);
     }
-    const user = await (em ?? this.em).findOneOrFail("User", idDto, {
-      populate: ["id", "*"]
-    });
-    return this.mappers.UserMapper.toDto(user);
+    const user = await (em ?? this.em).findOneOrFail(
+      this.mappers.UserMapper.entity,
+      idDto,
+      {
+        populate: ["id", "*"]
+      }
+    );
+    return this.mappers.UserMapper.toDto(
+      user
+    );
   }
   async getBatchUsers(idsDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Getting batch users", idsDto);
     }
-    const filter = {
-      id: { $in: idsDto.ids },
-      ...idsDto.organization && {
-        organization: idsDto.organization
-      }
-    };
     return Promise.all(
-      (await (em ?? this.em).find("User", filter, {
-        populate: ["id", "*"]
-      })).map(
-        (user) => this.mappers.UserMapper.toDto(user)
+      (await (em ?? this.em).find(
+        this.mappers.UserMapper.entity,
+        idsDto,
+        {
+          populate: ["id", "*"]
+        }
+      )).map(
+        (user) => this.mappers.UserMapper.toDto(
+          user
+        )
       )
     );
   }
@@ -594,7 +640,7 @@ var BaseUserService = class {
     if (em) {
       await em.persist(user);
     } else {
-      await this.em.persistAndFlush(user);
+      await this.em.persist(user).flush();
     }
     return this.mappers.UserMapper.toDto(user);
   }
@@ -614,7 +660,7 @@ var BaseUserService = class {
     if (em) {
       await em.persist(users);
     } else {
-      await this.em.persistAndFlush(users);
+      await this.em.persist(users).flush();
     }
     return Promise.all(
       users.map((user) => this.mappers.UserMapper.toDto(user))
@@ -631,7 +677,10 @@ var BaseUserService = class {
         organization: idDto.organization
       }
     };
-    await (em ?? this.em).nativeDelete("User", filter);
+    await (em ?? this.em).nativeDelete(
+      this.mappers.UserMapper.entity,
+      filter
+    );
   }
   async deleteBatchUsers(idsDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -641,10 +690,13 @@ var BaseUserService = class {
       ...idsDto,
       id: { $in: idsDto.ids },
       ...idsDto.organization && {
-        organization: idsDto.organization
+        organization: idsDto.organization.id
       }
     };
-    await (em ?? this.em).nativeDelete("User", filter);
+    await (em ?? this.em).nativeDelete(
+      this.mappers.UserMapper.entity,
+      filter
+    );
   }
   async surfaceRoles(idDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forklaunch/implementation-iam-base",
-  "version": "0.8.21",
+  "version": "0.9.0",
   "description": "IAM basic implementation for forklaunch",
   "homepage": "https://github.com/forklaunch/forklaunch-js#readme",
   "bugs": {
@@ -36,18 +36,19 @@
     "lib/**"
   ],
   "dependencies": {
-    "@forklaunch/common": "^0.6.35",
-    "@forklaunch/core": "^0.18.8",
-    "@forklaunch/internal": "^0.3.35",
-    "@forklaunch/validator": "^0.10.35",
-    "@mikro-orm/core": "^6.6.9",
+    "@forklaunch/common": "^0.7.5",
+    "@forklaunch/core": "^0.19.5",
+    "@forklaunch/internal": "^0.4.5",
+    "@forklaunch/validator": "^0.11.5",
+    "@mikro-orm/core": "7.0.4",
     "@sinclair/typebox": "^0.34.48",
     "ajv": "^8.18.0",
+    "uuid": "^13.0.0",
     "zod": "^4.3.6",
-    "@forklaunch/interfaces-iam": "0.8.20"
+    "@forklaunch/interfaces-iam": "0.9.0"
   },
   "devDependencies": {
-    "@typescript/native-preview": "7.0.0-dev.20260311.1",
+    "@typescript/native-preview": "7.0.0-dev.20260320.1",
     "depcheck": "^1.4.7",
     "prettier": "^3.8.1",
     "typedoc": "^0.28.17"