@forklaunch/implementation-iam-base 0.2.0 → 0.2.1

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

@@ -1,6 +1,8 @@
 import {
+  evaluateTelemetryOptions,
   MetricsDefinition,
-  OpenTelemetryCollector
+  OpenTelemetryCollector,
+  TelemetryOptions
 } from '@forklaunch/core/http';
 import { RoleService } from '@forklaunch/interfaces-iam/interfaces';
 import { EntityManager } from '@mikro-orm/core';
@@ -60,6 +62,11 @@ export class BaseRoleService<
     Entities,
     Dto
   >;
+  private evaluatedTelemetryOptions: {
+    logging?: boolean;
+    metrics?: boolean;
+    tracing?: boolean;
+  };
 
   constructor(
     public em: EntityManager,
@@ -81,18 +88,39 @@ export class BaseRoleService<
         Dto['UpdateRoleDtoMapper'],
         Entities['UpdateRoleDtoMapper']
       >;
+    },
+    options?: {
+      telemetry?: TelemetryOptions;
     }
   ) {
     this.#mappers = transformIntoInternalDtoMapper(mappers, schemaValidator);
+    this.evaluatedTelemetryOptions = options?.telemetry
+      ? evaluateTelemetryOptions(options.telemetry).enabled
+      : {
+          logging: false,
+          metrics: false,
+          tracing: false
+        };
   }
 
   async createRole(
     roleDto: Dto['CreateRoleDtoMapper'],
     em?: EntityManager
   ): Promise<Dto['RoleDtoMapper']> {
-    const role =
-      await this.#mappers.CreateRoleDtoMapper.deserializeDtoToEntity(roleDto);
-    await (em ?? this.em).transactional((em) => em.persist(role));
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Creating role', roleDto);
+    }
+    const role = await this.#mappers.CreateRoleDtoMapper.deserializeDtoToEntity(
+      roleDto,
+      em ?? this.em
+    );
+
+    if (em) {
+      await em.persist(role);
+    } else {
+      await this.em.persistAndFlush(role);
+    }
+
     return this.#mappers.RoleDtoMapper.serializeEntityToDto(role);
   }
 
@@ -100,12 +128,25 @@ export class BaseRoleService<
     roleDtos: Dto['CreateRoleDtoMapper'][],
     em?: EntityManager
   ): Promise<Dto['RoleDtoMapper'][]> {
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Creating batch roles', roleDtos);
+    }
+
     const roles = await Promise.all(
       roleDtos.map(async (roleDto) =>
-        this.#mappers.CreateRoleDtoMapper.deserializeDtoToEntity(roleDto)
+        this.#mappers.CreateRoleDtoMapper.deserializeDtoToEntity(
+          roleDto,
+          em ?? this.em
+        )
       )
     );
-    await (em ?? this.em).transactional((em) => em.persist(roles));
+
+    if (em) {
+      await em.persist(roles);
+    } else {
+      await this.em.persistAndFlush(roles);
+    }
+
     return Promise.all(
       roles.map((role) =>
         this.#mappers.RoleDtoMapper.serializeEntityToDto(role)
@@ -113,21 +154,36 @@ export class BaseRoleService<
     );
   }
 
