@hed-hog/core 0.0.14 → 0.0.17

package/src/profile/profile.controller.ts

@@ -54,13 +54,13 @@ export class ProfileController {
   }
 
   @Post('totp/verify')
-  async verifyMfaTotp(@User() { id }, @Body() { token, secret, name }: VerifyMfaTotpDto) {
-    return this.profileService.verifyMfaTotp(id, token, secret, name);
+  async verifyMfaTotp(@Locale() locale: string, @User() { id }, @Body() { token, secret, name }: VerifyMfaTotpDto) {
+    return this.profileService.verifyMfaTotp(locale, id, token, secret, name);
   }
 
   @Delete('totp/:mfaId/remove')
-  async removeMfaTotp(@User() { id }, @Param('mfaId', ParseIntPipe) mfaId: number, @Body() { token }: RemoveTotpMfaDto) {
-    return this.profileService.removeMfaTotp(id, mfaId, token);
+  async removeMfaTotp(@Locale() locale: string, @User() { id }, @Param('mfaId', ParseIntPipe) mfaId: number, @Body() { token }: RemoveTotpMfaDto) {
+    return this.profileService.removeMfaTotp(locale, id, mfaId, token);
   }
 
   @Post('email/verify/confirm')
@@ -190,8 +190,8 @@ export class ProfileController {
 
   @UseInterceptors(FileInterceptor('file'))
   @Put('avatar')
-  updateAvatar(@User() { id }, @UploadedFile() file: MulterFile) {
-    return this.profileService.updateAvatar(id, file);
+  updateAvatar(@Locale() locale: string, @User() { id }, @UploadedFile() file: MulterFile) {
+    return this.profileService.updateAvatar(locale, id, file);
   }
 
   @Put()

package/src/profile/profile.service.ts

@@ -108,8 +108,8 @@ export class ProfileService {
     });
   }
 
-  async updateAvatar(userId: number, file: MulterFile) {
-    return this.user.changeAvatar(userId, file);   
+  async updateAvatar(locale: string, userId: number, file: MulterFile) {
+    return this.user.changeAvatar(locale, userId, file);   
   }
 
   async changePassword(locale:string, userId: number, {currentPassword, newPassword}: ChangePasswordDto) {
@@ -170,8 +170,7 @@ export class ProfileService {
     return { token: this.jwt.sign(user) };
   }
 
-  async verifyMfaTotp(userId: number, token: string, secret: string, name?: string) {
-
+  async verifyMfaTotp(locale: string, userId: number, token: string, secret: string, name?: string) {
     const settings = await this.setting.getSettingValues([
       'mfa-issuer',
       'mfa-window',
@@ -193,7 +192,7 @@ export class ProfileService {
     });
 
     if (!user) {
-      throw new NotFoundException(getLocaleText('userNotFound', 'en', 'User not found'));
+      throw new NotFoundException(getLocaleText('userNotFound', locale, 'User not found'));
     }
 
     const decodedSecret = Buffer.from(secret, 'base64').toString('utf-8');
@@ -207,7 +206,7 @@ export class ProfileService {
     });
 
     if (!isValid) {
-      throw new BadRequestException(getLocaleText('invalidCode', 'en', 'Invalid code'));
+      throw new BadRequestException(getLocaleText('invalidCode', locale, 'Invalid code'));
     }
 
     if (name){
@@ -288,7 +287,7 @@ export class ProfileService {
     return { otpauthUrl: secret.otpauth_url, qrCode, secret: encodedSecret };
   }
 
-  async removeMfaTotp(userId: number, mfaId: number, token: string) {
+  async removeMfaTotp(locale: string, userId: number, mfaId: number, token: string) {
     try {
       const user = await this.prisma.user.findFirst({
         where: { id: userId },
@@ -298,7 +297,7 @@ export class ProfileService {
 
       const totpMfa = user.user_mfa.find((m) => m.type === 'totp' && m.user_mfa_totp);
       if (!totpMfa || !totpMfa.user_mfa_totp) {
-        throw new NotFoundException(getLocaleText('totpNotFound', 'en', 'TOTP method not found'));
+        throw new NotFoundException(getLocaleText('totpNotFound', locale, 'TOTP method not found'));
       }
 
       const secretBuffer = totpMfa.user_mfa_totp[0].secret;
@@ -308,7 +307,7 @@ export class ProfileService {
       
       const encryptedSecret = this.security.encrypt(secretBase32);
       const encodedSecret = Buffer.from(encryptedSecret, 'utf-8').toString('base64');
-      await this.verifyMfaTotp(user.id, token, encodedSecret);
+      await this.verifyMfaTotp(locale, user.id, token, encodedSecret);
       await this.prisma.$transaction(async (tx) => {
         await tx.user_mfa.deleteMany({
           where: {
@@ -354,7 +353,7 @@ export class ProfileService {
       });
 
       if (!user) {
-        throw new NotFoundException(getLocaleText('userNotFound', 'en', 'User not found'));
+        throw new NotFoundException(getLocaleText('userNotFound', locale, 'User not found'));
       }
 
       let isValid = false;
@@ -493,7 +492,7 @@ export class ProfileService {
         const encodedSecret = Buffer.from(encryptedSecret, 'utf-8').toString('base64');
         
         try {
-          await this.verifyMfaTotp(userId, data.token, encodedSecret);
+          await this.verifyMfaTotp(locale, userId, data.token, encodedSecret);
         } catch (error) {
           throw new BadRequestException(
             getLocaleText('invalidVerificationCode', locale, 'Invalid verification code.')
@@ -735,7 +734,7 @@ export class ProfileService {
         const encodedSecret = Buffer.from(encryptedSecret, 'utf-8').toString('base64');
         
         try {
-          await this.verifyMfaTotp(userId, data.verificationCode, encodedSecret);
+          await this.verifyMfaTotp(locale, userId, data.verificationCode, encodedSecret);
         } catch (error) {
           throw new BadRequestException(
             getLocaleText('invalidVerificationCode', locale, 'Invalid verification code.')
@@ -925,7 +924,7 @@ export class ProfileService {
           const encodedSecret = Buffer.from(encryptedSecret, 'utf-8').toString('base64');
           
           try {
-            await this.verifyMfaTotp(userId, data.verificationCode, encodedSecret);
+            await this.verifyMfaTotp(locale, userId, data.verificationCode, encodedSecret);
           } catch (error) {
             throw new BadRequestException(
               getLocaleText('invalidVerificationCode', locale, 'Invalid verification code.')
@@ -1221,7 +1220,7 @@ export class ProfileService {
     }
   }
 
-  async generateWebAuthnAuthenticationOptionsForLogin(mfaToken: string) {
+  async generateWebAuthnAuthenticationOptionsForLogin(locale: string, mfaToken: string) {
     try {
       const decoded = this.jwt.decode(mfaToken) as any;
       if (!decoded || !decoded.userId) {
@@ -1239,7 +1238,7 @@ export class ProfileService {
       });
 
       if (!user || user.user_mfa.length === 0) {
-        throw new NotFoundException(getLocaleText('webauthnNotConfigured', 'en', 'WebAuthn not configured.'));
+        throw new NotFoundException(getLocaleText('webauthnNotConfigured', locale, 'WebAuthn not configured.'));
       }
 
       const rpID = new URL(process.env.FRONTEND_URL || 'http://localhost:3200').hostname;
@@ -1270,7 +1269,7 @@ export class ProfileService {
     }
   }
 
-  async verifyWebAuthnAuthenticationForLogin(mfaToken: string, assertionResponse: any) {
+  async verifyWebAuthnAuthenticationForLogin(locale: string, mfaToken: string, assertionResponse: any) {
     try {
       const decoded = this.jwt.decode(mfaToken) as any;
       if (!decoded || !decoded.userId) {
@@ -1334,7 +1333,7 @@ export class ProfileService {
 
       const user = await this.prisma.user.findFirst({ where: { id: userId } });
       if (!user) {
-        throw new NotFoundException(getLocaleText('userNotFound', 'en', 'User not found'));
+        throw new NotFoundException(getLocaleText('userNotFound', locale, 'User not found'));
       }
       const payload = { sub: userId };
       const accessToken = await this.token.createAccessToken(payload);

package/src/setting/setting.controller.ts

@@ -90,8 +90,8 @@ export class SettingsController {
 
   @UseInterceptors(FileInterceptor('file'))
   @Post('import')
-  async importSettings(@UploadedFile() file: MulterFile) {
-    return this.settingService.importSettings(file);
+  async importSettings(@Locale() locale: string, @UploadedFile() file: MulterFile) {
+    return this.settingService.importSettings(locale, file);
   }
 
   @Post('import/confirm')

package/src/setting/setting.service.ts

@@ -49,7 +49,7 @@ export class SettingService {
     return Buffer.from(compressed);
   }
 
-  async importSettings(file: MulterFile) {
+  async importSettings(locale: string, file: MulterFile) {
     this.clearCache();
     let json;
     try {
@@ -57,11 +57,11 @@ export class SettingService {
       const decompressed = pako.ungzip(file.buffer, { to: 'string' });
       json = JSON.parse(decompressed);
     } catch (err) {
-      throw new BadRequestException(getLocaleText('invalidCompressedFile', 'en', 'File is not a valid .hedhog file or is corrupted.'));
+      throw new BadRequestException(getLocaleText('invalidCompressedFile', locale, 'File is not a valid .hedhog file or is corrupted.'));
     }
 
     if (!Array.isArray(json)) {
-      throw new BadRequestException(getLocaleText('invalidJsonArray', 'en', 'The JSON file must contain an array of settings.'));
+      throw new BadRequestException(getLocaleText('invalidJsonArray', locale, 'The JSON file must contain an array of settings.'));
     }
 
     const slugsFromFile = json.map((item: any) => item.slug).filter(Boolean);

package/src/user/user.controller.ts

@@ -2,19 +2,19 @@ import { Role } from '@hed-hog/api';
 import { Locale } from '@hed-hog/api-locale';
 import { Pagination } from '@hed-hog/api-pagination';
 import {
-    BadRequestException,
-    Body,
-    Controller,
-    Delete,
-    Get,
-    Inject,
-    Param,
-    ParseIntPipe,
-    Patch,
-    Post,
-    UploadedFile,
-    UseInterceptors,
-    forwardRef,
+  BadRequestException,
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Inject,
+  Param,
+  ParseIntPipe,
+  Patch,
+  Post,
+  UploadedFile,
+  UseInterceptors,
+  forwardRef,
 } from '@nestjs/common';
 import { FileInterceptor } from '@nestjs/platform-express';
 import { DeleteDTO } from '../dto/delete.dto';
@@ -74,10 +74,11 @@ export class UserController {
   )
   @Post(':userId/avatar')
   async changeAvatar(
+    @Locale() locale: string,
     @Param('userId', ParseIntPipe) userId: number,
     @UploadedFile() avatar: MulterFile,
   ) {
-    return this.userService.changeAvatar(userId, avatar)
+    return this.userService.changeAvatar(locale, userId, avatar)
   }
 
   @Delete()

package/src/user/user.service.ts

@@ -2,11 +2,11 @@ import { getLocaleText } from '@hed-hog/api-locale';
 import { PaginationService } from '@hed-hog/api-pagination';
 import { PrismaService, user } from '@hed-hog/api-prisma';
 import {
-    BadRequestException,
-    Inject,
-    Injectable,
-    NotFoundException,
-    forwardRef,
+  BadRequestException,
+  Inject,
+  Injectable,
+  NotFoundException,
+  forwardRef,
 } from '@nestjs/common';
 import { ChallengeService } from '../challenge/challenge.service';
 import { DeleteDTO } from '../dto/delete.dto';
@@ -64,7 +64,7 @@ export class UserService {
     return this.findUserById(locale, userId);
   }
 
-  async changeAvatar(userId: number, avatar: MulterFile){
+  async changeAvatar(locale: string, userId: number, avatar: MulterFile){
     const userFound = await this.prismaService.user.findUnique({
       where: {
         id: userId,
@@ -72,7 +72,7 @@ export class UserService {
     });
 
     if (!userFound) {
-      throw new BadRequestException(getLocaleText('userNotFound', 'en', 'User not found'));
+      throw new BadRequestException(getLocaleText('userNotFound', locale, 'User not found'));
     }
 
     let photo_id = userFound.photo_id;