Skip to content

Commit 527e883

Browse files
authored
๐Ÿ”ง chore : ADMIN_USERNAME์€ DB์—์„œ ์กฐํšŒํ•˜๋„๋ก ์ˆ˜์ •
๐Ÿ”ง chore : ADMIN_USERNAME์€ DB์—์„œ ์กฐํšŒํ•˜๋„๋ก ์ˆ˜์ •
2 parents f1b12c3 + d15c661 commit 527e883

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

โ€Ž.github/workflows/CI_CD.ymlโ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ jobs:
8686
--env ORACLE_USERNAME=${{ secrets.ORACLE_USERNAME }} \
8787
--env ORACLE_PASSWORD=${{ secrets.ORACLE_PASSWORD }} \
8888
--env JWT_SECRET=${{ secrets.JWT_SECRET }} \
89-
--env ADMIN_USERNAME=${{ secrets.ADMIN_USERNAME }} \
9089
--env 'ADMIN_PASSWORD=${{ secrets.ADMIN_PASSWORD }}' \
9190
--env SERVER_URL=${{ secrets.SERVER_URL }} \
9291
--env IMAGE_PATH=${{ secrets.IMAGE_PATH }} \

โ€Žsrc/main/java/com/example/ingle/domain/member/repository/MemberRepository.javaโ€Ž

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.example.ingle.domain.member.enums.Role;
55
import org.springframework.data.jpa.repository.JpaRepository;
66
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
7+
import org.springframework.data.jpa.repository.Query;
78

89
import java.util.Optional;
910

@@ -14,4 +15,11 @@ public interface MemberRepository extends JpaRepository<Member, Long>, JpaSpecif
1415
boolean existsByStudentId(String studentId);
1516

1617
long countByRole(Role role);
18+
19+
@Query("""
20+
SELECT m.studentId
21+
FROM Member m
22+
WHERE m.nickname = :nickname
23+
""")
24+
String findStudentIdByNickname(String nickname);
1725
}

โ€Žsrc/main/java/com/example/ingle/domain/member/service/AuthService.javaโ€Ž

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ public class AuthService {
3939
private final MemberQueryService memberQueryService;
4040
private final BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
4141

42-
@Value("${admin.username}")
43-
private String adminId;
44-
4542
@Value("${admin.password}")
4643
private String adminPasswordHash;
4744

@@ -116,7 +113,7 @@ private void validateMember(MemberInfoRequest memberInfoRequest) {
116113
}
117114

118115
private void verifySchoolLogin(LoginRequest loginRequest) {
119-
if (Objects.equals(loginRequest.studentId(), adminId)
116+
if (Objects.equals(loginRequest.studentId(), memberQueryService.getAdminStudentIdByNickname())
120117
&& bCryptPasswordEncoder.matches(loginRequest.password(), adminPasswordHash)) {
121118
log.info("๊ด€๋ฆฌ์ž ๋กœ๊ทธ์ธ ๋ฐœ์ƒ");
122119
}

โ€Žsrc/main/java/com/example/ingle/domain/member/service/MemberQueryService.javaโ€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,8 @@ protected Member getMemberByStudentId(String studentId) {
2222
return new CustomException(ErrorCode.MEMBER_NOT_FOUND);
2323
});
2424
}
25+
26+
protected String getAdminStudentIdByNickname() {
27+
return memberRepository.findStudentIdByNickname("admin");
28+
}
2529
}

โ€Žsrc/main/resources/application-prod.ymlโ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ jwt:
4747
secret: ${JWT_SECRET}
4848

4949
admin:
50-
username: ${ADMIN_USERNAME}
5150
password: ${ADMIN_PASSWORD}
5251

5352
server:

0 commit comments

Comments
ย (0)