-  async getRole(idDto: IdDto, em?: EntityManager): Promise<RoleDto> {
-    const role = await (em ?? this.em).findOneOrFail('Role', idDto, {
+  async getRole({ id }: IdDto, em?: EntityManager): Promise<RoleDto> {
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Getting role', { id });
+    }
+
+    const role = await (em ?? this.em).findOneOrFail('Role', id, {
       populate: ['id', '*']
     });
+
     return this.#mappers.RoleDtoMapper.serializeEntityToDto(
       role as Entities['RoleDtoMapper']
     );
   }
 
-  async getBatchRoles(idsDto: IdsDto, em?: EntityManager): Promise<RoleDto[]> {
+  async getBatchRoles({ ids }: IdsDto, em?: EntityManager): Promise<RoleDto[]> {
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Getting batch roles', { ids });
+    }
+
     return Promise.all(
       (
-        await (em ?? this.em).find('Role', idsDto, {
-          populate: ['id', '*']
-        })
+        await (em ?? this.em).find(
+          'Role',
+          {
+            id: { $in: ids }
+          },
+          {
+            populate: ['id', '*']
+          }
+        )
       ).map((role) =>
         this.#mappers.RoleDtoMapper.serializeEntityToDto(
           role as Entities['RoleDtoMapper']
@@ -140,11 +196,21 @@ export class BaseRoleService<
     roleDto: Dto['UpdateRoleDtoMapper'],
     em?: EntityManager
   ): Promise<Dto['RoleDtoMapper']> {
-    let role =
-      await this.#mappers.UpdateRoleDtoMapper.deserializeDtoToEntity(roleDto);
-    await (em ?? this.em).transactional(async (em) => {
-      role = (await em.upsert('Role', role)) as Entities['RoleDtoMapper'];
-    });
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Updating role', roleDto);
+    }
+
+    const role = await this.#mappers.UpdateRoleDtoMapper.deserializeDtoToEntity(
+      roleDto,
+      em ?? this.em
+    );
+
+    if (em) {
+      await em.persist(role);
+    } else {
+      await this.em.persistAndFlush(role);
+    }
+
     return this.#mappers.RoleDtoMapper.serializeEntityToDto(role);
   }
 
@@ -152,14 +218,24 @@ export class BaseRoleService<
     roleDtos: Dto['UpdateRoleDtoMapper'][],
     em?: EntityManager
   ): Promise<Dto['RoleDtoMapper'][]> {
-    let roles = await Promise.all(
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Updating batch roles', roleDtos);
+    }
+
+    const roles = await Promise.all(
       roleDtos.map(async (roleDto) =>
-        this.#mappers.UpdateRoleDtoMapper.deserializeDtoToEntity(roleDto)
+        this.#mappers.UpdateRoleDtoMapper.deserializeDtoToEntity(
+          roleDto,
+          em ?? this.em
+        )
       )
     );
-    await (em ?? this.em).transactional(async (em) => {
-      roles = await em.upsertMany('Role', roles);
-    });
+
+    if (em) {
+      await em.persist(roles);
+    } else {
+      await this.em.persistAndFlush(roles);
+    }
     return Promise.all(
       roles.map((role) =>
         this.#mappers.RoleDtoMapper.serializeEntityToDto(
@@ -170,10 +246,18 @@ export class BaseRoleService<
   }
 
   async deleteRole(idDto: IdDto, em?: EntityManager): Promise<void> {
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Deleting role', idDto);
+    }
+
     await (em ?? this.em).nativeDelete('Role', idDto);
   }
 
   async deleteBatchRoles(idsDto: IdsDto, em?: EntityManager): Promise<void> {
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Deleting batch roles', idsDto);
+    }
+
     await (em ?? this.em).nativeDelete('Role', { id: { $in: idsDto.ids } });
   }
 }

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

@@ -6,8 +6,10 @@ import {
 
 import { IdDto, IdsDto, InstanceTypeRecord } from '@forklaunch/common';
 import {
+  evaluateTelemetryOptions,
   MetricsDefinition,
-  OpenTelemetryCollector
+  OpenTelemetryCollector,
+  TelemetryOptions
 } from '@forklaunch/core/http';
 import {
   InternalDtoMapper,
@@ -53,6 +55,11 @@ export class BaseUserService<
     Entities,
     Dto
   >;
+  private evaluatedTelemetryOptions: {
+    logging?: boolean;
+    metrics?: boolean;
+    tracing?: boolean;
+  };
 
   constructor(
     public em: EntityManager,
@@ -70,37 +77,47 @@ export class BaseUserService<
       CreateUserDtoMapper: RequestDtoMapperConstructor<
         SchemaValidator,
         Dto['CreateUserDtoMapper'],
-        Entities['CreateUserDtoMapper'],
-        (
-          dto: never,
-          passwordEncryptionPublicKeyPath: string
-        ) => Promise<Entities['UpdateUserDtoMapper']>
+        Entities['CreateUserDtoMapper']
       >;
       UpdateUserDtoMapper: RequestDtoMapperConstructor<
         SchemaValidator,
         Dto['UpdateUserDtoMapper'],
-        Entities['UpdateUserDtoMapper'],
-        (
-          dto: never,
-          passwordEncryptionPublicKeyPath: string
-        ) => Promise<Entities['UpdateUserDtoMapper']>
+        Entities['UpdateUserDtoMapper']
       >;
+    },
+    readonly options?: {
+      telemetry?: TelemetryOptions;
     }
   ) {
     this.#mappers = transformIntoInternalDtoMapper(mappers, schemaValidator);
+    this.evaluatedTelemetryOptions = options?.telemetry
+      ? evaluateTelemetryOptions(options.telemetry).enabled
+      : {
+          logging: false,
+          metrics: false,
+          tracing: false
+        };
   }
 
   async createUser(
     userDto: Dto['CreateUserDtoMapper'],
     em?: EntityManager
   ): Promise<Dto['UserDtoMapper']> {
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Creating user', userDto);
+    }
+
     const user = await this.#mappers.CreateUserDtoMapper.deserializeDtoToEntity(
       userDto,
-      this.passwordEncryptionPublicKeyPath
+      em ?? this.em
     );
