Merge branch 'main' into chore/tags

Author: LucienShui

nest-cli.json

@@ -7,7 +7,8 @@
     "assets": [
       {
         "include": "mail/templates/**"
-      }
+      },
+      { "include": "i18n/**/*", "watchAssets": true }
     ]
   }
 }

package.json

@@ -84,6 +84,7 @@
     "meilisearch": "^0.50.0",
     "minio": "^8.0.6",
     "nanoid": "^5.1.6",
+    "nestjs-i18n": "^10.5.1",
     "nestjs-otel": "^7.0.1",
     "nodemailer": "^6.10.1",
     "openai": "^4.104.0",

pnpm-lock.yaml

@@ -6,7 +6,6 @@ import {
   UpdateAPIKeyDto,
 } from 'omniboxd/api-key/api-key.dto';
 import {
-  BadRequestException,
   Body,
   Controller,
   Delete,
@@ -16,7 +15,10 @@ import {
   Post,
   Put,
   Query,
+  HttpStatus,
 } from '@nestjs/common';
+import { AppException } from 'omniboxd/common/exceptions/app.exception';
+import { I18n, I18nContext } from 'nestjs-i18n';
 
 @Controller('api/v1/api-keys')
 export class APIKeyController {
@@ -31,12 +33,16 @@ export class APIKeyController {
 
   @Get()
   async findAll(
+    @I18n() i18n: I18nContext,
     @Query('user_id') userId?: string,
     @Query('namespace_id') namespaceId?: string,
   ): Promise<APIKeyResponseDto[]> {
     if (!userId && !namespaceId) {
-      throw new BadRequestException(
-        'Either user_id or namespace_id must be provided',
+      const message = i18n.t('apikey.errors.userOrNamespaceRequired');
+      throw new AppException(
+        message,
+        'USER_OR_NAMESPACE_REQUIRED',
+        HttpStatus.BAD_REQUEST,
       );
     }
     return await this.apiKeyService.findAll(userId, namespaceId);

src/api-key/api-key.controller.ts

@@ -15,6 +15,8 @@ import { ResourcePermission } from 'omniboxd/permissions/resource-permission.enu
 import { CreateAPIKeyDto } from './api-key.dto';
 import { Applications } from 'omniboxd/applications/applications.entity';
 import { UserService } from 'omniboxd/user/user.service';
+import { I18nService } from 'nestjs-i18n';
+import { AppException } from 'omniboxd/common/exceptions/app.exception';
 
 describe('APIKeyService', () => {
   let service: APIKeyService;
@@ -68,6 +70,23 @@ describe('APIKeyService', () => {
       find: jest.fn(),
     };
 
+    const mockI18nService = {
+      t: jest.fn((key: string, options?: any) => {
+        // Return mock translations for test purposes
+        const translations: Record<string, string> = {
+          'apikey.errors.noPermissionForNamespace': 'User {{userId}} does not have permission to namespace {{namespaceId}}',
+          'apikey.errors.noWritePermission': 'User {{userId}} does not have write permission to resource {{resourceId}} in namespace {{namespaceId}}',
+        };
+        let translation = translations[key] || key;
+        if (options?.args) {
+          Object.entries(options.args).forEach(([param, value]) => {
+            translation = translation.replace(`{{${param}}}`, String(value));
+          });
+        }
+        return translation;
+      }),
+    };
+
     const module: TestingModule = await Test.createTestingModule({
       providers: [
         APIKeyService,
@@ -91,6 +110,10 @@ describe('APIKeyService', () => {
           provide: UserService,
           useValue: mockUserService,
         },
+        {
+          provide: I18nService,
+          useValue: mockI18nService,
+        },
       ],
     }).compile();
 
@@ -161,12 +184,12 @@ describe('APIKeyService', () => {
       });
     });
 
-    it('should throw ForbiddenException when user is not a namespace member', async () => {
+    it('should throw AppException when user is not a namespace member', async () => {
       // Mock namespace membership check to return null (not a member)
       namespacesService.getMemberByUserId.mockResolvedValue(null);
 
       await expect(service.create(createApiKeyDto)).rejects.toThrow(
-        ForbiddenException,
+        AppException,
       );
       await expect(service.create(createApiKeyDto)).rejects.toThrow(
         'User test-user-id does not have permission to namespace test-namespace-id',
@@ -181,7 +204,7 @@ describe('APIKeyService', () => {
       expect(apiKeyRepository.create).not.toHaveBeenCalled();
     });
 
-    it('should throw ForbiddenException when user lacks write permission to resource', async () => {
+    it('should throw AppException when user lacks write permission to resource', async () => {
       // Mock namespace membership check
       namespacesService.getMemberByUserId.mockResolvedValue({
         id: 1,
@@ -195,7 +218,7 @@ describe('APIKeyService', () => {
       permissionsService.userHasPermission.mockResolvedValue(false);
 
       await expect(service.create(createApiKeyDto)).rejects.toThrow(
-        ForbiddenException,
+        AppException,
       );
       await expect(service.create(createApiKeyDto)).rejects.toThrow(
         'User test-user-id does not have write permission to resource test-resource-id in namespace test-namespace-id',