Modify Auth Logic

src/main/java/org/swmaestro/repl/gifthub/auth/config/AuthConfig.java

@@ -12,4 +12,5 @@
 @Setter
 public class AuthConfig {
 	private String defaultNickname;
+	private String defaultPassword;
 }

src/main/java/org/swmaestro/repl/gifthub/auth/controller/AuthController.java

@@ -9,7 +9,6 @@
 import org.swmaestro.repl.gifthub.auth.dto.JwtTokenDto;
 import org.swmaestro.repl.gifthub.auth.dto.OAuthTokenDto;
 import org.swmaestro.repl.gifthub.auth.dto.SignInDto;
-import org.swmaestro.repl.gifthub.auth.dto.SignOutDto;
 import org.swmaestro.repl.gifthub.auth.dto.SignUpDto;
 import org.swmaestro.repl.gifthub.auth.service.AuthService;
 import org.swmaestro.repl.gifthub.auth.service.RefreshTokenService;
@@ -162,13 +161,12 @@ public ResponseEntity<Message> appleSignIn(HttpServletRequest request, @RequestB
 			@ApiResponse(responseCode = "200", description = "로그인 성공"),
 			@ApiResponse(responseCode = "400(401)", description = "존재하지 않는 사용자")
 	})
-	public ResponseEntity<Message> signOut(HttpServletRequest request, @RequestBody SignOutDto signOutDto) {
+	public ResponseEntity<Message> signOut(HttpServletRequest request) {
 		String username = jwtProvider.getUsername(jwtProvider.resolveToken(request).substring(7));
-		authService.signOut(username, signOutDto);
+		authService.signOut(username);
 		return ResponseEntity.ok(
 				SuccessMessage.builder()
 						.path(request.getRequestURI())
-						.data(null)
 						.build());
 	}
 }

src/main/java/org/swmaestro/repl/gifthub/auth/service/AuthService.java

@@ -7,7 +7,6 @@
 import org.swmaestro.repl.gifthub.auth.dto.OAuthTokenDto;
 import org.swmaestro.repl.gifthub.auth.dto.OAuthUserInfoDto;
 import org.swmaestro.repl.gifthub.auth.dto.SignInDto;
-import org.swmaestro.repl.gifthub.auth.dto.SignOutDto;
 import org.swmaestro.repl.gifthub.auth.dto.SignUpDto;
 import org.swmaestro.repl.gifthub.auth.entity.Member;
 import org.swmaestro.repl.gifthub.auth.entity.OAuth;
@@ -91,6 +90,7 @@ public JwtTokenDto signIn(OAuthTokenDto oAuthTokenDto, OAuthPlatform platform) {
 			Member newMember = Member.builder()
 					.username(memberService.generateOAuthUsername())
 					.nickname(authConfig.getDefaultNickname())
+					.password(passwordEncoder.encode(authConfig.getDefaultPassword()))
 					.build();
 			// 회원 정보 저장
 			Member member = memberService.create(newMember);
@@ -115,21 +115,22 @@ private JwtTokenDto generateJwtTokenDto(Member member) {
 				.refreshToken(refreshToken)
 				.build();
 
+		refreshTokenService.storeRefreshToken(jwtTokenDto, member.getUsername());
+
 		return jwtTokenDto;
 	}
 
 	/**
 	 * 로그아웃
 	 * @param username
-	 * @param signOutDto
 	 */
 	@Transactional
-	public void signOut(String username, SignOutDto signOutDto) {
+	public void signOut(String username) {
 		Member member = memberRepository.findByUsername(username);
+		System.out.println("member = " + member.getUsername());
 		if (member == null) {
 			throw new BusinessException("존재하지 않는 사용자입니다.", StatusEnum.UNAUTHORIZED);
 		}
 		refreshTokenService.deleteRefreshToken(username);
-		deviceTokenService.delete(signOutDto.getDeviceToken());
 	}
 }

src/main/java/org/swmaestro/repl/gifthub/auth/service/KakaoService.java

@@ -129,6 +129,6 @@ public boolean isExists(OAuthUserInfoDto oAuthUserInfoDto) {
 
 	private String getStringOrNull(JsonElement element, String fieldName) {
 		JsonElement fieldElement = element.getAsJsonObject().get(fieldName);
-		return !fieldElement.isJsonNull() ? fieldElement.getAsString() : null;
+		return fieldElement != null ? fieldElement.getAsString() : null;
 	}
 }