Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import com.tiki.server.common.dto.SuccessResponse;
import com.tiki.server.common.support.UriGenerator;
import jakarta.servlet.http.HttpServletRequest;
import lombok.val;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

Expand All @@ -27,15 +26,15 @@ public class AuthController implements AuthControllerDocs {
@Override
@PostMapping("/sign-in")
public ResponseEntity<SuccessResponse<SignInGetResponse>> signIn(@RequestBody SignInRequest request) {
val response = authService.signIn(request);
SignInGetResponse response = authService.signIn(request);
return ResponseEntity.created(UriGenerator.getUri("/"))
.body(SuccessResponse.success(SUCCESS_SIGN_IN.getMessage(), response));
}

@Override
@GetMapping("/reissue")
public ResponseEntity<SuccessResponse<ReissueGetResponse>> reissue(HttpServletRequest httpServletRequest) {
val response = authService.reissueToken(httpServletRequest);
ReissueGetResponse response = authService.reissueToken(httpServletRequest);
return ResponseEntity.created(UriGenerator.getUri("/"))
.body(SuccessResponse.success(SUCCESS_REISSUE_ACCESS_TOKEN.getMessage(), response));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.stereotype.Component;

import java.io.IOException;
import java.io.PrintWriter;

@Slf4j
@Component
Expand All @@ -38,7 +38,7 @@ private void setResponse(HttpServletResponse response) throws IOException {
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
response.setCharacterEncoding("UTF-8");
response.setStatus(HttpStatus.UNAUTHORIZED.value());
val writer = response.getWriter();
PrintWriter writer = response.getWriter();
writer.write(objectMapper.writeValueAsString(
ErrorCodeResponse.of(UNAUTHENTICATED.getCode(), UNAUTHENTICATED.getMessage())));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;

import java.io.IOException;
import java.io.PrintWriter;

@Slf4j
@Component
Expand Down Expand Up @@ -48,7 +48,7 @@ private void setResponse(HttpServletResponse response, ErrorCode errorCode)
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
response.setCharacterEncoding("UTF-8");
response.setStatus(errorCode.getHttpStatus().value());
val writer = response.getWriter();
PrintWriter writer = response.getWriter();
writer.write(objectMapper.writeValueAsString(ErrorCodeResponse.of(errorCode.getCode(), errorCode.getMessage())));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
import org.springframework.stereotype.Component;
Expand All @@ -33,7 +32,7 @@ protected void doFilterInternal(
@NonNull HttpServletResponse response,
@NonNull FilterChain filterChain
) throws IOException, ServletException {
val token = jwtProvider.getTokenFromRequest(request);
String token = jwtProvider.getTokenFromRequest(request);
if (StringUtils.hasText(token)) {
jwtValidator.validateToken(token);
setAuthenticationContextHolder(jwtProvider.getUserFromJwt((token)), request);
Expand All @@ -42,7 +41,7 @@ protected void doFilterInternal(
}

private void setAuthenticationContextHolder(long memberId, HttpServletRequest request) {
val authentication = new UserAuthentication(memberId, null, null);
UserAuthentication authentication = new UserAuthentication(memberId, null, null);
authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
SecurityContextHolder.getContext().setAuthentication(authentication);
}
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/tiki/server/auth/jwt/JwtGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import lombok.RequiredArgsConstructor;
import lombok.val;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Component;
Expand Down Expand Up @@ -49,13 +48,13 @@ public String generateRefreshToken(Authentication authentication) {
}

private Claims generateClaims(Authentication authentication) {
val claims = Jwts.claims();
Claims claims = Jwts.claims();
claims.put("memberId", authentication.getPrincipal());
return claims;
}

private SecretKey getSigningKey() {
val encodedKey = getEncoder().encodeToString(secretKey.getBytes());
String encodedKey = getEncoder().encodeToString(secretKey.getBytes());
return hmacShaKeyFor(encodedKey.getBytes());
}
}
7 changes: 3 additions & 4 deletions src/main/java/com/tiki/server/auth/jwt/JwtProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import io.jsonwebtoken.Jwts;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.val;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
Expand All @@ -23,15 +22,15 @@ public class JwtProvider {
private String secretKey;

public String getTokenFromRequest(HttpServletRequest request) {
val accessToken = request.getHeader(Constants.AUTHORIZATION);
String accessToken = request.getHeader(Constants.AUTHORIZATION);
if (!StringUtils.hasText(accessToken) || !accessToken.startsWith(Constants.BEARER)) {
return null;
}
return accessToken.substring(Constants.BEARER.length());
}

public long getUserFromJwt(String token) {
val claims = getBodyFromJwt(token);
Claims claims = getBodyFromJwt(token);
return Long.parseLong(claims.get("memberId").toString());
}

Expand All @@ -44,7 +43,7 @@ public Claims getBodyFromJwt(final String token) {
}

private SecretKey getSigningKey() {
val encodedKey = getEncoder().encodeToString(secretKey.getBytes());
String encodedKey = getEncoder().encodeToString(secretKey.getBytes());
return hmacShaKeyFor(encodedKey.getBytes());
}
}
19 changes: 9 additions & 10 deletions src/main/java/com/tiki/server/auth/service/AuthService.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.tiki.server.auth.jwt.UserAuthentication;

import lombok.RequiredArgsConstructor;
import lombok.val;
import org.thymeleaf.util.StringUtils;

import static com.tiki.server.auth.message.ErrorCode.EMPTY_JWT;
Expand All @@ -44,23 +43,23 @@ public class AuthService {
private final PasswordEncoder passwordEncoder;

public SignInGetResponse signIn(SignInRequest request) {
val member = checkMemberEmpty(request);
Member member = checkMemberEmpty(request);
checkPasswordMatching(member, request.password());
val authentication = createAuthentication(member.getId());
val accessToken = jwtGenerator.generateAccessToken(authentication);
val refreshToken = jwtGenerator.generateRefreshToken(authentication);
Authentication authentication = createAuthentication(member.getId());
String accessToken = jwtGenerator.generateAccessToken(authentication);
String refreshToken = jwtGenerator.generateRefreshToken(authentication);
tokenSaver.save(Token.of(member.getId(), refreshToken));
return SignInGetResponse.from(accessToken, refreshToken);
}

public ReissueGetResponse reissueToken(HttpServletRequest request) {
val refreshToken = jwtProvider.getTokenFromRequest(request);
String refreshToken = jwtProvider.getTokenFromRequest(request);
checkTokenEmpty(refreshToken);
val memberId = jwtProvider.getUserFromJwt(refreshToken);
val token = tokenFinder.findById(memberId);
long memberId = jwtProvider.getUserFromJwt(refreshToken);
Token token = tokenFinder.findById(memberId);
checkRefreshToken(refreshToken, token);
val authentication = createAuthentication(memberId);
val accessToken = jwtGenerator.generateAccessToken(authentication);
Authentication authentication = createAuthentication(memberId);
String accessToken = jwtGenerator.generateAccessToken(authentication);
return ReissueGetResponse.from(accessToken);
}

Expand Down
10 changes: 4 additions & 6 deletions src/main/java/com/tiki/server/common/config/CorsConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,24 @@
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;

import lombok.val;

@Configuration
public class CorsConfig {

@Bean
public CorsFilter corsFilter() {
val source = setUrlBasedCorsConfigurationSource();
UrlBasedCorsConfigurationSource source = setUrlBasedCorsConfigurationSource();
return new CorsFilter(source);
}

private UrlBasedCorsConfigurationSource setUrlBasedCorsConfigurationSource() {
val source = new UrlBasedCorsConfigurationSource();
val config = setCorsConfiguration();
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
CorsConfiguration config = setCorsConfiguration();
source.registerCorsConfiguration("/**", config);
return source;
}

private CorsConfiguration setCorsConfiguration() {
val config = new CorsConfiguration();
CorsConfiguration config = new CorsConfiguration();
config.setAllowCredentials(true);
config.addAllowedOrigin(("https://ti-kii.com"));
config.addAllowedOrigin("http://localhost:5173");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import com.tiki.server.document.service.DocumentService;

import lombok.RequiredArgsConstructor;
import lombok.val;

@RestController
@RequiredArgsConstructor
Expand All @@ -34,8 +33,8 @@ public ResponseEntity<SuccessResponse<DocumentsGetResponse>> getAllDocuments(
@PathVariable long teamId,
@RequestParam String type
) {
val memberId = Long.parseLong(principal.getName());
val response = documentService.getAllDocuments(memberId, teamId, type);
long memberId = Long.parseLong(principal.getName());
DocumentsGetResponse response = documentService.getAllDocuments(memberId, teamId, type);
return ResponseEntity.ok(SuccessResponse.success(SUCCESS_GET_DOCUMENTS.getMessage(), response));
}

Expand All @@ -46,7 +45,7 @@ public ResponseEntity<?> deleteDocument(
@PathVariable long teamId,
@PathVariable long documentId
) {
val memberId = Long.parseLong(principal.getName());
long memberId = Long.parseLong(principal.getName());
documentService.deleteDocument(memberId, teamId, documentId);
return ResponseEntity.noContent().build();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import com.tiki.server.external.util.S3Service;

import lombok.RequiredArgsConstructor;
import lombok.val;

@RestController
@RequiredArgsConstructor
Expand All @@ -32,7 +31,7 @@ public class S3Controller implements S3ControllerDocs {
@Override
@GetMapping("/upload")
public ResponseEntity<SuccessResponse<PreSignedUrlResponse>> getPreSignedUrl(@RequestParam String fileFormat) {
val response = s3Service.getUploadPreSignedUrl(fileFormat);
PreSignedUrlResponse response = s3Service.getUploadPreSignedUrl(fileFormat);
return ResponseEntity.ok(success(PRESIGNED_URL_GET_SUCCESS.getMessage(), response));
}

Expand Down
Loading
Loading