@forklaunch/implementation-iam-base 0.6.3 → 0.7.0

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

@@ -13,7 +13,7 @@ import {
 } from '@forklaunch/core/http';
 import { CreateUserDto, UpdateUserDto } from '@forklaunch/interfaces-iam/types';
 import { AnySchemaValidator } from '@forklaunch/validator';
-import { EntityManager } from '@mikro-orm/core';
+import { EntityManager, FilterQuery } from '@mikro-orm/core';
 import { UserDtos } from '../domain/types/iamDto.types';
 import { UserEntities } from '../domain/types/iamEntities.types';
 import { UserMappers } from '../domain/types/user.mapper.types';
@@ -31,7 +31,6 @@ export class BaseUserService<
     tracing?: boolean;
   };
   public em: EntityManager;
-  protected passwordEncryptionPublicKeyPath: string;
   protected roleServiceFactory: () => RoleService;
   protected organizationServiceFactory: () => OrganizationService<OrganizationStatus>;
   protected openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>;
@@ -40,7 +39,6 @@ export class BaseUserService<
 
   constructor(
     em: EntityManager,
-    passwordEncryptionPublicKeyPath: string,
     roleServiceFactory: () => RoleService,
     organizationServiceFactory: () => OrganizationService<OrganizationStatus>,
     openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>,
@@ -51,7 +49,6 @@ export class BaseUserService<
     }
   ) {
     this.em = em;
-    this.passwordEncryptionPublicKeyPath = passwordEncryptionPublicKeyPath;
     this.roleServiceFactory = roleServiceFactory;
     this.organizationServiceFactory = organizationServiceFactory;
     this.openTelemetryCollector = openTelemetryCollector;
@@ -120,9 +117,19 @@ export class BaseUserService<
     );
   }
 
