Skip to content

Commit 55836ab

Browse files
committed
refactor : 패키지 구조 정리 및 리프레시토큰 삭제 (#988)
1 parent 20262e4 commit 55836ab

8 files changed

Lines changed: 40 additions & 42 deletions

File tree

Clubber-Internal/src/main/java/com/clubber/domain/admin/controller/AdminAuthController.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

Clubber-Internal/src/main/java/com/clubber/domain/admin/dto/InternalTokenResponse.java

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.clubber.domain.internaladmin.controller;
2+
3+
import com.clubber.domain.internaladmin.dto.InternalAdminLoginRequest;
4+
import com.clubber.domain.internaladmin.dto.InternalAdminTokenResponse;
5+
import com.clubber.domain.internaladmin.service.InternalAdminAuthService;
6+
import lombok.RequiredArgsConstructor;
7+
import org.springframework.web.bind.annotation.*;
8+
9+
@RestController
10+
@RequiredArgsConstructor
11+
@RequestMapping("/internal/auth")
12+
public class AdminAuthController {
13+
14+
private final InternalAdminAuthService internalAdminAuthService;
15+
16+
@PostMapping("/login")
17+
public InternalAdminTokenResponse login(@RequestBody InternalAdminLoginRequest request) {
18+
return internalAdminAuthService.login(request);
19+
}
20+
}

Clubber-Internal/src/main/java/com/clubber/domain/internal/domain/InternalAdmin.java renamed to Clubber-Internal/src/main/java/com/clubber/domain/internaladmin/domain/InternalAdmin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.clubber.domain.internal.domain;
1+
package com.clubber.domain.internaladmin.domain;
22

33
import jakarta.persistence.Entity;
44
import jakarta.persistence.GeneratedValue;

Clubber-Internal/src/main/java/com/clubber/domain/admin/dto/InternalAdminLoginRequest.java renamed to Clubber-Internal/src/main/java/com/clubber/domain/internaladmin/dto/InternalAdminLoginRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.clubber.domain.admin.dto;
1+
package com.clubber.domain.internaladmin.dto;
22

33
public record InternalAdminLoginRequest(
44
String username,
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.clubber.domain.internaladmin.dto;
2+
3+
public record InternalAdminTokenResponse(
4+
String accessToken
5+
) {
6+
}

Clubber-Internal/src/main/java/com/clubber/domain/internal/repository/InternalAdminRepository.java renamed to Clubber-Internal/src/main/java/com/clubber/domain/internaladmin/repository/InternalAdminRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.clubber.domain.internal.repository;
1+
package com.clubber.domain.internaladmin.repository;
22

3-
import com.clubber.domain.internal.domain.InternalAdmin;
3+
import com.clubber.domain.internaladmin.domain.InternalAdmin;
44
import org.springframework.data.jpa.repository.JpaRepository;
55

66
public interface InternalAdminRepository extends JpaRepository<InternalAdmin, Long> {

Clubber-Internal/src/main/java/com/clubber/domain/admin/service/AdminAuthService.java renamed to Clubber-Internal/src/main/java/com/clubber/domain/internaladmin/service/InternalAdminAuthService.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
package com.clubber.domain.admin.service;
1+
package com.clubber.domain.internaladmin.service;
22

3-
import com.clubber.domain.admin.dto.InternalAdminLoginRequest;
4-
import com.clubber.domain.admin.dto.InternalTokenResponse;
5-
import com.clubber.domain.internal.domain.InternalAdmin;
6-
import com.clubber.domain.internal.repository.InternalAdminRepository;
3+
import com.clubber.domain.internaladmin.dto.InternalAdminLoginRequest;
4+
import com.clubber.domain.internaladmin.dto.InternalAdminTokenResponse;
5+
import com.clubber.domain.domains.admin.exception.AdminLoginFailedException;
6+
import com.clubber.domain.internaladmin.domain.InternalAdmin;
7+
import com.clubber.domain.internaladmin.repository.InternalAdminRepository;
78
import com.clubber.global.jwt.AccountRole;
89
import com.clubber.global.jwt.JwtTokenUtil;
910
import lombok.RequiredArgsConstructor;
@@ -12,20 +13,18 @@
1213

1314
@Service
1415
@RequiredArgsConstructor
15-
public class AdminAuthService {
16+
public class InternalAdminAuthService {
1617
private final PasswordEncoder encoder;
1718
private final InternalAdminRepository internalAdminRepository;
1819
private final JwtTokenUtil jwtTokenUtil;
1920

20-
public InternalTokenResponse login(InternalAdminLoginRequest request) {
21+
public InternalAdminTokenResponse login(InternalAdminLoginRequest request) {
2122
InternalAdmin internalAdmin = internalAdminRepository.findByUsername(request.username());
2223
String password = internalAdmin.getPassword();
2324
if (!encoder.matches(request.password(), password)) {
24-
throw new RuntimeException("로그인 오류");
25+
throw AdminLoginFailedException.EXCEPTION;
2526
}
2627
String accessToken = jwtTokenUtil.generateAccessToken(internalAdmin.getId(), AccountRole.SUPER_ADMIN);
27-
String refreshToken = jwtTokenUtil.generateRefreshToken(internalAdmin.getId());
28-
return new InternalTokenResponse(accessToken, refreshToken);
28+
return new InternalAdminTokenResponse(accessToken);
2929
}
30-
3130
}

0 commit comments

Comments
 (0)