Skip to content

Commit

Permalink
refactor: 불필요한 코드 및 import 삭제 (#12)
Browse files Browse the repository at this point in the history
  • Loading branch information
kyeong-hyeok committed Aug 14, 2023
1 parent d844375 commit e5af44a
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 43 deletions.
13 changes: 0 additions & 13 deletions src/main/java/com/project/mapdagu/TestController.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
package com.project.mapdagu.domain.auth.controller;

import com.project.mapdagu.common.dto.ResponseDto;
import com.project.mapdagu.domain.auth.dto.request.EmailRequestDto;
import com.project.mapdagu.domain.auth.dto.request.SocialSignUpRequestDto;
import com.project.mapdagu.domain.auth.dto.response.EmailResponseDto;
import com.project.mapdagu.domain.auth.dto.response.SocialSignUpResponseDto;
import com.project.mapdagu.domain.auth.service.AuthService;
import com.project.mapdagu.domain.auth.dto.request.SignUpRequestDto;
import com.project.mapdagu.domain.auth.dto.response.SignUpResponseDto;
import com.project.mapdagu.domain.auth.service.EmailService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@Tag(name = "Auth", description = "Auth API")
@RestController
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

import com.project.mapdagu.common.dto.ResponseDto;
import com.project.mapdagu.domain.auth.dto.request.EmailRequestDto;
import com.project.mapdagu.domain.auth.dto.request.SignUpRequestDto;
import com.project.mapdagu.domain.auth.dto.request.SocialSignUpRequestDto;
import com.project.mapdagu.domain.auth.dto.response.EmailResponseDto;
import com.project.mapdagu.domain.auth.dto.response.SignUpResponseDto;
import com.project.mapdagu.domain.auth.dto.response.SocialSignUpResponseDto;
import com.project.mapdagu.domain.auth.service.AuthService;
import com.project.mapdagu.domain.auth.dto.request.SignUpRequestDto;
import com.project.mapdagu.domain.auth.dto.response.SignUpResponseDto;
import com.project.mapdagu.domain.auth.service.EmailService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.project.mapdagu.domain.auth.dto.response;

import com.project.mapdagu.domain.member.entity.Role;

public record LoginResponseDto(Role role) {
public static LoginResponseDto of(String key){
return new LoginResponseDto(Role.valueOf(key));
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.project.mapdagu.domain.auth.handler;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.project.mapdagu.domain.auth.dto.response.LoginResponse;
import com.project.mapdagu.domain.auth.dto.response.LoginResponseDto;
import com.project.mapdagu.domain.member.repository.MemberRepository;
import com.project.mapdagu.jwt.service.JwtService;
import jakarta.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -36,7 +36,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
response.setContentType("application/json");
UserDetails userDetails = (UserDetails) authentication.getPrincipal();
String role = userDetails.getAuthorities().toString();
response.getWriter().write(objectMapper.writeValueAsString(LoginResponse.of(role.substring(6, role.length()-1))));
response.getWriter().write(objectMapper.writeValueAsString(LoginResponseDto.of(role.substring(6, role.length()-1))));

jwtService.sendAccessAndRefreshToken(response, accessToken, refreshToken);
jwtService.updateRefreshToken(email, refreshToken);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Optional;

import static com.project.mapdagu.error.ErrorCode.*;

@Slf4j
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@

import com.project.mapdagu.domain.member.entity.Member;
import com.project.mapdagu.domain.member.repository.MemberRepository;
import com.project.mapdagu.error.ErrorCode;
import com.project.mapdagu.error.exception.custom.BusinessException;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;

import static com.project.mapdagu.error.ErrorCode.*;
import static com.project.mapdagu.error.ErrorCode.MEMBER_NOT_FOUND;

@Service
@RequiredArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package com.project.mapdagu.domain.oauth2.handler;

import com.project.mapdagu.domain.member.entity.Role;
import com.project.mapdagu.domain.member.repository.MemberRepository;
import com.project.mapdagu.domain.oauth2.CustomOAuth2User;
import com.project.mapdagu.jwt.service.JwtService;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
Expand Down

0 comments on commit e5af44a

Please sign in to comment.