diff --git a/src/auth/auth.controller.ts b/src/auth/auth.controller.ts
index 546d320..3bc1617 100644
--- a/src/auth/auth.controller.ts
+++ b/src/auth/auth.controller.ts
@@ -9,20 +9,17 @@ import { LocalAuthGuard } from './guards/local.auth.guard'
 export class AuthController {
   constructor(private authService: AuthService) {}
 
+  //local.strategy의 validate에서 true인경우 넘어옴
   @UseGuards(LocalAuthGuard)
-  //local.strategy의 validate에서 Login처리후 넘어옴
-  //결과오류시 NotFoundError: No User found라고 console log에 출력됨
   @Post('login')
   async login(@Request() req) {
     return await this.authService.login(req.user)
   }
 
-  //사용자정보 AccesToken 확인용
+  //jwt.strategy의 validate에서 true인경우 넘어옴
   @UseGuards(JwtAuthGuard)
-  //jwt.strategy의 validate에서 token확인후 넘어옴
   @Get('profile')
   async getProfile(@Request() req) {
-    //console.log(req)
     return req.user
   }
 
diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
index 485ba4b..d3bae1c 100644
--- a/src/auth/auth.service.ts
+++ b/src/auth/auth.service.ts
@@ -1,7 +1,7 @@
 /* eslint-disable prettier/prettier */
 import { Injectable, UnauthorizedException } from '@nestjs/common'
 import { JwtService } from '@nestjs/jwt'
-import { User } from '@prisma/client'
+import { Prisma, User } from '@prisma/client'
 import { UserDTO } from 'src/user/dtos/user.dto'
 import { UserService } from '../user/user.service'
 import { jwtConstants } from './guards/jwt.constants'
@@ -23,33 +23,25 @@ export class AuthService {
     //   })
     return password
   }
-  //app.controller.ts에서 @UseGuards(AuthGuard('local'))용
-  async validateUser(email: string, password: string): Promise<any> {
-    const user = await this.userService
-      .fetchOne({ email: email })
-      .catch((error) => {
-        throw new UnauthorizedException('사용자를 찾을 수 없습니다.' + error)
-      })
-    const encryptedPassword = await this.getEcryptedPassword(password)
-    if (user && user.password === encryptedPassword) {
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const { password, ...result } = user
-      return result
-    } else {
-      throw new UnauthorizedException('암호가 맞지 않습니다.')
+  //app.controller.ts에서 AuthGuard('local') 또는 AuthGuard('jwt')용
+  async validateUser(where: Prisma.UserWhereInput): Promise<any> {
+    try {
+      await this.userService.fetchOne(where)
+    } catch (e) {
+      throw new UnauthorizedException('계정 확인이 되지 않습니다.')
     }
   }
 
   async login(user: User): Promise<any> {
-    return await this.getTokens(user)
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { password, ...result } = user
+    return (result['access_token'] = await this.getAccessToken(user))
   }
 
-  async register(data: UserDTO): Promise<User> {
-    const tokens = await this.getTokens(data)
-    data.refresh_token = tokens.refresh_token
+  async register(data: UserDTO): Promise<any> {
+    data.refresh_token = await this.getRefreshToken()
     data.password = await this.getEcryptedPassword(data.password)
-    await this.userService.add(data)
-    return tokens
+    return await this.login(await this.userService.add(data))
   }
 
   //Access Token 재발행
diff --git a/src/auth/guards/jwt.auth.stragy.ts b/src/auth/guards/jwt.auth.stragy.ts
index 9a9bf1f..78ee72c 100644
--- a/src/auth/guards/jwt.auth.stragy.ts
+++ b/src/auth/guards/jwt.auth.stragy.ts
@@ -1,16 +1,17 @@
 import { ExtractJwt, Strategy } from 'passport-jwt'
 import { PassportStrategy } from '@nestjs/passport'
-import { Injectable } from '@nestjs/common'
+import { Injectable, UnauthorizedException } from '@nestjs/common'
 import { jwtConstants } from './jwt.constants'
+import { AuthService } from '../auth.service'
 
-type JwtPayload = {
+type jwtPayloadType = {
   email: string
   name: string
 }
 
 @Injectable()
 export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {
-  constructor() {
+  constructor(private authService: AuthService) {
     super({
       jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
       ignoreExpiration: false,
@@ -18,10 +19,15 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {
     })
   }
 
-  async validate(payload: JwtPayload) {
-    return {
-      email: payload.email,
-      name: payload.name
+  //AccessToken 인증
+  async validate(payload: jwtPayloadType) {
+    try {
+      return await this.authService.validateUser({
+        email: payload.email,
+        name: payload.name
+      })
+    } catch (e) {
+      throw new UnauthorizedException(e)
     }
   }
 }
diff --git a/src/auth/guards/local.strategy.ts b/src/auth/guards/local.strategy.ts
index 9e389d5..e48f834 100644
--- a/src/auth/guards/local.strategy.ts
+++ b/src/auth/guards/local.strategy.ts
@@ -1,7 +1,7 @@
 /* eslint-disable prettier/prettier */
 import { Strategy } from 'passport-local'
 import { PassportStrategy } from '@nestjs/passport'
-import { Injectable } from '@nestjs/common'
+import { Injectable, UnauthorizedException } from '@nestjs/common'
 import { AuthService } from '../auth.service'
 
 @Injectable()
@@ -14,6 +14,16 @@ export class LocalStrategy extends PassportStrategy(Strategy) {
 
   //Login인증용
   async validate(email: string, password: string): Promise<any> {
-    return await this.authService.validateUser(email, password)
+    try {
+      const encryptedPassword = await this.authService.getEcryptedPassword(
+        password
+      )
+      return await this.authService.validateUser({
+        email: email,
+        password: encryptedPassword
+      })
+    } catch (e) {
+      throw new UnauthorizedException(e)
+    }
   }
 }