-    ((await em) ?? this.em).transactional(async (em) => {
+
+    if (em) {
       await em.persist(user);
-    });
+    } else {
+      await this.em.persistAndFlush(user);
+    }
+
     return this.#mappers.UserDtoMapper.serializeEntityToDto(user);
   }
 
@@ -108,17 +125,24 @@ export class BaseUserService<
     userDtos: Dto['CreateUserDtoMapper'][],
     em?: EntityManager
   ): Promise<Dto['UserDtoMapper'][]> {
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Creating batch users', userDtos);
+    }
+
     const users = await Promise.all(
       userDtos.map(async (createUserDto) =>
         this.#mappers.CreateUserDtoMapper.deserializeDtoToEntity(
           createUserDto,
-          this.passwordEncryptionPublicKeyPath
+          em ?? this.em
         )
       )
     );
-    await (em ?? this.em).transactional(async (em) => {
+
+    if (em) {
       await em.persist(users);
-    });
+    } else {
+      await this.em.persistAndFlush(users);
+    }
 
     return Promise.all(
       users.map((user) =>
@@ -131,9 +155,14 @@ export class BaseUserService<
     idDto: IdDto,
     em?: EntityManager
   ): Promise<Dto['UserDtoMapper']> {
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Getting user', idDto);
+    }
+
     const user = await (em ?? this.em).findOneOrFail('User', idDto, {
       populate: ['id', '*']
     });
+
     return this.#mappers.UserDtoMapper.serializeEntityToDto(
       user as Entities['UserDtoMapper']
     );
@@ -143,6 +172,10 @@ export class BaseUserService<
     idsDto: IdsDto,
     em?: EntityManager
   ): Promise<Dto['UserDtoMapper'][]> {
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Getting batch users', idsDto);
+    }
+
     return Promise.all(
       (
         await (em ?? this.em).find('User', idsDto, {
@@ -160,13 +193,21 @@ export class BaseUserService<
     userDto: Dto['UpdateUserDtoMapper'],
     em?: EntityManager
   ): Promise<Dto['UserDtoMapper']> {
-    let user = await this.#mappers.UpdateUserDtoMapper.deserializeDtoToEntity(
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Updating user', userDto);
+    }
+
+    const user = await this.#mappers.UpdateUserDtoMapper.deserializeDtoToEntity(
       userDto,
-      this.passwordEncryptionPublicKeyPath
+      em ?? this.em
     );
-    await (em ?? this.em).transactional(async (localEm) => {
-      user = await localEm.upsert(user);
-    });
+
+    if (em) {
+      await em.persist(user);
+    } else {
+      await this.em.persistAndFlush(user);
+    }
+
     return this.#mappers.UserDtoMapper.serializeEntityToDto(user);
   }
 
@@ -174,17 +215,25 @@ export class BaseUserService<
     userDtos: UpdateUserDto[],
     em?: EntityManager
   ): Promise<Dto['UserDtoMapper'][]> {
-    let users = await Promise.all(
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Updating batch users', userDtos);
+    }
+
+    const users = await Promise.all(
       userDtos.map(async (updateUserDto) =>
         this.#mappers.UpdateUserDtoMapper.deserializeDtoToEntity(
           updateUserDto,
-          this.passwordEncryptionPublicKeyPath
+          em ?? this.em
         )
       )
     );
