@forklaunch/implementation-iam-base 0.8.11 → 0.8.13

package/lib/eject/services/user.service.ts

@@ -120,11 +120,11 @@ export class BaseUserService<
   async getOrganizationIdByUserId(
     idDto: IdDto,
     em?: EntityManager
-  ): Promise<string> {
-    const user = await (em ?? this.em).findOneOrFail('User', idDto, {
+  ): Promise<string | undefined> {
+    const user = await (em ?? this.em).findOne('User', idDto, {
       populate: ['id', 'organization']
     });
-    return user.organization?.id;
+    return user?.organization?.id;
   }
 
   async getUser(
@@ -143,22 +143,26 @@ export class BaseUserService<
   }
 
   async getBatchUsers(
-    idsDto: IdsDto,
+    idsDto: IdsDto & FilterQuery<MapperEntities['UserMapper']>,
     em?: EntityManager
   ): Promise<MapperDomains['UserMapper'][]> {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Getting batch users', idsDto);
     }
 
+    // Build filter with organization constraint if provided
+    const filter: FilterQuery<MapperEntities['UserMapper']> = {
+      id: { $in: idsDto.ids },
+      ...((idsDto as any).organization && {
+        organization: (idsDto as any).organization
+      })
+    };
+
     return Promise.all(
       (
-        await (em ?? this.em).find(
-          'User',
-          { id: { $in: idsDto.ids } },
-          {
-            populate: ['id', '*']
-          }
-        )
+        await (em ?? this.em).find('User', filter, {
+          populate: ['id', '*']
+        })
       ).map((user) =>
         this.mappers.UserMapper.toDto(user as MapperEntities['UserMapper'])
       )
@@ -219,18 +223,48 @@ export class BaseUserService<
     );
   }
 
-  async deleteUser(idDto: IdDto, em?: EntityManager): Promise<void> {
+  async deleteUser(
+    idDto: IdDto & { organization?: { id: string } } & FilterQuery<
+        MapperEntities['UserMapper']
+      > &
+      object,
+    em?: EntityManager
+  ): Promise<void> {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Deleting user', idDto);
     }
-    await (em ?? this.em).nativeDelete('User', idDto);
+
+    const filter = {
+      ...idDto,
+      id: idDto.id,
+      ...(idDto.organization && {
+        organization: idDto.organization
+      })
+    } as FilterQuery<MapperEntities['UserMapper']>;
+
+    await (em ?? this.em).nativeDelete('User', filter);
   }
 
-  async deleteBatchUsers(idsDto: IdsDto, em?: EntityManager): Promise<void> {
+  async deleteBatchUsers(
+    idsDto: IdsDto & { organization?: { id: string } } & FilterQuery<
+        MapperEntities['UserMapper']
+      > &
+      object,
+    em?: EntityManager
+  ): Promise<void> {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Deleting batch users', idsDto);
     }
-    await (em ?? this.em).nativeDelete('User', { id: { $in: idsDto.ids } });
+
+    const filter = {
+      ...idsDto,
+      id: { $in: idsDto.ids },
+      ...(idsDto.organization && {
+        organization: idsDto.organization
+      })
+    };
+
+    await (em ?? this.em).nativeDelete('User', filter);
   }
 
   async surfaceRoles(
@@ -256,6 +290,6 @@ export class BaseUserService<
       });
     }
     const user = await this.getUser(idDto, em);
-    return user.roles.map((role) => role.permissions).flat();
+    return user.roles.flatMap((role) => role.permissions);
   }
 }

package/lib/services/index.d.mts