-  async getUser(
+  async getOrganizationIdByUserId(
     idDto: IdDto,
     em?: EntityManager
+  ): Promise<string> {
+    const user = await (em ?? this.em).findOneOrFail('User', idDto, {
+      populate: ['id', 'organization']
+    });
+    return user.organization?.id;
+  }
+
+  async getUser(
+    idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>,
+    em?: EntityManager
   ): Promise<MapperDomains['UserMapper']> {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Getting user', idDto);
@@ -222,40 +229,29 @@ export class BaseUserService<
     await (em ?? this.em).nativeDelete('User', idsDto);
   }
 
-  async verifyHasRole(idDto: IdDto, roleId: string): Promise<void> {
+  async surfaceRoles(
+    idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>,
+    em?: EntityManager
+  ): Promise<MapperDomains['UserMapper']['roles']> {
     if (this.evaluatedTelemetryOptions.logging) {
-      this.openTelemetryCollector.info('Verifying user has role', {
-        idDto,
-        roleId
+      this.openTelemetryCollector.info('Surfacing user roles', {
+        idDto
       });
     }
-    const user = await this.getUser(idDto);
-    if (
-      user.roles.filter((role) => {
-        return roleId == role.id;
-      }).length === 0
-    ) {
-      throw new Error(`User ${idDto.id} does not have role ${roleId}`);
-    }
+    const user = await this.getUser(idDto, em);
+    return user.roles;
   }
 
-  async verifyHasPermission(idDto: IdDto, permissionId: string): Promise<void> {
+  async surfacePermissions(
+    idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>,
+    em?: EntityManager
+  ): Promise<MapperDomains['UserMapper']['roles'][0]['permissions']> {
     if (this.evaluatedTelemetryOptions.logging) {
-      this.openTelemetryCollector.info('Verifying user has permission', {
-        idDto,
-        permissionId
+      this.openTelemetryCollector.info('Surfacing user permissions', {
+        idDto
       });
     }
-    const user = await this.getUser(idDto);
-    if (
-      user.roles
-        .map((role) => role.permissions.map((permission) => permission.id))
-        .flat()
-        .filter((id) => id == permissionId).length === 0
-    ) {
-      throw new Error(
-        `User ${idDto.id} does not have permission ${permissionId}`
-      );
-    }
+    const user = await this.getUser(idDto, em);
+    return user.roles.map((role) => role.permissions).flat();
   }
 }

package/lib/services/index.d.mts

@@ -3,7 +3,7 @@ import { OpenTelemetryCollector, MetricsDefinition, TelemetryOptions } from '@fo
 import { OrganizationService, PermissionService, RoleService, UserService } from '@forklaunch/interfaces-iam/interfaces';
 import { CreateOrganizationDto, UpdateOrganizationDto, CreatePermissionDto, UpdatePermissionDto, CreateRoleDto, RoleDto, UpdateRoleDto, CreateUserDto, UpdateUserDto } from '@forklaunch/interfaces-iam/types';
 import { AnySchemaValidator } from '@forklaunch/validator';
-import { EntityManager } from '@mikro-orm/core';
+import { EntityManager, FilterQuery } from '@mikro-orm/core';
 import { OrganizationEntities, OrganizationDtos, OrganizationMappers, PermissionEntities, PermissionDtos, PermissionMappers, RoleEntities, RoleDtos, RoleMappers, UserEntities, UserDtos, UserMappers } from '../domain/types/index.mjs';
 import '@forklaunch/core/services';
 
@@ -70,25 +70,25 @@ declare class BaseRoleService<SchemaValidator extends AnySchemaValidator, Mapper
 declare class BaseUserService<SchemaValidator extends AnySchemaValidator, OrganizationStatus = unknown, MapperEntities extends UserEntities = UserEntities, MapperDomains extends UserDtos = UserDtos> implements UserService {
     private evaluatedTelemetryOptions;
     em: EntityManager;
-    protected passwordEncryptionPublicKeyPath: string;
     protected roleServiceFactory: () => RoleService;
     protected organizationServiceFactory: () => OrganizationService<OrganizationStatus>;
     protected openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>;
     protected schemaValidator: SchemaValidator;
     protected mappers: UserMappers<MapperEntities, MapperDomains>;
-    constructor(em: EntityManager, passwordEncryptionPublicKeyPath: string, roleServiceFactory: () => RoleService, organizationServiceFactory: () => OrganizationService<OrganizationStatus>, openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>, schemaValidator: SchemaValidator, mappers: UserMappers<MapperEntities, MapperDomains>, options?: {
+    constructor(em: EntityManager, roleServiceFactory: () => RoleService, organizationServiceFactory: () => OrganizationService<OrganizationStatus>, openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>, schemaValidator: SchemaValidator, mappers: UserMappers<MapperEntities, MapperDomains>, options?: {
         telemetry?: TelemetryOptions;
     });
     createUser(userDto: CreateUserDto, em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper']>;
     createBatchUsers(userDtos: CreateUserDto[], em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper'][]>;
-    getUser(idDto: IdDto, em?: EntityManager): Promise<MapperDomains['UserMapper']>;
+    getOrganizationIdByUserId(idDto: IdDto, em?: EntityManager): Promise<string>;
+    getUser(idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper']>;
     getBatchUsers(idsDto: IdsDto, 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>;
-    verifyHasRole(idDto: IdDto, roleId: string): Promise<void>;
-    verifyHasPermission(idDto: IdDto, permissionId: string): 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']>;
 }
 
 export { BaseOrganizationService, BasePermissionService, BaseRoleService, BaseUserService };

package/lib/services/index.d.ts

@@ -3,7 +3,7 @@ import { OpenTelemetryCollector, MetricsDefinition, TelemetryOptions } from '@fo
 import { OrganizationService, PermissionService, RoleService, UserService } from '@forklaunch/interfaces-iam/interfaces';
 import { CreateOrganizationDto, UpdateOrganizationDto, CreatePermissionDto, UpdatePermissionDto, CreateRoleDto, RoleDto, UpdateRoleDto, CreateUserDto, UpdateUserDto } from '@forklaunch/interfaces-iam/types';
 import { AnySchemaValidator } from '@forklaunch/validator';
-import { EntityManager } from '@mikro-orm/core';
+import { EntityManager, FilterQuery } from '@mikro-orm/core';
 import { OrganizationEntities, OrganizationDtos, OrganizationMappers, PermissionEntities, PermissionDtos, PermissionMappers, RoleEntities, RoleDtos, RoleMappers, UserEntities, UserDtos, UserMappers } from '../domain/types/index.js';
 import '@forklaunch/core/services';
 
@@ -70,25 +70,25 @@ declare class BaseRoleService<SchemaValidator extends AnySchemaValidator, Mapper
 declare class BaseUserService<SchemaValidator extends AnySchemaValidator, OrganizationStatus = unknown, MapperEntities extends UserEntities = UserEntities, MapperDomains extends UserDtos = UserDtos> implements UserService {
     private evaluatedTelemetryOptions;
     em: EntityManager;
-    protected passwordEncryptionPublicKeyPath: string;
     protected roleServiceFactory: () => RoleService;
     protected organizationServiceFactory: () => OrganizationService<OrganizationStatus>;
     protected openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>;
     protected schemaValidator: SchemaValidator;
     protected mappers: UserMappers<MapperEntities, MapperDomains>;
-    constructor(em: EntityManager, passwordEncryptionPublicKeyPath: string, roleServiceFactory: () => RoleService, organizationServiceFactory: () => OrganizationService<OrganizationStatus>, openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>, schemaValidator: SchemaValidator, mappers: UserMappers<MapperEntities, MapperDomains>, options?: {
+    constructor(em: EntityManager, roleServiceFactory: () => RoleService, organizationServiceFactory: () => OrganizationService<OrganizationStatus>, openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>, schemaValidator: SchemaValidator, mappers: UserMappers<MapperEntities, MapperDomains>, options?: {
         telemetry?: TelemetryOptions;
     });
     createUser(userDto: CreateUserDto, em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper']>;
     createBatchUsers(userDtos: CreateUserDto[], em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper'][]>;
-    getUser(idDto: IdDto, em?: EntityManager): Promise<MapperDomains['UserMapper']>;
+    getOrganizationIdByUserId(idDto: IdDto, em?: EntityManager): Promise<string>;
+    getUser(idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper']>;
     getBatchUsers(idsDto: IdsDto, 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>;
-    verifyHasRole(idDto: IdDto, roleId: string): Promise<void>;
-    verifyHasPermission(idDto: IdDto, permissionId: string): 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']>;
 }
 
 export { BaseOrganizationService, BasePermissionService, BaseRoleService, BaseUserService };

package/lib/services/index.js

@@ -512,15 +512,13 @@ var import_http4 = require("@forklaunch/core/http");
 var BaseUserService = class {
   evaluatedTelemetryOptions;
   em;
-  passwordEncryptionPublicKeyPath;
   roleServiceFactory;
   organizationServiceFactory;
   openTelemetryCollector;
   schemaValidator;
   mappers;
-  constructor(em, passwordEncryptionPublicKeyPath, roleServiceFactory, organizationServiceFactory, openTelemetryCollector, schemaValidator, mappers, options) {
+  constructor(em, roleServiceFactory, organizationServiceFactory, openTelemetryCollector, schemaValidator, mappers, options) {
     this.em = em;
-    this.passwordEncryptionPublicKeyPath = passwordEncryptionPublicKeyPath;
     this.roleServiceFactory = roleServiceFactory;
     this.organizationServiceFactory = organizationServiceFactory;
     this.openTelemetryCollector = openTelemetryCollector;
@@ -570,6 +568,12 @@ var BaseUserService = class {
       users.map((user) => this.mappers.UserMapper.toDto(user))
     );
   }
+  async getOrganizationIdByUserId(idDto, em) {
+    const user = await (em ?? this.em).findOneOrFail("User", idDto, {
+      populate: ["id", "organization"]
+    });
+    return user.organization?.id;
+  }
   async getUser(idDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Getting user", idDto);
@@ -641,33 +645,23 @@ var BaseUserService = class {
     }
     await (em ?? this.em).nativeDelete("User", idsDto);
   }
-  async verifyHasRole(idDto, roleId) {
+  async surfaceRoles(idDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
-      this.openTelemetryCollector.info("Verifying user has role", {
-        idDto,
-        roleId
+      this.openTelemetryCollector.info("Surfacing user roles", {
+        idDto
       });
     }
-    const user = await this.getUser(idDto);
-    if (user.roles.filter((role) => {
-      return roleId == role.id;
-    }).length === 0) {
-      throw new Error(`User ${idDto.id} does not have role ${roleId}`);
-    }
+    const user = await this.getUser(idDto, em);
+    return user.roles;
   }
-  async verifyHasPermission(idDto, permissionId) {
+  async surfacePermissions(idDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
-      this.openTelemetryCollector.info("Verifying user has permission", {
-        idDto,
-        permissionId
+      this.openTelemetryCollector.info("Surfacing user permissions", {
+        idDto
       });
     }
-    const user = await this.getUser(idDto);
-    if (user.roles.map((role) => role.permissions.map((permission) => permission.id)).flat().filter((id) => id == permissionId).length === 0) {
-      throw new Error(
-        `User ${idDto.id} does not have permission ${permissionId}`
-      );
-    }
+    const user = await this.getUser(idDto, em);
+    return user.roles.map((role) => role.permissions).flat();
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/services/index.mjs

@@ -491,15 +491,13 @@ import {
 var BaseUserService = class {
   evaluatedTelemetryOptions;
   em;
-  passwordEncryptionPublicKeyPath;
   roleServiceFactory;
   organizationServiceFactory;
   openTelemetryCollector;
   schemaValidator;
   mappers;
-  constructor(em, passwordEncryptionPublicKeyPath, roleServiceFactory, organizationServiceFactory, openTelemetryCollector, schemaValidator, mappers, options) {
+  constructor(em, roleServiceFactory, organizationServiceFactory, openTelemetryCollector, schemaValidator, mappers, options) {
     this.em = em;
-    this.passwordEncryptionPublicKeyPath = passwordEncryptionPublicKeyPath;
     this.roleServiceFactory = roleServiceFactory;
     this.organizationServiceFactory = organizationServiceFactory;
     this.openTelemetryCollector = openTelemetryCollector;
@@ -549,6 +547,12 @@ var BaseUserService = class {
       users.map((user) => this.mappers.UserMapper.toDto(user))
     );
   }
+  async getOrganizationIdByUserId(idDto, em) {
+    const user = await (em ?? this.em).findOneOrFail("User", idDto, {
+      populate: ["id", "organization"]
+    });
+    return user.organization?.id;
+  }
   async getUser(idDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Getting user", idDto);
@@ -620,33 +624,23 @@ var BaseUserService = class {
     }
     await (em ?? this.em).nativeDelete("User", idsDto);
   }
-  async verifyHasRole(idDto, roleId) {
+  async surfaceRoles(idDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
-      this.openTelemetryCollector.info("Verifying user has role", {
-        idDto,
-        roleId
+      this.openTelemetryCollector.info("Surfacing user roles", {
+        idDto
       });
     }
-    const user = await this.getUser(idDto);
-    if (user.roles.filter((role) => {
-      return roleId == role.id;
-    }).length === 0) {
-      throw new Error(`User ${idDto.id} does not have role ${roleId}`);
-    }
+    const user = await this.getUser(idDto, em);
+    return user.roles;
   }
-  async verifyHasPermission(idDto, permissionId) {
+  async surfacePermissions(idDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
-      this.openTelemetryCollector.info("Verifying user has permission", {
-        idDto,
-        permissionId
+      this.openTelemetryCollector.info("Surfacing user permissions", {
+        idDto
       });
     }
-    const user = await this.getUser(idDto);
-    if (user.roles.map((role) => role.permissions.map((permission) => permission.id)).flat().filter((id) => id == permissionId).length === 0) {
-      throw new Error(
-        `User ${idDto.id} does not have permission ${permissionId}`
-      );
-    }
+    const user = await this.getUser(idDto, em);
+    return user.roles.map((role) => role.permissions).flat();
   }
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forklaunch/implementation-iam-base",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "description": "Billing basic implementation for forklaunch",
   "homepage": "https://github.com/forklaunch/forklaunch-js#readme",
   "bugs": {
@@ -36,21 +36,21 @@
     "lib/**"
   ],
   "dependencies": {
-    "@forklaunch/common": "^0.6.5",
-    "@forklaunch/core": "^0.14.7",
-    "@forklaunch/internal": "^0.3.5",
-    "@forklaunch/validator": "^0.10.5",
-    "@mikro-orm/core": "^6.5.2",
+    "@forklaunch/common": "^0.6.12",
+    "@forklaunch/core": "^0.15.1",
+    "@forklaunch/internal": "^0.3.12",
+    "@forklaunch/validator": "^0.10.12",
+    "@mikro-orm/core": "^6.5.5",
     "@sinclair/typebox": "^0.34.41",
     "ajv": "^8.17.1",
-    "zod": "^4.1.5",
-    "@forklaunch/interfaces-iam": "0.6.3"
+    "zod": "^4.1.11",
+    "@forklaunch/interfaces-iam": "0.7.0"
   },
   "devDependencies": {
-    "@typescript/native-preview": "7.0.0-dev.20250910.1",
+    "@typescript/native-preview": "7.0.0-dev.20250922.1",
     "depcheck": "^1.4.7",
     "prettier": "^3.6.2",
-    "typedoc": "^0.28.12"
+    "typedoc": "^0.28.13"
   },
   "scripts": {
     "build": "tsc --noEmit && tsup domain/schemas/index.ts services/index.ts domain/types/index.ts --format cjs,esm --no-splitting --dts --tsconfig tsconfig.json --out-dir lib --clean && if [ -f eject-package.bash ]; then pnpm package:eject; fi",