@hed-hog/core 0.0.325 → 0.0.326

package/src/mail/mail.service.ts

@@ -59,7 +59,7 @@ export class MailService implements OnModuleInit {
   }
 
   private isMailConfigSlug(slug: string) {
-    return slug.startsWith('mail-');
+    return slug === 'mail-profile-id';
   }
 
   private isSettingEnabled(value: unknown) {
@@ -68,26 +68,21 @@ export class MailService implements OnModuleInit {
 
   private async syncConfiguredMailFlag() {
     try {
-      const settings = await this.setting.getSettingValues([
-        'mail-provider',
-        'mail-from',
-      ]);
+      const settings = await this.setting.getSettingValues(['mail-profile-id']);
+      const profileId = settings['mail-profile-id'];
 
-      const provider = String(settings['mail-provider'] || '').trim();
-      const from = String(settings['mail-from'] || '').trim();
-
-      if (!provider || !from) {
+      if (!profileId || Number(profileId) <= 0) {
         await this.setting.setValue('configured-mail', 'false');
         return;
       }
 
-      await this.reloadConfig();
+      const { from, config } = await this.reloadConfig();
 
       await this.mailMainService.send({
         to: from,
         from,
         subject: '[HedHog] Mail configuration validation',
-        body: `This is an automatic validation email for the configured provider "${provider}".`,
+        body: `This is an automatic validation email for the configured profile (id: ${profileId}).`,
       });
 
       await this.setting.setValue('configured-mail', 'true');
@@ -100,86 +95,91 @@ export class MailService implements OnModuleInit {
   }
 
   /**
-   * Reload mail configuration from database and update MailMainService
+   * Reload mail configuration from database and update MailMainService.
+   * Returns the active from address and the built config object.
    */
-  async reloadConfig() {
+  async reloadConfig(): Promise<{ success: boolean; provider: string; from: string; config: any }> {
     try {
-      const mailSettings = await this.prismaService.setting.findMany({
-        where: {
-          slug: {
-            in: [
-              'mail-provider',
-              'mail-from',
-              'mail-gmail-client-id',
-              'mail-gmail-client-secret',
-              'mail-gmail-refresh-token',
-              'mail-smtp-host',
-              'mail-smtp-port',
-              'mail-smtp-secure',
-              'mail-client-secret',
-              'mail-aws-access-key-id',
-              'mail-aws-secret-access-key',
-              'mail-aws-region'
-            ]
-          }
-        },
-        select: {
-          slug: true,
-          value: true,
-        }
-      });
+      const settings = await this.setting.getSettingValues(['mail-profile-id']);
+      const profileId = Number(settings['mail-profile-id']);
 
-      const settings = new Map<string, string>();
-      for (const setting of mailSettings) {
-        settings.set(setting.slug, setting.value);
+      if (!profileId || profileId <= 0) {
+        throw new BadRequestException('No mail profile configured. Set a mail profile in the Mail settings.');
       }
 
-      const config: any = {
-        global: true,
-      };
-
-      switch (settings.get('mail-provider')) {
-        case 'GMAIL':
-          Object.assign(config, {
-            type: 'GMAIL',
-            clientId: settings.get('mail-gmail-client-id'),
-            clientSecret: settings.get('mail-gmail-client-secret'),
-            refreshToken: settings.get('mail-gmail-refresh-token'),
-            from: settings.get('mail-from'),
-          });
-          break;
-        case 'SMTP':
-          Object.assign(config, {
-            type: 'SMTP',
-            host: settings.get('mail-smtp-host'),
-            port: Number(settings.get('mail-smtp-port')),
-            secure: settings.get('mail-smtp-secure') === 'true',
-            username: settings.get('mail-from'),
-            password: settings.get('mail-client-secret'),
-          });
-          break;
-        case 'SES':
-          Object.assign(config, {
-            type: 'SES',
-            region: settings.get('mail-aws-region'),
-            accessKeyId: settings.get('mail-aws-access-key-id'),
-            secretAccessKey: settings.get('mail-aws-secret-access-key'),
-            from: settings.get('mail-from'),
-          });
-          break;
-        default:
-          throw new BadRequestException(`Invalid mail provider: ${settings.get('mail-provider')}`);
+      const profile = await this.prismaService.mail_profile.findUnique({
+        where: { id: profileId },
+      });
+
+      if (!profile) {
+        throw new NotFoundException(`Mail profile with id ${profileId} not found.`);
       }
 
+      const config = this.buildMailConfig(profile);
+
       this.mailMainService.setConfig(config);
-      this.logger.log('Mail configuration reloaded successfully');
-      return { success: true, provider: settings.get('mail-provider') };
+      this.logger.log(`Mail configuration reloaded from profile "${profile.name}" (${profile.provider})`);
+
+      const from = profile.from_name
+        ? `${profile.from_name} <${profile.from_email}>`
+        : profile.from_email;
+
+      return { success: true, provider: profile.provider, from, config };
     } catch (error) {
       this.logger.error('Error reloading mail configuration:', error);
       throw error;
     }
   }
 
+  private buildMailConfig(profile: {
+    provider: string;
+    from_email: string;
+    smtp_host?: string | null;
+    smtp_port?: number | null;
+    smtp_secure?: boolean | null;
+    smtp_username?: string | null;
+    smtp_password?: string | null;
+    gmail_client_id?: string | null;
+    gmail_client_secret?: string | null;
+    gmail_refresh_token?: string | null;
+    ses_access_key_id?: string | null;
+    ses_secret_access_key?: string | null;
+    ses_region?: string | null;
+  }): any {
+    switch (profile.provider) {
+      case 'GMAIL':
+        return {
+          global: true,
+          type: 'GMAIL' as const,
+          clientId: profile.gmail_client_id ?? '',
+          clientSecret: profile.gmail_client_secret ?? '',
+          refreshToken: profile.gmail_refresh_token ?? '',
+          from: profile.from_email,
+        };
+      case 'SMTP':
+        return {
+          global: true,
+          type: 'SMTP' as const,
+          host: profile.smtp_host ?? '',
+          port: profile.smtp_port ?? 587,
+          secure: profile.smtp_secure ?? false,
+          username: profile.smtp_username ?? '',
+          password: profile.smtp_password ?? '',
+        };
+      case 'SES':
+        return {
+          global: true,
+          type: 'SES' as const,
+          region: profile.ses_region ?? '',
+          accessKeyId: profile.ses_access_key_id ?? '',
+          secretAccessKey: profile.ses_secret_access_key ?? '',
+          from: profile.from_email,
+        };
+      default:
+        throw new BadRequestException(`Invalid mail provider: ${profile.provider}`);
+    }
+  }
+
   async list(locale: string, paginationParams: PaginationDTO) {
     const result = await this.localeService.listModelWithLocale(
       locale,
@@ -391,11 +391,7 @@ export class MailService implements OnModuleInit {
     locale: string,
     { email, slug, variables }: SendTemplatedMailDTO,
   ) {
-
-    const settings = await this.setting.getSettingValues([
-      'configured-mail',
-      'mail-from'
-    ]);
+    const settings = await this.setting.getSettingValues(['configured-mail']);
 
     if (!this.isSettingEnabled(settings['configured-mail'])) {
       this.logger.warn('Mail service is not configured. Aborting sending email.');
@@ -403,7 +399,7 @@ export class MailService implements OnModuleInit {
     }
 
     try {
-
+      const { from } = await this.reloadConfig();
       const localeRecord = await this.getLocaleRecord(locale);
       const mail = await this.getMailTemplate(slug, localeRecord.id);
       const { subject, body } = mail.mail_locale[0];
@@ -412,7 +408,7 @@ export class MailService implements OnModuleInit {
 
       await this.mailMainService.send({
         to: email,
-        from: settings['mail-from'],
+        from,
         subject: parsedSubject,
         body: parsedBody,
         mail_id: mail.id,
@@ -481,15 +477,14 @@ export class MailService implements OnModuleInit {
   }: TestMailDTO) {
     const localeRecord = await this.getLocaleRecord(locale);
     const mail = await this.getMailTemplate(slug, localeRecord.id);
-    const settings = await this.setting.getSettingValues([
-      'configured-mail',
-      'mail-from'
-    ]);
+    const settings = await this.setting.getSettingValues(['configured-mail']);
 
     if (!this.isSettingEnabled(settings['configured-mail'])) {
       throw new BadRequestException('Mail service is not configured.');
     }
 
+    const { from } = await this.reloadConfig();
+
     try {
       const parsedSubject = variables
         ? this.interpolateTemplate(subject, variables)
@@ -503,7 +498,7 @@ export class MailService implements OnModuleInit {
         subject: parsedSubject,
         body: parsedBody,
         mail_id: mail.id,
-        from: settings['mail-from'],
+        from,
       });
     } catch (error) {
       this.logger.error('Error sending test mail:', error);

package/src/role/role.service.ts

@@ -2,14 +2,15 @@ import { LocaleService, getLocaleText } from '@hed-hog/api-locale';
 import { PaginationDTO, PaginationService } from '@hed-hog/api-pagination';
 import { PrismaService } from '@hed-hog/api-prisma';
 import {
-  BadRequestException,
-  Inject,
-  Injectable,
-  NotFoundException,
-  forwardRef,
+    BadRequestException,
+    Inject,
+    Injectable,
+    NotFoundException,
+    forwardRef,
 } from '@nestjs/common';
 import { DeleteDTO } from '../dto/delete.dto';
 import { UpdateIdsDTO } from '../dto/update-ids.dto';
+import { IntegrationDeveloperApiService } from '../integration/services/integration-developer-api.service';
 import { CreateDTO } from './dto/create.dto';
 import { UpdateDTO } from './dto/update.dto';
 
@@ -22,6 +23,8 @@ export class RoleService {
     private readonly paginationService: PaginationService,
     @Inject(forwardRef(() => LocaleService))
     private readonly localeService: LocaleService,
+    @Inject(forwardRef(() => IntegrationDeveloperApiService))
+    private readonly integrationApi: IntegrationDeveloperApiService,
   ) {}
 
   async updateUsers(roleId: number, { ids }: UpdateIdsDTO):Promise<{count:number}> {
@@ -421,7 +424,17 @@ export class RoleService {
       );
     }
 
-    return this.get(role.id);
+    const result = await this.get(role.id);
+
+    await this.integrationApi.publishEvent({
+      eventName: 'core.role.created',
+      sourceModule: 'core',
+      aggregateType: 'role',
+      aggregateId: String(role.id),
+      payload: { id: role.id, slug },
+    }).catch(() => null);
+
+    return result;
   }
 
   async update(id: number, body: UpdateDTO, localeRequest:string) {
@@ -470,7 +483,17 @@ export class RoleService {
       );
     }
 
-    return this.get(id);
+    const result = await this.get(id);
+
+    await this.integrationApi.publishEvent({
+      eventName: 'core.role.updated',
+      sourceModule: 'core',
+      aggregateType: 'role',
+      aggregateId: String(id),
+      payload: { id, slug: body.slug },
+    }).catch(() => null);
+
+    return result;
   }
 
   async delete({ ids }: DeleteDTO, localeRequest: string = 'en'):Promise<{count:number}> {
@@ -494,12 +517,22 @@ export class RoleService {
       throw new NotFoundException(getLocaleText('itemsNotFound', localeRequest, `Roles with IDs ${missingIds.join(', ')} not found`).replace('{{items}}', 'Roles'));
     }
 
-    return this.prismaService.role.deleteMany({
+    const result = await this.prismaService.role.deleteMany({
       where: {
         id: {
           in: ids,
         },
       },
     });
+
+    await this.integrationApi.publishEvent({
+      eventName: 'core.role.deleted',
+      sourceModule: 'core',
+      aggregateType: 'role',
+      aggregateId: ids.join(','),
+      payload: { ids },
+    }).catch(() => null);
+
+    return result;
   }
 }

package/src/setting/setting.service.ts

@@ -3,12 +3,12 @@ import { getLocaleText, LocaleService } from '@hed-hog/api-locale';
 import { PaginationDTO, PaginationService } from '@hed-hog/api-pagination';
 import { PrismaService, setting_type_0f055cd5ea_enum } from '@hed-hog/api-prisma';
 import {
-  BadRequestException,
-  forwardRef,
-  Inject,
-  Injectable,
-  Logger,
-  NotFoundException
+    BadRequestException,
+    forwardRef,
+    Inject,
+    Injectable,
+    Logger,
+    NotFoundException
 } from '@nestjs/common';
 import * as pako from 'pako';
 import { IntegrationDeveloperApiService } from '../integration/services/integration-developer-api.service';
@@ -214,6 +214,7 @@ export class SettingService {
       'providers',
       'disable-authentication-with-email-and-password',
       'contact-allow-company-registration',
+      'operations.comment-edit-window',
     ];
     const setting = await this.getSettingValues(slugs);
     return { locales, setting };

package/src/user/user.service.ts

@@ -11,6 +11,7 @@ import {
 import { ChallengeService } from '../challenge/challenge.service';
 import { DeleteDTO } from '../dto/delete.dto';
 import { FileService } from '../file/file.service';
+import { IntegrationDeveloperApiService } from '../integration/services/integration-developer-api.service';
 import { SecurityService } from '../security/security.service';
 import { USER_AVATAR_UPLOAD_DESTINATION } from './constants/user.constants';
 import { CreateWithEmailAndPasswordDTO } from './dto/create-with-email-and-password.dto';
@@ -64,7 +65,9 @@ export class UserService {
     @Inject(forwardRef(() => ChallengeService))
     private readonly challenge: ChallengeService,
     @Inject(forwardRef(() => FileService))
-    private readonly file: FileService
+    private readonly file: FileService,
+    @Inject(forwardRef(() => IntegrationDeveloperApiService))
+    private readonly integrationApi: IntegrationDeveloperApiService,
   ) { }
 
   // ==========================================
@@ -195,16 +198,34 @@ export class UserService {
     const challenge = await this.challenge.verifyEmail(locale, user.id, email);
     await this.registerUserActivity(user.id, 'register');
 
+    await this.integrationApi.publishEvent({
+      eventName: 'core.user.created',
+      sourceModule: 'core',
+      aggregateType: 'user',
+      aggregateId: String(user.id),
+      payload: { id: user.id, name: user.name, email },
+    }).catch(() => null);
+
     return { user, challenge };
   }
 
   async update(locale: string, userId: number, { name }: UpdateDTO) {
     const user = await this.findUserById(locale, userId);
 
-    return this.prismaService.user.update({
+    const result = await this.prismaService.user.update({
       where: { id: user.id },
       data: { name: name ?? user.name },
     });
+
+    await this.integrationApi.publishEvent({
+      eventName: 'core.user.updated',
+      sourceModule: 'core',
+      aggregateType: 'user',
+      aggregateId: String(userId),
+      payload: { id: userId, name: result.name },
+    }).catch(() => null);
+
+    return result;
   }
 
   async resetPassword(
@@ -261,9 +282,19 @@ export class UserService {
       );
     }
 
-    return this.prismaService.user.deleteMany({
+    const result = await this.prismaService.user.deleteMany({
       where: { id: { in: ids } },
     });
+
+    await this.integrationApi.publishEvent({
+      eventName: 'core.user.deleted',
+      sourceModule: 'core',
+      aggregateType: 'user',
+      aggregateId: ids.join(','),
+      payload: { ids },
+    }).catch(() => null);
+
+    return result;
   }
 
   // ==========================================

package/src/webhook-integration/event-webhook.controller.ts

@@ -0,0 +1,50 @@
+import { DeleteDTO, Role } from '@hed-hog/api';
+import { Pagination } from '@hed-hog/api-pagination';
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Param,
+  ParseIntPipe,
+  Patch,
+  Post,
+} from '@nestjs/common';
+import { EventWebhookService } from './event-webhook.service';
+
+@Role()
+@Controller('event-webhook')
+export class EventWebhookController {
+  constructor(private readonly service: EventWebhookService) {}
+
+  @Get()
+  list(@Pagination() paginationParams) {
+    return this.service.list(paginationParams);
+  }
+
+  @Get(':id')
+  get(@Param('id', ParseIntPipe) id: number) {
+    return this.service.get(id);
+  }
+
+  @Post()
+  create(@Body() data: any) {
+    return this.service.create(data);
+  }
+
+  @Patch(':id')
+  update(@Param('id', ParseIntPipe) id: number, @Body() data: any) {
+    return this.service.update(id, data);
+  }
+
+  @Delete()
+  delete(@Body() data: DeleteDTO) {
+    return this.service.delete(data);
+  }
+
+  @Get(':id/log')
+  logs(@Param('id', ParseIntPipe) id: number, @Pagination() paginationParams) {
+    return this.service.listLogs(id, paginationParams);
+  }
+}
+