@@ -82,13 +82,21 @@ declare class BaseUserService<SchemaValidator extends AnySchemaValidator, Organi
     });
     createUser(userDto: CreateUserDto, em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper']>;
     createBatchUsers(userDtos: CreateUserDto[], em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper'][]>;
-    getOrganizationIdByUserId(idDto: IdDto, em?: EntityManager): Promise<string>;
+    getOrganizationIdByUserId(idDto: IdDto, em?: EntityManager): Promise<string | undefined>;
     getUser(idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper']>;
-    getBatchUsers(idsDto: IdsDto, em?: EntityManager): Promise<MapperDomains['UserMapper'][]>;
+    getBatchUsers(idsDto: IdsDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper'][]>;
     updateUser(userDto: UpdateUserDto, em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper']>;
     updateBatchUsers(userDtos: UpdateUserDto[], em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper'][]>;
-    deleteUser(idDto: IdDto, em?: EntityManager): Promise<void>;
-    deleteBatchUsers(idsDto: IdsDto, em?: EntityManager): Promise<void>;
+    deleteUser(idDto: IdDto & {
+        organization?: {
+            id: string;
+        };
+    } & FilterQuery<MapperEntities['UserMapper']> & object, em?: EntityManager): Promise<void>;
+    deleteBatchUsers(idsDto: IdsDto & {
+        organization?: {
+            id: string;
+        };
+    } & FilterQuery<MapperEntities['UserMapper']> & object, em?: EntityManager): Promise<void>;
     surfaceRoles(idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper']['roles']>;
     surfacePermissions(idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper']['roles'][0]['permissions']>;
 }

package/lib/services/index.d.ts

@@ -82,13 +82,21 @@ declare class BaseUserService<SchemaValidator extends AnySchemaValidator, Organi
     });
     createUser(userDto: CreateUserDto, em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper']>;
     createBatchUsers(userDtos: CreateUserDto[], em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper'][]>;
-    getOrganizationIdByUserId(idDto: IdDto, em?: EntityManager): Promise<string>;
+    getOrganizationIdByUserId(idDto: IdDto, em?: EntityManager): Promise<string | undefined>;
     getUser(idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper']>;
-    getBatchUsers(idsDto: IdsDto, em?: EntityManager): Promise<MapperDomains['UserMapper'][]>;
+    getBatchUsers(idsDto: IdsDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper'][]>;
     updateUser(userDto: UpdateUserDto, em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper']>;
     updateBatchUsers(userDtos: UpdateUserDto[], em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper'][]>;
-    deleteUser(idDto: IdDto, em?: EntityManager): Promise<void>;
-    deleteBatchUsers(idsDto: IdsDto, em?: EntityManager): Promise<void>;
+    deleteUser(idDto: IdDto & {
+        organization?: {
+            id: string;
+        };
+    } & FilterQuery<MapperEntities['UserMapper']> & object, em?: EntityManager): Promise<void>;
+    deleteBatchUsers(idsDto: IdsDto & {
+        organization?: {
+            id: string;
+        };
+    } & FilterQuery<MapperEntities['UserMapper']> & object, em?: EntityManager): Promise<void>;
     surfaceRoles(idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper']['roles']>;
     surfacePermissions(idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper']['roles'][0]['permissions']>;
 }

package/lib/services/index.js

@@ -572,10 +572,10 @@ var BaseUserService = class {
     );
   }
   async getOrganizationIdByUserId(idDto, em) {
-    const user = await (em ?? this.em).findOneOrFail("User", idDto, {
+    const user = await (em ?? this.em).findOne("User", idDto, {
       populate: ["id", "organization"]
     });
-    return user.organization?.id;
+    return user?.organization?.id;
   }
   async getUser(idDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -590,14 +590,16 @@ var BaseUserService = class {
     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",
-        { id: { $in: idsDto.ids } },
-        {
-          populate: ["id", "*"]
-        }
-      )).map(
+      (await (em ?? this.em).find("User", filter, {
+        populate: ["id", "*"]
+      })).map(
         (user) => this.mappers.UserMapper.toDto(user)
       )
     );
@@ -644,13 +646,27 @@ var BaseUserService = class {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Deleting user", idDto);
     }
-    await (em ?? this.em).nativeDelete("User", idDto);
+    const filter = {
+      ...idDto,
+      id: idDto.id,
+      ...idDto.organization && {
+        organization: idDto.organization
+      }
+    };
+    await (em ?? this.em).nativeDelete("User", filter);
   }
   async deleteBatchUsers(idsDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Deleting batch users", idsDto);
     }
-    await (em ?? this.em).nativeDelete("User", { id: { $in: idsDto.ids } });
+    const filter = {
+      ...idsDto,
+      id: { $in: idsDto.ids },
+      ...idsDto.organization && {
+        organization: idsDto.organization
+      }
+    };
+    await (em ?? this.em).nativeDelete("User", filter);
   }
   async surfaceRoles(idDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -668,7 +684,7 @@ var BaseUserService = class {
       });
     }
     const user = await this.getUser(idDto, em);
-    return user.roles.map((role) => role.permissions).flat();
+    return user.roles.flatMap((role) => role.permissions);
   }
 };
 

package/lib/services/index.mjs

@@ -550,10 +550,10 @@ var BaseUserService = class {
     );
   }
   async getOrganizationIdByUserId(idDto, em) {
-    const user = await (em ?? this.em).findOneOrFail("User", idDto, {
+    const user = await (em ?? this.em).findOne("User", idDto, {
       populate: ["id", "organization"]
     });
-    return user.organization?.id;
+    return user?.organization?.id;
   }
   async getUser(idDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -568,14 +568,16 @@ var BaseUserService = class {
     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",
-        { id: { $in: idsDto.ids } },
-        {
-          populate: ["id", "*"]
-        }
-      )).map(
+      (await (em ?? this.em).find("User", filter, {
+        populate: ["id", "*"]
+      })).map(
         (user) => this.mappers.UserMapper.toDto(user)
       )
     );
@@ -622,13 +624,27 @@ var BaseUserService = class {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Deleting user", idDto);
     }
-    await (em ?? this.em).nativeDelete("User", idDto);
+    const filter = {
+      ...idDto,
+      id: idDto.id,
+      ...idDto.organization && {
+        organization: idDto.organization
+      }
+    };
+    await (em ?? this.em).nativeDelete("User", filter);
   }
   async deleteBatchUsers(idsDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Deleting batch users", idsDto);
     }
-    await (em ?? this.em).nativeDelete("User", { id: { $in: idsDto.ids } });
+    const filter = {
+      ...idsDto,
+      id: { $in: idsDto.ids },
+      ...idsDto.organization && {
+        organization: idsDto.organization
+      }
+    };
+    await (em ?? this.em).nativeDelete("User", filter);
   }
   async surfaceRoles(idDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -646,7 +662,7 @@ var BaseUserService = class {
       });
     }
     const user = await this.getUser(idDto, em);
-    return user.roles.map((role) => role.permissions).flat();
+    return user.roles.flatMap((role) => role.permissions);
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forklaunch/implementation-iam-base",
-  "version": "0.8.11",
+  "version": "0.8.13",
   "description": "IAM basic implementation for forklaunch",
   "homepage": "https://github.com/forklaunch/forklaunch-js#readme",
   "bugs": {
@@ -44,7 +44,7 @@
     "@sinclair/typebox": "^0.34.48",
     "ajv": "^8.17.1",
     "zod": "^4.3.6",
-    "@forklaunch/interfaces-iam": "0.8.11"
+    "@forklaunch/interfaces-iam": "0.8.12"
   },
   "devDependencies": {
     "@typescript/native-preview": "7.0.0-dev.20260204.1",