-    await (em ?? this.em).transactional(async (localEm) => {
-      users = await localEm.upsertMany(users);
-    });
+
+    if (em) {
+      await em.persist(users);
+    } else {
+      await this.em.persistAndFlush(users);
+    }
+
     return Promise.all(
       users.map((user) =>
         this.#mappers.UserDtoMapper.serializeEntityToDto(user)
@@ -193,16 +242,26 @@ export class BaseUserService<
   }
 
   async deleteUser(idDto: IdDto, em?: EntityManager): Promise<void> {
-    const entityManager = em || this.em;
-    await entityManager.nativeDelete('User', idDto);
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Deleting user', idDto);
+    }
+    await (em ?? this.em).nativeDelete('User', idDto);
   }
 
   async deleteBatchUsers(idsDto: IdsDto, em?: EntityManager): Promise<void> {
-    const entityManager = em || this.em;
-    await entityManager.nativeDelete('User', idsDto);
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Deleting batch users', idsDto);
+    }
+    await (em ?? this.em).nativeDelete('User', idsDto);
   }
 
   async verifyHasRole(idDto: IdDto, roleId: string): Promise<void> {
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Verifying user has role', {
+        idDto,
+        roleId
+      });
+    }
     const user = await this.getUser(idDto);
     if (
       user.roles.filter((role) => {
@@ -214,6 +273,12 @@ export class BaseUserService<
   }
 
   async verifyHasPermission(idDto: IdDto, permissionId: string): Promise<void> {
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Verifying user has permission', {
+        idDto,
+        permissionId
+      });
+    }
     const user = await this.getUser(idDto);
     if (
       user.roles

package/lib/services/organization.service.d.ts

@@ -1,7 +1,8 @@
 import { IdDto } from '@forklaunch/common';
 import {
   MetricsDefinition,
-  OpenTelemetryCollector
+  OpenTelemetryCollector,
+  TelemetryOptions
 } from '@forklaunch/core/http';
 import {
   RequestDtoMapperConstructor,
@@ -79,6 +80,7 @@ export declare class BaseOrganizationService<
       Entities['UpdateOrganizationDtoMapper']
     >;
   };
+  private evaluatedTelemetryOptions;
   constructor(
     em: EntityManager,
     openTelemetryCollector: OpenTelemetryCollector<Metrics>,
@@ -99,6 +101,9 @@ export declare class BaseOrganizationService<
         Dto['UpdateOrganizationDtoMapper'],
         Entities['UpdateOrganizationDtoMapper']
       >;
+    },
+    options?: {
+      telemetry?: TelemetryOptions;
     }
   );
   createOrganization(

package/lib/services/organization.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"organization.service.d.ts","sourceRoot":"","sources":["../../services/organization.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"organization.service.d.ts","sourceRoot":"","sources":["../../services/organization.service.ts"],"names":[],"mappings":"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"}

package/lib/services/organization.service.js

@@ -1,3 +1,4 @@
+import { evaluateTelemetryOptions } from '@forklaunch/core/http';
 import { transformIntoInternalDtoMapper } from '@forklaunch/core/mappers';
 export class BaseOrganizationService {
   em;
@@ -5,27 +6,46 @@ export class BaseOrganizationService {
   schemaValidator;
   mappers;
   #mappers;
-  constructor(em, openTelemetryCollector, schemaValidator, mappers) {
+  evaluatedTelemetryOptions;
+  constructor(em, openTelemetryCollector, schemaValidator, mappers, options) {
     this.em = em;
     this.openTelemetryCollector = openTelemetryCollector;
     this.schemaValidator = schemaValidator;
     this.mappers = mappers;
     this.#mappers = transformIntoInternalDtoMapper(mappers, schemaValidator);
+    this.evaluatedTelemetryOptions = options?.telemetry
+      ? evaluateTelemetryOptions(options.telemetry).enabled
+      : {
+          logging: false,
+          metrics: false,
+          tracing: false
+        };
   }
   async createOrganization(organizationDto, em) {
-    this.openTelemetryCollector.log('info', 'Creating organization');
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info(
+        'Creating organization',
+        organizationDto
+      );
+    }
     const organization =
       await this.#mappers.CreateOrganizationDtoMapper.deserializeDtoToEntity(
-        organizationDto
+        organizationDto,
+        em ?? this.em
       );
-    await (em ?? this.em).transactional(async (innerEm) => {
-      await innerEm.persist(organization);
-    });
+    if (em) {
+      await em.persist(organization);
+    } else {
+      await this.em.persistAndFlush(organization);
+    }
     return this.#mappers.OrganizationDtoMapper.serializeEntityToDto(
       organization
     );
   }
   async getOrganization(idDto, em) {
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Getting organization', idDto);
+    }
     const organization = await (em ?? this.em).findOneOrFail(
       'Organization',
       idDto
@@ -35,16 +55,34 @@ export class BaseOrganizationService {
     );
   }
   async updateOrganization(organizationDto, em) {
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info(
+        'Updating organization',
+        organizationDto
+      );
+    }
     const updatedOrganization =
       await this.#mappers.UpdateOrganizationDtoMapper.deserializeDtoToEntity(
-        organizationDto
+        organizationDto,
+        em ?? this.em
       );
-    await (em ?? this.em).upsert(updatedOrganization);
+    if (em) {
+      await em.persist(updatedOrganization);
+    } else {
+      await this.em.persistAndFlush(updatedOrganization);
+    }
     return this.#mappers.OrganizationDtoMapper.serializeEntityToDto(
       updatedOrganization
     );
   }
   async deleteOrganization(idDto, em) {
-    await (em ?? this.em).nativeDelete('Organization', idDto);
+    if (this.evaluatedTelemetryOptions.logging) {
+      this.openTelemetryCollector.info('Deleting organization', idDto);
+    }
+    if (em) {
+      await em.nativeDelete('Organization', idDto);
+    } else {
+      await this.em.nativeDelete('Organization', idDto);
+    }
   }
 }

