From 77b7bf8ab20e088901b7f3c38d510bc159623233 Mon Sep 17 00:00:00 2001 From: tone Date: Thu, 18 Dec 2025 12:16:09 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4userSession?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8F=8A=E5=AE=9E=E4=BD=93=E8=87=B3Auth?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/backend/src/admin/admin.module.ts | 2 ++ apps/backend/src/auth/auth.controller.ts | 4 ++-- apps/backend/src/auth/auth.module.ts | 10 ++++++---- apps/backend/src/auth/auth.service.ts | 3 +-- .../entities => auth/entity}/user-session.entity.ts | 0 apps/backend/src/auth/guards/auth.guard.ts | 2 +- .../services => auth/service}/user-session.service.ts | 2 +- apps/backend/src/user/user.module.ts | 10 ++++------ 8 files changed, 17 insertions(+), 16 deletions(-) rename apps/backend/src/{user/entities => auth/entity}/user-session.entity.ts (100%) rename apps/backend/src/{user/services => auth/service}/user-session.service.ts (93%) diff --git a/apps/backend/src/admin/admin.module.ts b/apps/backend/src/admin/admin.module.ts index d1a1d28..adc9b9e 100644 --- a/apps/backend/src/admin/admin.module.ts +++ b/apps/backend/src/admin/admin.module.ts @@ -8,6 +8,7 @@ import { AdminWebResourceController } from './controller/web/admin-web-resource. import { AdminWebBlogController } from './controller/web/admin-web-blog.controller'; import { ResourceModule } from 'src/resource/resource.module'; import { BlogModule } from 'src/blog/blog.module'; +import { AuthModule } from 'src/auth/auth.module'; @Module({ imports: [ @@ -15,6 +16,7 @@ import { BlogModule } from 'src/blog/blog.module'; UserModule, ResourceModule, BlogModule, + AuthModule, ], controllers: [ AdminController, diff --git a/apps/backend/src/auth/auth.controller.ts b/apps/backend/src/auth/auth.controller.ts index e8f69ec..7616a45 100644 --- a/apps/backend/src/auth/auth.controller.ts +++ b/apps/backend/src/auth/auth.controller.ts @@ -10,14 +10,14 @@ import { } from '@nestjs/common'; import { LoginByPasswordDto } from './dto/login.dto'; import { AuthService } from './auth.service'; -import { UserSessionService } from 'src/user/services/user-session.service'; +import { UserSessionService } from 'src/auth/service/user-session.service'; import { Throttle, ThrottlerGuard } from '@nestjs/throttler'; import { Response } from 'express'; import { UserService } from 'src/user/user.service'; import { AuthGuard } from './guards/auth.guard'; import { SmsLoginDto } from './dto/sms-login.dto'; import { SmsService } from 'src/sms/sms.service'; -import { UserSession } from 'src/user/entities/user-session.entity'; +import { UserSession } from 'src/auth/entity/user-session.entity'; @Controller('auth') export class AuthController { diff --git a/apps/backend/src/auth/auth.module.ts b/apps/backend/src/auth/auth.module.ts index d2f8fae..71cc256 100644 --- a/apps/backend/src/auth/auth.module.ts +++ b/apps/backend/src/auth/auth.module.ts @@ -3,23 +3,25 @@ import { AuthController } from './auth.controller'; import { AuthService } from './auth.service'; import { UserModule } from 'src/user/user.module'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { UserSession } from 'src/user/entities/user-session.entity'; +import { UserSession } from 'src/auth/entity/user-session.entity'; import { ConfigModule } from '@nestjs/config'; import { VerificationModule } from 'src/verification/verification.module'; import { AuthGuard } from './guards/auth.guard'; import { OptionalAuthGuard } from './guards/optional-auth.guard'; import { SmsModule } from 'src/sms/sms.module'; +import { PasskeyCredential } from './entity/passkey-credential.entity'; +import { UserSessionService } from './service/user-session.service'; @Module({ imports: [ ConfigModule, forwardRef(() => UserModule), - TypeOrmModule.forFeature([UserSession]), + TypeOrmModule.forFeature([UserSession, PasskeyCredential]), VerificationModule, SmsModule, ], controllers: [AuthController], - providers: [AuthService, AuthGuard, OptionalAuthGuard], - exports: [AuthService, AuthGuard, OptionalAuthGuard], + providers: [AuthService, AuthGuard, OptionalAuthGuard, UserSessionService], + exports: [AuthService, AuthGuard, OptionalAuthGuard, UserSessionService], }) export class AuthModule { } diff --git a/apps/backend/src/auth/auth.service.ts b/apps/backend/src/auth/auth.service.ts index a1b3e5d..d30d7ab 100644 --- a/apps/backend/src/auth/auth.service.ts +++ b/apps/backend/src/auth/auth.service.ts @@ -1,8 +1,7 @@ import { createHash } from 'crypto'; import { BadRequestException, Injectable } from '@nestjs/common'; import { UserService } from 'src/user/user.service'; -import { UserSessionService } from 'src/user/services/user-session.service'; -import { VerificationService } from 'src/verification/verification.service'; +import { UserSessionService } from 'src/auth/service/user-session.service'; import { BusinessException } from 'src/common/exceptions/business.exception'; import { ErrorCode } from 'src/common/constants/error-codes'; diff --git a/apps/backend/src/user/entities/user-session.entity.ts b/apps/backend/src/auth/entity/user-session.entity.ts similarity index 100% rename from apps/backend/src/user/entities/user-session.entity.ts rename to apps/backend/src/auth/entity/user-session.entity.ts diff --git a/apps/backend/src/auth/guards/auth.guard.ts b/apps/backend/src/auth/guards/auth.guard.ts index 3ff4336..cef08cb 100644 --- a/apps/backend/src/auth/guards/auth.guard.ts +++ b/apps/backend/src/auth/guards/auth.guard.ts @@ -1,7 +1,7 @@ // auth.guard.ts import { Injectable, CanActivate, ExecutionContext, UnauthorizedException } from '@nestjs/common'; import { Request } from 'express'; -import { UserSessionService } from 'src/user/services/user-session.service'; +import { UserSessionService } from 'src/auth/service/user-session.service'; import { UserService } from 'src/user/user.service'; @Injectable() diff --git a/apps/backend/src/user/services/user-session.service.ts b/apps/backend/src/auth/service/user-session.service.ts similarity index 93% rename from apps/backend/src/user/services/user-session.service.ts rename to apps/backend/src/auth/service/user-session.service.ts index 63f296c..d3cce82 100644 --- a/apps/backend/src/user/services/user-session.service.ts +++ b/apps/backend/src/auth/service/user-session.service.ts @@ -1,6 +1,6 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Injectable } from '@nestjs/common'; -import { UserSession } from '../entities/user-session.entity'; +import { UserSession } from '../entity/user-session.entity'; import { Repository } from 'typeorm'; @Injectable() diff --git a/apps/backend/src/user/user.module.ts b/apps/backend/src/user/user.module.ts index 25cd032..96cf350 100644 --- a/apps/backend/src/user/user.module.ts +++ b/apps/backend/src/user/user.module.ts @@ -3,17 +3,15 @@ import { TypeOrmModule } from '@nestjs/typeorm'; import { User } from './entities/user.entity'; import { UserController } from './user.controller'; import { UserService } from './user.service'; -import { UserSession } from './entities/user-session.entity'; import { AuthModule } from 'src/auth/auth.module'; -import { UserSessionService } from './services/user-session.service'; @Module({ imports: [ - TypeOrmModule.forFeature([User, UserSession]), + TypeOrmModule.forFeature([User]), forwardRef(() => AuthModule), // 解决循环依赖问题 ], controllers: [UserController], - providers: [UserService, UserSessionService], - exports: [UserService, UserSessionService], + providers: [UserService], + exports: [UserService], }) -export class UserModule {} +export class UserModule { }