@hed-hog/core 0.0.6 → 0.0.10

package/src/profile/profile.service.ts

@@ -3,14 +3,14 @@ import { PrismaService, user } from '@hed-hog/api-prisma';
 import { BadRequestException, forwardRef, Inject, Injectable, NotFoundException } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import type {
-    VerifiedAuthenticationResponse,
-    VerifiedRegistrationResponse,
+  VerifiedAuthenticationResponse,
+  VerifiedRegistrationResponse,
 } from '@simplewebauthn/server';
 import {
-    generateAuthenticationOptions,
-    generateRegistrationOptions,
-    verifyAuthenticationResponse,
-    verifyRegistrationResponse,
+  generateAuthenticationOptions,
+  generateRegistrationOptions,
+  verifyAuthenticationResponse,
+  verifyRegistrationResponse,
 } from '@simplewebauthn/server';
 import * as qrcode from 'qrcode';
 import * as speakeasy from 'speakeasy';
@@ -27,7 +27,6 @@ import { UpdateDto } from './dto/update.dto';
 
 @Injectable()
 export class ProfileService {
-  public settings: Record<string, any> = {};
 
   constructor(
     private readonly prisma: PrismaService,
@@ -53,21 +52,6 @@ export class ProfileService {
     return { success: true };
   }
 
-  async onModuleInit() {
-    this.settings = await this.setting.getSettingValues([
-      'mfa-issuer',
-      'mfa-window',
-      'mfa-setp',
-      'system-name',
-      'google_client_id',
-      'google_client_secret',
-      'google_scopes',
-      'url',
-      'mfa-challenge-expiration-minutes',
-      'access-token-expiration-minutes'
-    ]);
-  }
-
   async confirmEmailVerification(locale: string, userId: number, { pin, hash, name, email }: EmailVerificationDto) {
     const challenge = await this.challenge.verifyCode(locale, userId, pin, hash, name, email)
     const updatedUser = await this.prisma.user.findFirst({ where: { id: userId }})
@@ -187,8 +171,22 @@ export class ProfileService {
   }
 
   async verifyMfaTotp(userId: number, token: string, secret: string, name?: string) {
-    const window = this.settings['mfa-window'] ?? 0;
-    const step = this.settings['mfa-setp'] ?? 30;
+
+    const settings = await this.setting.getSettingValues([
+      'mfa-issuer',
+      'mfa-window',
+      'mfa-setp',
+      'system-name',
+      'google_client_id',
+      'google_client_secret',
+      'google_scopes',
+      'url',
+      'mfa-challenge-expiration-minutes',
+      'access-token-expiration-minutes'
+    ]);
+
+    const window = settings['mfa-window'] ?? 0;
+    const step = settings['mfa-setp'] ?? 30;
     const user = await this.prisma.user.findFirst({
       where: { id: userId },
       include: { user_mfa: { include: { user_mfa_totp: true }}}
@@ -242,6 +240,20 @@ export class ProfileService {
   }
 
   async generateMfaTotp(locale: string, userId: number) {
+
+    const settings = await this.setting.getSettingValues([
+      'mfa-issuer',
+      'mfa-window',
+      'mfa-setp',
+      'system-name',
+      'google_client_id',
+      'google_client_secret',
+      'google_scopes',
+      'url',
+      'mfa-challenge-expiration-minutes',
+      'access-token-expiration-minutes'
+    ]);
+
     const user = await this.prisma.user.findFirst({
       where: { id: userId },
       select: {
@@ -250,7 +262,7 @@ export class ProfileService {
       },
     });
 
-    const issuer = this.settings['mfa-issuer'] ?? 'Hedhog';
+    const issuer = settings['mfa-issuer'] ?? 'Hedhog';
     const userEmail = user.user_identifier.find(ui => ui.type === 'email').value
     const appName = `${issuer} (${userEmail})`;
 
@@ -261,7 +273,7 @@ export class ProfileService {
       encoding: 'base32',
     });
 
-    const step = this.settings['mfa-setp'] ?? 30;
+    const step = settings['mfa-setp'] ?? 30;
     const otpauth = speakeasy.otpauthURL({
       secret: secret.base32,
       label: `${issuer}:${userEmail}`,
@@ -946,7 +958,20 @@ export class ProfileService {
         throw new NotFoundException(getLocaleText('userNotFound', locale, 'User not found.'));
       }
 
-      const rpName = this.settings['system-name'] || 'HedHog';
+      const settings = await this.setting.getSettingValues([
+        'mfa-issuer',
+        'mfa-window',
+        'mfa-setp',
+        'system-name',
+        'google_client_id',
+        'google_client_secret',
+        'google_scopes',
+        'url',
+        'mfa-challenge-expiration-minutes',
+        'access-token-expiration-minutes'
+      ]);
+
+      const rpName = settings['system-name'] || 'HedHog';
       const rpID = new URL(process.env.FRONTEND_URL || 'http://localhost:3200').hostname;
       const userEmail = user.user_identifier.find(ui => ui.type === 'email')?.value || `user${userId}@example.com`;
       const existingAuthenticators = user.user_mfa

package/src/session/session.service.ts

@@ -2,7 +2,7 @@ import { getLocaleText } from '@hed-hog/api-locale';
 import { PaginationDTO, PaginationService } from '@hed-hog/api-pagination';
 import { PrismaService } from '@hed-hog/api-prisma';
 import { HttpService } from '@nestjs/axios';
-import { BadRequestException, forwardRef, HttpException, HttpStatus, Inject, Injectable, OnModuleInit } from '@nestjs/common';
+import { BadRequestException, forwardRef, HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
 import { firstValueFrom } from 'rxjs';
 import { SecurityService } from '../security/security.service';
 import { SettingService } from '../setting/setting.service';
@@ -21,9 +21,7 @@ type GeoIpResult = {
 };
 
 @Injectable()
-export class SessionService implements OnModuleInit {
-
-  public settings: Record<string, any> = {};
+export class SessionService {
 
   constructor(
     private prisma: PrismaService,
@@ -41,12 +39,6 @@ export class SessionService implements OnModuleInit {
     private readonly paginationService: PaginationService,
   ) { }
 
-  async onModuleInit() {
-    this.settings = await this.setting.getSettingValues([
-      'refresh-token-expiration-minutes'
-    ]);
-  }
-
   async create(locale: string, userId: number, ipAddress: string, userAgent: string) {
     if (!userId) {
       throw new BadRequestException(getLocaleText('session.userIdRequired', locale, 'User ID is required to create a session.'));
@@ -60,6 +52,9 @@ export class SessionService implements OnModuleInit {
       throw new BadRequestException(getLocaleText('session.userAgentRequired', locale, 'User agent is required to create a session.'));
     }
 
+    const settings = await this.setting.getSettingValues([
+      'refresh-token-expiration-minutes'
+    ]);
     const token = await this.token.createOpaqueToken();
     const hash = this.security.hashWithPepper(token)
     const session = await this.prisma.user_session.create({
@@ -67,7 +62,7 @@ export class SessionService implements OnModuleInit {
         user_id: userId,
         ip_address: ipAddress,
         user_agent: userAgent,
-        expires_at: new Date(Date.now() + ((this.settings['refresh-token-expiration-minutes'] || 43200) * 60 * 1000)),
+        expires_at: new Date(Date.now() + ((settings['refresh-token-expiration-minutes'] || 43200) * 60 * 1000)),
         hash
       },
     });

package/src/setting/setting.controller.ts

@@ -7,6 +7,7 @@ import {
   Delete,
   forwardRef,
   Get,
+  Header,
   Inject,
   Param,
   ParseIntPipe,
@@ -14,10 +15,12 @@ import {
   Post,
   Put,
   Query,
+  Res,
   UploadedFile,
-  UseInterceptors,
+  UseInterceptors
 } from '@nestjs/common';
 import { FileInterceptor } from '@nestjs/platform-express';
+import { Response } from 'express';
 import { ConfirmImportDTO } from './dto/confirm-import.dto';
 import { CreateDTO } from './dto/create.dto';
 import { DeleteDTO } from './dto/delete.dto';
@@ -36,8 +39,11 @@ export class SettingsController {
   ) { }
 
   @Get('export')
-  async exportSettings(@Query() {secrets = false}: ExportDto) {
-    return this.settingService.exportSettings(secrets);
+  @Header('Content-Type', 'application/octet-stream')
+  @Header('Content-Disposition', 'attachment; filename="settings.hedhog"')
+  async exportSettings(@Query() {secrets = false}: ExportDto, @Res() res: Response) {
+    const compressedData = await this.settingService.exportSettings(secrets);
+    res.send(compressedData);
   }
 
   @Public()

package/src/setting/setting.service.ts

@@ -3,11 +3,12 @@ import { getLocaleText, LocaleService } from '@hed-hog/api-locale';
 import { PaginationDTO, PaginationService } from '@hed-hog/api-pagination';
 import { PrismaService, setting_type_enum } from '@hed-hog/api-prisma';
 import {
-    BadRequestException,
-    forwardRef,
-    Inject,
-    Injectable,
+  BadRequestException,
+  forwardRef,
+  Inject,
+  Injectable,
 } from '@nestjs/common';
+import * as pako from 'pako';
 import { CreateDTO } from './dto/create.dto';
 import { DeleteDTO } from './dto/delete.dto';
 import { SettingDTO } from './dto/setting.dto';
@@ -27,7 +28,7 @@ export class SettingService {
     private readonly localeService: LocaleService,
   ) { }
 
-  async exportSettings(includeSecrets = false) {
+  async exportSettings(includeSecrets = false): Promise<Buffer> {
     const settings = await this.prismaService.setting.findMany({
       where: {
         ...( !includeSecrets ? {
@@ -42,16 +43,20 @@ export class SettingService {
       }
     });
 
-    return settings;
+    // Converte para JSON e compacta com gzip
+    const jsonString = JSON.stringify(settings);
+    const compressed = pako.gzip(jsonString);
+    return Buffer.from(compressed);
   }
 
   async importSettings(file: MulterFile) {
-    const content = file.buffer?.toString('utf-8') || '';
     let json;
     try {
-      json = JSON.parse(content);
+      // Descompacta o arquivo .hedhog
+      const decompressed = pako.ungzip(file.buffer, { to: 'string' });
+      json = JSON.parse(decompressed);
     } catch (err) {
-      throw new BadRequestException(getLocaleText('invalidJsonFile', 'en', 'File does not contain valid JSON.'));
+      throw new BadRequestException(getLocaleText('invalidCompressedFile', 'en', 'File is not a valid .hedhog file or is corrupted.'));
     }
 
     if (!Array.isArray(json)) {
@@ -74,11 +79,15 @@ export class SettingService {
     const validSlugs = slugsFromFile.filter((slug: string) => existingSlugs.includes(slug));
     const invalidSlugs = slugsFromFile.filter((slug: string) => !existingSlugs.includes(slug));
 
+    // Filtra apenas os dados válidos para retornar
+    const validData = json.filter((item: any) => validSlugs.includes(item.slug));
+
     return {
       totalSettings: slugsFromFile.length,
       validSettings: validSlugs.length,
       invalidSlugs,
       validSlugs,
+      fileData: validData,
     };
   }
 

package/src/token/token.service.ts

@@ -1,13 +1,11 @@
 import { getLocaleText } from "@hed-hog/api-locale";
-import { ForbiddenException, forwardRef, Inject, Injectable, OnModuleInit } from "@nestjs/common";
+import { ForbiddenException, forwardRef, Inject, Injectable } from "@nestjs/common";
 import { JwtService } from "@nestjs/jwt";
 import { SecurityService } from "../security/security.service";
 import { SettingService } from "../setting/setting.service";
 
 @Injectable()
-export class TokenService implements OnModuleInit {
-
-  public settings: Record<string, any> = {};
+export class TokenService {
 
   constructor(
     @Inject(forwardRef(() => JwtService))
@@ -18,12 +16,6 @@ export class TokenService implements OnModuleInit {
     private readonly setting: SettingService,
   ) { }
 
-  async onModuleInit() {
-    this.settings = await this.setting.getSettingValues([
-      'url'
-    ]);
-  }
-
   async verify(locale: string, token: string) {
     try {
       return this.jwt.verifyAsync(token, { secret: this.security.getJwtSecret() });
@@ -42,10 +34,15 @@ export class TokenService implements OnModuleInit {
     return this.security.randomOpaque(size);
   }
 
-  private getCookieDomain(): string | undefined {
-    if (this.settings['url']) {
+  private async getCookieDomain() {
+
+    const settings = await this.setting.getSettingValues([
+      'url'
+    ]);
+
+    if (settings['url']) {
       try {
-        return new URL(this.settings['url']).hostname;
+        return new URL(settings['url']).hostname;
       } catch {
         return process.env.COOKIE_DOMAIN;
       }
@@ -55,7 +52,7 @@ export class TokenService implements OnModuleInit {
 
   async removeRefreshTokenCookie(res): Promise<void> {
 
-    const domain = this.getCookieDomain();
+    const domain = await this.getCookieDomain();
     const isLocalhost = !domain || domain === 'localhost';
     const cookieOptions: any = {
       httpOnly: true,
@@ -69,7 +66,7 @@ export class TokenService implements OnModuleInit {
   }
 
   async setRefreshTokenCookie(locale: string, res, token: string, expires_at: Date): Promise<void> {
-    const domain = this.getCookieDomain();
+    const domain = await this.getCookieDomain();
     const isLocalhost = !domain || domain === 'localhost';
     const maxAge = expires_at.getTime() - Date.now();
     const cookieOptions: any = {