package/lib/services/permission.service.d.ts

@@ -5,7 +5,8 @@ import {
 import { IdDto, IdsDto } from '@forklaunch/common';
 import {
   MetricsDefinition,
-  OpenTelemetryCollector
+  OpenTelemetryCollector,
+  TelemetryOptions
 } from '@forklaunch/core/http';
 import {
   RequestDtoMapperConstructor,
@@ -15,8 +16,8 @@ import { MapNestedDtoArraysToCollections } from '@forklaunch/core/services';
 import {
   CreatePermissionDto,
   PermissionDto,
-  RoleDto,
-  UpdatePermissionDto
+  UpdatePermissionDto,
+  UpdateRoleDto
 } from '@forklaunch/interfaces-iam/types';
 import { AnySchemaValidator } from '@forklaunch/validator';
 import { EntityManager } from '@mikro-orm/core';
@@ -27,23 +28,29 @@ export declare class BasePermissionService<
     PermissionDtoMapper: PermissionDto;
     CreatePermissionDtoMapper: CreatePermissionDto;
     UpdatePermissionDtoMapper: UpdatePermissionDto;
-    RoleDtoMapper: RoleDto;
+    RoleEntityMapper: UpdateRoleDto;
   } = {
     PermissionDtoMapper: PermissionDto;
     CreatePermissionDtoMapper: CreatePermissionDto;
     UpdatePermissionDtoMapper: UpdatePermissionDto;
-    RoleDtoMapper: RoleDto;
+    RoleEntityMapper: UpdateRoleDto;
   },
   Entities extends {
     PermissionDtoMapper: PermissionDto;
     CreatePermissionDtoMapper: PermissionDto;
     UpdatePermissionDtoMapper: PermissionDto;
-    RoleDtoMapper: MapNestedDtoArraysToCollections<RoleDto, 'permissions'>;
+    RoleEntityMapper: MapNestedDtoArraysToCollections<
+      UpdateRoleDto,
+      'permissions'
+    >;
   } = {
     PermissionDtoMapper: PermissionDto;
     CreatePermissionDtoMapper: PermissionDto;
     UpdatePermissionDtoMapper: PermissionDto;
-    RoleDtoMapper: MapNestedDtoArraysToCollections<RoleDto, 'permissions'>;
+    RoleEntityMapper: MapNestedDtoArraysToCollections<
+      UpdateRoleDto,
+      'permissions'
+    >;
   }
 > implements PermissionService
 {
@@ -68,12 +75,13 @@ export declare class BasePermissionService<
       Dto['UpdatePermissionDtoMapper'],
       Entities['UpdatePermissionDtoMapper']
     >;
-    RoleDtoMapper: RequestDtoMapperConstructor<
+    RoleEntityMapper: RequestDtoMapperConstructor<
       SchemaValidator,
-      Dto['RoleDtoMapper'],
-      Entities['RoleDtoMapper']
+      Dto['RoleEntityMapper'],
+      Entities['RoleEntityMapper']
     >;
   };
+  private evaluatedTelemetryOptions;
   constructor(
     em: EntityManager,
     roleServiceFactory: () => RoleService,
@@ -95,11 +103,14 @@ export declare class BasePermissionService<
         Dto['UpdatePermissionDtoMapper'],
         Entities['UpdatePermissionDtoMapper']
       >;
-      RoleDtoMapper: RequestDtoMapperConstructor<
+      RoleEntityMapper: RequestDtoMapperConstructor<
         SchemaValidator,
-        Dto['RoleDtoMapper'],
-        Entities['RoleDtoMapper']
+        Dto['RoleEntityMapper'],
+        Entities['RoleEntityMapper']
       >;
+    },
+    options?: {
+      telemetry?: TelemetryOptions;
     }
   );
   private updateRolesWithPermissions;