Merge pull request #205 from import-ai/fix/bug

hewenguang · web-flow · commit cc300b798ca1 · 2025-10-15T19:59:14.000+08:00
fix(bug): bug fix
diff --git a/example.env b/example.env
@@ -1,5 +1,7 @@
 OBB_PORT=8000
 
+OBB_BASE_URL="https://test.omnibox.pro"
+
 OBB_WIZARD_BASE_URL=http://wizard:8000
 OBB_LOG_LEVELS=error,warn,log
 
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -1,11 +1,11 @@
 import {
-  ClassSerializerInterceptor,
   DynamicModule,
   MiddlewareConsumer,
   Module,
   NestModule,
   ValidationPipe,
 } from '@nestjs/common';
+import { SerializerInterceptor } from 'omniboxd/interceptor/serializer.interceptor';
 import { APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { TagModule } from 'omniboxd/tag/tag.module';
@@ -42,6 +42,7 @@ import { ApiKeys1754550165406 } from 'omniboxd/migrations/1754550165406-api-keys
 import { ResourceAttachments1755059371000 } from 'omniboxd/migrations/1755059371000-resource-attachments';
 import { AddTagIdsToResources1755248141570 } from 'omniboxd/migrations/1755248141570-add-tag-ids-to-resources';
 import { TelemetryModule } from 'omniboxd/telemetry';
+import { SeoModule } from 'omniboxd/seo/seo.module';
 import { CleanResourceNames1755396702021 } from 'omniboxd/migrations/1755396702021-clean-resource-names';
 import { UpdateAttachmentUrls1755499552000 } from 'omniboxd/migrations/1755499552000-update-attachment-urls';
 import { ScanResourceAttachments1755504936756 } from 'omniboxd/migrations/1755504936756-scan-resource-attachments';
@@ -79,7 +80,7 @@ export class AppModule implements NestModule {
         },
         {
           provide: APP_INTERCEPTOR,
-          useClass: ClassSerializerInterceptor,
+          useClass: SerializerInterceptor,
         },
         {
           provide: APP_INTERCEPTOR,
@@ -111,6 +112,7 @@ export class AppModule implements NestModule {
         AttachmentsModule,
         SharesModule,
         SharedResourcesModule,
+        SeoModule,
         TraceModule,
         FeedbackModule,
         ApplicationsModule,
diff --git a/src/auth/auth.e2e-spec.ts b/src/auth/auth.e2e-spec.ts
@@ -68,7 +68,7 @@ describe('AuthModule (e2e)', () => {
             email: 'nonexistent@example.com',
             password: client.user.password,
           })
-          .expect(HttpStatus.FORBIDDEN);
+          .expect(HttpStatus.NOT_FOUND);
       });
 
       it('should fail with invalid password', async () => {
diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
@@ -44,7 +44,7 @@ export class AuthService {
       if (isEmail(email)) {
         const userUseEmail = await this.userService.findByEmail(email);
         if (!userUseEmail) {
-          throw new ForbiddenException(
+          throw new NotFoundException(
             'No account found for the provided email. Please register first.',
           );
         }
@@ -63,6 +63,7 @@ export class AuthService {
       id: user.id,
       access_token: this.jwtService.sign({
         sub: user.id,
+        username: user.username,
       }),
     };
   }
diff --git a/src/auth/google/google.service.ts b/src/auth/google/google.service.ts
@@ -4,6 +4,7 @@ import { ConfigService } from '@nestjs/config';
 import { SocialService } from 'omniboxd/auth/social.service';
 import { UserService } from 'omniboxd/user/user.service';
 import { NamespacesService } from 'omniboxd/namespaces/namespaces.service';
+import { CreateUserBindingDto } from 'omniboxd/user/dto/create-user-binding.dto';
 import {
   BadRequestException,
   Injectable,
@@ -174,6 +175,24 @@ export class GoogleService extends SocialService {
       stateInfo.userInfo = returnValue;
       return returnValue;
     }
+    // The email has already been used https://wqjowq8l2hl.feishu.cn/record/T8zVrlZjReK0HeceZ7icyh8qnze
+    const linkedAccount = await this.userService.findByEmail(userData.email);
+    if (linkedAccount) {
+      const existingUser = await this.userService.bindingExistUser({
+        userId: linkedAccount.id,
+        loginType: 'google',
+        loginId: userData.sub,
+      });
+      const returnValue = {
+        id: existingUser.id,
+        access_token: this.jwtService.sign({
+          sub: existingUser.id,
+        }),
+      };
+      stateInfo.userInfo = returnValue;
+      return returnValue;
+    }
+
     return await this.dataSource.transaction(async (manager) => {
       let nickname = userData.name;
       if (!nickname) {
@@ -192,8 +211,9 @@ export class GoogleService extends SocialService {
           username,
           loginType: 'google',
           loginId: userData.sub,
+          email: userData.email,
           lang,
-        },
+        } as CreateUserBindingDto,
         manager,
       );
 
diff --git a/src/auth/jwt.strategy.ts b/src/auth/jwt.strategy.ts
@@ -26,10 +26,11 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
     });
   }
 
-  validate(payload: { sub: string; email?: string }) {
+  validate(payload: { sub: string; email?: string; username?: string }) {
     return {
       id: payload.sub,
       email: payload.email,
+      username: payload.username,
     };
   }
 }
diff --git a/src/auth/wechat/wechat.service.ts b/src/auth/wechat/wechat.service.ts
@@ -4,6 +4,7 @@ import { ConfigService } from '@nestjs/config';
 import { UserService } from 'omniboxd/user/user.service';
 import { SocialService } from 'omniboxd/auth/social.service';
 import { NamespacesService } from 'omniboxd/namespaces/namespaces.service';
+import { CreateUserBindingDto } from 'omniboxd/user/dto/create-user-binding.dto';
 import {
   Logger,
   Injectable,
@@ -184,7 +185,7 @@ export class WechatService extends SocialService {
           loginType: 'wechat',
           loginId: userData.unionid,
           lang,
-        },
+        } as CreateUserBindingDto,
         manager,
       );
       await this.namespaceService.createUserNamespace(
diff --git a/src/interceptor/serializer.interceptor.ts b/src/interceptor/serializer.interceptor.ts
@@ -0,0 +1,24 @@
+import { ClassSerializerInterceptor } from '@nestjs/common/serializer';
+
+export class SerializerInterceptor extends ClassSerializerInterceptor {
+  serialize(response, options) {
+    if (this.isNativeExpressResponse(response)) {
+      return response;
+    }
+    return super.serialize(response, options);
+  }
+
+  private isNativeExpressResponse(response) {
+    if (!response || typeof response !== 'object') {
+      return false;
+    }
+
+    if (response.constructor?.name === 'ServerResponse') {
+      return true;
+    }
+
+    return ['statusCode', 'send', 'getHeader', 'req'].every(
+      (feat) => feat in response,
+    );
+  }
+}
diff --git a/src/interceptor/utils.ts b/src/interceptor/utils.ts
@@ -15,6 +15,7 @@ export function transformKeysToSnakeCase(data: any): any {
     return Object.keys(data).reduce((acc, key) => {
       const snakeKey = camelToSnake(key);
       acc[snakeKey] = transformKeysToSnakeCase(data[key]);
+
       return acc;
     }, {});
   }
diff --git a/src/namespace-resources/namespace-resources.service.ts b/src/namespace-resources/namespace-resources.service.ts
@@ -1,9 +1,5 @@
 import { InjectRepository } from '@nestjs/typeorm';
 import duplicateName from 'omniboxd/utils/duplicate-name';
-import {
-  encodeFileName,
-  getOriginalFileName,
-} from 'omniboxd/utils/encode-filename';
 import {
   DataSource,
   EntityManager,
@@ -41,6 +37,10 @@ import { ResourceAttachmentsService } from 'omniboxd/resource-attachments/resour
 import { ResourcesService } from 'omniboxd/resources/resources.service';
 import { ResourceMetaDto } from 'omniboxd/resources/dto/resource-meta.dto';
 import { ChildrenMetaDto } from './dto/list-children-resp.dto';
+import {
+  encodeFileName,
+  getOriginalFileName,
+} from 'omniboxd/utils/encode-filename';
 import { isEmpty } from 'omniboxd/utils/is-empty';
 
 const TASK_PRIORITY = 5;
@@ -653,6 +653,7 @@ export class NamespaceResourcesService {
   ) {
     const originalName = getOriginalFileName(fileName);
     const encodedName = encodeFileName(fileName);
+
     let resource: Resource;
     if (resourceId) {
       resource = await this.resourcesService.getResourceOrFail(
diff --git a/src/search/search.controller.ts b/src/search/search.controller.ts
@@ -1,6 +1,7 @@
-import { Controller, Get, Param, Post, Query, Req } from '@nestjs/common';
+import { Controller, Get, Param, Post, Query } from '@nestjs/common';
 import { SearchService } from './search.service';
 import { DocType } from './doc-type.enum';
+import { UserId } from 'omniboxd/decorators/user-id.decorator';
 import { Public } from 'omniboxd/auth/decorators/public.auth.decorator';
 
 @Controller('api/v1/namespaces/:namespaceId/search')
@@ -9,17 +10,12 @@ export class SearchController {
 
   @Get()
   async search(
-    @Req() req,
+    @UserId() userId,
     @Param('namespaceId') namespaceId: string,
     @Query('query') query: string,
     @Query('type') type?: DocType,
   ) {
-    return await this.searchService.search(
-      namespaceId,
-      query,
-      type,
-      req.user.id,
-    );
+    return await this.searchService.search(namespaceId, query, type, userId);
   }
 }
 
diff --git a/src/seo/seo.controller.ts b/src/seo/seo.controller.ts
@@ -0,0 +1,45 @@
+import { Response } from 'express';
+import { SeoService } from 'omniboxd/seo/seo.service';
+import { Controller, Get, Param, Res } from '@nestjs/common';
+import { Public } from 'omniboxd/auth/decorators/public.auth.decorator';
+
+@Public()
+@Controller('api/v1/seo')
+export class SeoController {
+  constructor(private readonly seoService: SeoService) {}
+
+  private send(res: Response, html: string) {
+    res.setHeader('Content-Type', 'text/html; charset=utf-8');
+    res.setHeader('Cache-Control', 'public, max-age=300'); // Cache for 5 minutes
+    res.send(html);
+  }
+
+  @Get('shares/:shareId')
+  async getShareSeoHtml(
+    @Param('shareId') shareId: string,
+    @Res() res: Response,
+  ) {
+    const html = await this.seoService.generateShareHtml(shareId, null);
+    this.send(res, html);
+  }
+
+  @Get('shares/:shareId/:resourceId')
+  async getShareResourceSeoHtml(
+    @Param('shareId') shareId: string,
+    @Param('resourceId') resourceId: string,
+    @Res() res: Response,
+  ) {
+    const html = await this.seoService.generateShareHtml(shareId, resourceId);
+    this.send(res, html);
+  }
+
+  @Get('namespaces/:namespaceId/resources/:resourceId')
+  async getResourceHtml(
+    @Param('namespaceId') namespaceId: string,
+    @Param('resourceId') resourceId: string,
+    @Res() res: Response,
+  ) {
+    const html = await this.seoService.getResourceHtml(namespaceId, resourceId);
+    this.send(res, html);
+  }
+}
diff --git a/src/seo/seo.module.ts b/src/seo/seo.module.ts
@@ -0,0 +1,15 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { SeoController } from 'omniboxd/seo/seo.controller';
+import { SeoService } from 'omniboxd/seo/seo.service';
+import { UserOption } from 'omniboxd/user/entities/user-option.entity';
+import { Share } from 'omniboxd/shares/entities/share.entity';
+import { Resource } from 'omniboxd/resources/entities/resource.entity';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([Share, Resource, UserOption])],
+  controllers: [SeoController],
+  providers: [SeoService],
+  exports: [SeoService],
+})
+export class SeoModule {}
diff --git a/src/seo/seo.service.ts b/src/seo/seo.service.ts
@@ -0,0 +1,94 @@
+import { Repository } from 'typeorm';
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Share } from 'omniboxd/shares/entities/share.entity';
+import { UserOption } from 'omniboxd/user/entities/user-option.entity';
+import { generateHTML, loadHtmlTemplate } from 'omniboxd/seo/utils';
+import { Resource } from 'omniboxd/resources/entities/resource.entity';
+
+@Injectable()
+export class SeoService {
+  private readonly baseUrl: string;
+
+  constructor(
+    @InjectRepository(Share)
+    private readonly shareRepository: Repository<Share>,
+    @InjectRepository(Resource)
+    private readonly resourceRepository: Repository<Resource>,
+    @InjectRepository(UserOption)
+    private readonly userOptionRepository: Repository<UserOption>,
+    private readonly configService: ConfigService,
+  ) {
+    this.baseUrl = this.configService.get<string>(
+      'OBB_BASE_URL',
+      'https://www.omnibox.pro',
+    );
+  }
+
+  async generateShareHtml(
+    shareId: string,
+    resourceId: string | null,
+  ): Promise<string> {
+    const share = await this.shareRepository.findOne({
+      where: { id: shareId },
+    });
+
+    if (!share || !share.enabled) {
+      return loadHtmlTemplate('No share found');
+    }
+
+    if (share.expiresAt && share.expiresAt < new Date()) {
+      return loadHtmlTemplate('No share found');
+    }
+
+    if (share.requireLogin) {
+      return loadHtmlTemplate('This share requires login');
+    }
+
+    if (share.password) {
+      return loadHtmlTemplate('This content is password protected');
+    }
+
+    const targetResourceId = resourceId || share.resourceId;
+    const resource = await this.resourceRepository.findOne({
+      where: { id: targetResourceId },
+      select: ['id', 'name', 'content', 'attrs'],
+    });
+
+    if (!resource) {
+      return loadHtmlTemplate('Resource not found');
+    }
+
+    const baseUrl = `${this.baseUrl}/s/${shareId}/${targetResourceId}`;
+
+    return generateHTML(baseUrl, resource);
+  }
+
+  async getResourceHtml(
+    namespaceId: string,
+    resourceId: string,
+  ): Promise<string> {
+    const resource = await this.resourceRepository.findOne({
+      where: { namespaceId, id: resourceId },
+      select: ['id', 'name', 'content', 'userId'],
+    });
+
+    if (!resource) {
+      return loadHtmlTemplate('Resource not found');
+    }
+
+    if (resource.userId) {
+      const option = await this.userOptionRepository.findOne({
+        where: { userId: resource.userId, name: 'indexed' },
+      });
+      if (option && option.value) {
+        const baseUrl = `${this.baseUrl}/${namespaceId}/${resourceId}`;
+
+        return generateHTML(baseUrl, resource);
+      }
+    }
+
+    return loadHtmlTemplate('This content is protected');
+  }
+}
diff --git a/src/seo/utils.ts b/src/seo/utils.ts
diff --git a/src/user/dto/create-user-binding.dto.ts b/src/user/dto/create-user-binding.dto.ts
diff --git a/src/user/user.service.ts b/src/user/user.service.ts

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,11 @@ export class JwtStrategy extends PassportStrategy(Strategy) {`
`26`	`26`	`});`
`27`	`27`	`}`
`28`	`28`
`29`		`- validate(payload: { sub: string; email?: string }) {`
	`29`	`+ validate(payload: { sub: string; email?: string; username?: string }) {`
`30`	`30`	`return {`
`31`	`31`	`id: payload.sub,`
`32`	`32`	`email: payload.email,`
	`33`	`+ username: payload.username,`
`33`	`34`	`};`
`34`	`35`	`}`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ export function transformKeysToSnakeCase(data: any): any {`
`15`	`15`	`return Object.keys(data).reduce((acc, key) => {`
`16`	`16`	`const snakeKey = camelToSnake(key);`
`17`	`17`	`acc[snakeKey] = transformKeysToSnakeCase(data[key]);`
	`18`	`+`
`18`	`19`	`return acc;`
`19`	`20`	`}, {});`
`20`	`21`	`}`