@hed-hog/core 0.0.266 → 0.0.270

package/src/install/install.service.ts

@@ -1,5 +1,6 @@
 import { PrismaService } from '@hed-hog/api-prisma';
 import { BadRequestException, Injectable, Logger } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
 import { existsSync, readFileSync } from 'fs';
 import { writeFile } from 'fs/promises';
 import { resolve } from 'path';
@@ -13,80 +14,50 @@ export class InstallService {
 
   constructor(
     private readonly security: SecurityService,
-    private readonly prisma: PrismaService
+    private readonly prisma: PrismaService,
+     private readonly configService: ConfigService,
   ) { }
 
   private async forceReset() {
 
     await new Promise((resolve) => setTimeout(resolve, 1000));
 
-    //leia o arquivo src/main.ts e salveo com o mesmo conteudo para forcar o nestjs a reiniciar a aplicacao
-    const mainFilePath = resolve(process.cwd(), 'src', 'main.ts');
-    if (!existsSync(mainFilePath)) {
-      throw new BadRequestException('main.ts file not found.');
+    // In development, touching main.ts triggers restart; in production only dist exists.
+    const candidatePaths = [
+      resolve(process.cwd(), 'src', 'main.ts'),
+      resolve(process.cwd(), 'dist', 'apps', 'api', 'src', 'main.js'),
+      resolve(process.cwd(), 'dist', 'src', 'main.js'),
+    ];
+    const mainFilePath = candidatePaths.find((filePath) => existsSync(filePath));
+    if (!mainFilePath) {
+      this.logger.warn('Skip force reset: no main entry file found to touch.');
+      return;
     }
+
     let mainContent: string;
     try {
       mainContent = readFileSync(mainFilePath, 'utf-8');
     } catch (err: any) {
-      throw new BadRequestException(`Failed to read main.ts file: ${err.message}`);
+      throw new BadRequestException(
+        `Failed to read main entry file: ${err.message}`,
+      );
     }
     try {
-      this.logger.verbose('Forcing application restart by touching main.ts...');
+      this.logger.verbose(
+        `Forcing application restart by touching ${mainFilePath}...`,
+      );
       await writeFile(mainFilePath, mainContent, 'utf-8');
     } catch (err: any) {
-      throw new BadRequestException(`Failed to write main.ts file: ${err.message}`);
+      throw new BadRequestException(
+        `Failed to write main entry file: ${err.message}`,
+      );
     }
 
   }
 
   private async checkInstallation() {
-
-    const hedhogFilePath = resolve(process.cwd(), '..', '..', 'hedhog.json');
-
-    let data = {
-      installed: false
-    };
-
-    if (existsSync(hedhogFilePath)) {
-      try {
-        const fileContent = readFileSync(hedhogFilePath, 'utf-8');
-        data = JSON.parse(fileContent);
-      } catch (err: any) {
-        this.logger.warn(`Failed to read hedhog.json: ${err.message}`);
-      }
-    }
-
-    return data.installed === true;
-
-  }
-
-  private async markAsInstalled() {
-
-    const hedhogFilePath = resolve(process.cwd(), '..', '..', 'hedhog.json');
-
-    let content: any = {}
-
-    if (existsSync(hedhogFilePath)) {
-      try {
-        const fileContent = readFileSync(hedhogFilePath, 'utf-8');
-        content = JSON.parse(fileContent);
-      } catch (err: any) {
-        this.logger.warn(`Failed to read hedhog.json: ${err.message}`);
-      }
-    }
-
-    content.installed = true;
-    content.installedAt = new Date().toISOString();
-
-    try {
-      this.logger.verbose('Marking application as installed in hedghog.json...');
-      await writeFile(hedhogFilePath, JSON.stringify(content, null, 2), 'utf-8');
-    } catch (err: any) {
-      throw new BadRequestException(`Failed to write hedhog.json: ${err.message}`);
-    }
-
-    return true;
+    const usersCount = await this.prisma.user.count();
+    return usersCount > 0;
   }
 
   private async updateEnvSecrets(pepper: string) {
@@ -170,8 +141,6 @@ export class InstallService {
       throw new BadRequestException('Application is already installed.');
     }
 
-    const pepper = this.base64Encode(this.security.randomOpaque(16));
-
     await this.prisma.$transaction(async (prisma) => {
 
       this.logger.log('Starting installation process...');
@@ -220,6 +189,13 @@ export class InstallService {
 
       this.logger.log(`Creating admin user: ${userName} <${email}>`);
 
+      const pepper = this.configService.get<string>('PEPPER');
+      if (!pepper) {
+        throw new BadRequestException(
+          'PEPPER is not configured. Set PEPPER before installation.',
+        );
+      }
+
       const passwordHash = await this.security.hashArgon2(password, pepper);
 
       const user = await prisma.user.create({
@@ -260,9 +236,15 @@ export class InstallService {
 
       this.logger.log(`Roles assigned to user ID: ${user.id}`);
 
-      await this.markAsInstalled();
-      await this.updateEnvSecrets(pepper);
-      this.forceReset();
+      const isDevelopment = process.env.NODE_ENV !== 'production';
+      if (isDevelopment) {
+        await this.updateEnvSecrets(pepper);
+        await this.forceReset();
+      } else {
+        this.logger.log(
+          'Skipping env secret update and force reset outside development.',
+        );
+      }
 
       this.logger.log('Installation process completed successfully.');
 
@@ -273,12 +255,7 @@ export class InstallService {
   }
 
   async check() {
-    if (await this.checkInstallation()) {
-      return { success: true };
-    } else {
-      throw new BadRequestException('Application is not installed.');
-    }
-
+    return { success: true };
   }
 
   async generateMailMigration({

package/src/setting/setting.service.ts

@@ -181,10 +181,11 @@ export class SettingService {
       'date-format',
       'time-format',
       'timezone',
-      'menu-width',
-      'providers',
-      'disable-authentication-with-email-and-password'
-    ];
+      'menu-width',
+      'providers',
+      'disable-authentication-with-email-and-password',
+      'contact-allow-company-registration',
+    ];
     const setting = await this.getSettingValues(slugs);
     return { locales, setting };
   }