Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fcm 토큰 삭제 기능 추가 #185

Merged
merged 15 commits into from
Nov 29, 2023
Merged

fix: fcm 토큰 삭제 기능 추가 #185

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1b8d7f3
fix: Base64관련 디코딩 코드 변경 -> Base64Url
parksey Nov 29, 2023
0e30719
Merge branch 'develop' of https://github.com/team-moabam/moabam-BE in…
parksey Nov 29, 2023
6e6a449
refactor: 쿠폰 스케쥴 업데이트 및 config 수정
parksey Nov 29, 2023
8639f57
style: 문자열 checkstyle 수정
parksey Nov 29, 2023
109a842
Merge branch 'develop' of https://github.com/team-moabam/moabam-BE in…
parksey Nov 29, 2023
68da68f
fix: 회원 탈퇴시 방 참여에 대한 문제 해결
parksey Nov 29, 2023
3f66fd4
Merge branch 'develop' of https://github.com/team-moabam/moabam-BE in…
parksey Nov 29, 2023
657222b
refactor: config update
parksey Nov 29, 2023
2e07fec
test: 신고 실패에 대한 테스트 코드 변경
parksey Nov 29, 2023
0f11ab8
Merge branch 'develop' of https://github.com/team-moabam/moabam-BE in…
parksey Nov 29, 2023
5ba2fa1
feat: fcm 토큰 제거 기능 추가
parksey Nov 29, 2023
c8f05ef
Merge branch 'develop' of https://github.com/team-moabam/moabam-BE in…
parksey Nov 29, 2023
c3a8f78
style: 필요없는 로그 제거
parksey Nov 29, 2023
fe595cb
Merge branch 'develop' of https://github.com/team-moabam/moabam-BE in…
parksey Nov 29, 2023
a3c859b
fix: 참여자 업데이트
parksey Nov 29, 2023
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
3 changes: 3 additions & 0 deletions src/main/java/com/moabam/api/application/auth/AuthorizationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.moabam.api.dto.auth.AuthorizationTokenResponse;
import com.moabam.api.dto.auth.LoginResponse;
import com.moabam.api.dto.auth.TokenSaveValue;
import com.moabam.api.infrastructure.fcm.FcmService;
import com.moabam.global.auth.model.AuthMember;
import com.moabam.global.auth.model.PublicClaim;
import com.moabam.global.common.util.GlobalConstant;
Expand All @@ -41,6 +42,7 @@
@RequiredArgsConstructor
public class AuthorizationService {

private final FcmService fcmService;
private final OAuthConfig oAuthConfig;
private final TokenConfig tokenConfig;
private final OAuth2AuthorizationServerRequestService oauth2AuthorizationServerRequestService;
Expand Down Expand Up @@ -105,6 +107,7 @@ public void logout(AuthMember authMember, HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse) {
removeToken(httpServletRequest, httpServletResponse);
tokenRepository.delete(authMember.id());
fcmService.deleteTokenByMemberId(authMember.id());
}

public void removeToken(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/moabam/api/application/member/MemberService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.moabam.api.dto.member.MemberInfoResponse;
import com.moabam.api.dto.member.MemberInfoSearchResponse;
import com.moabam.api.dto.member.ModifyMemberRequest;
import com.moabam.api.infrastructure.fcm.FcmService;
import com.moabam.global.auth.model.AuthMember;
import com.moabam.global.common.util.BaseDataCode;
import com.moabam.global.common.util.ClockHolder;
Expand All @@ -41,6 +42,7 @@
@RequiredArgsConstructor
public class MemberService {

private final FcmService fcmService;
private final MemberRepository memberRepository;
private final InventoryRepository inventoryRepository;
private final ItemRepository itemRepository;
Expand Down Expand Up @@ -83,6 +85,7 @@ public void delete(Member member) {
member.delete(clockHolder.times());
memberRepository.flush();
memberRepository.delete(member);
fcmService.deleteTokenByMemberId(member.getId());
}

public MemberInfoResponse searchInfo(AuthMember authMember, Long memberId) {
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/com/moabam/api/infrastructure/fcm/FcmService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
import com.google.firebase.messaging.Notification;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

@Slf4j
@Service
@RequiredArgsConstructor
public class FcmService {
Expand All @@ -24,9 +22,7 @@ public void createToken(String fcmToken, Long memberId) {
return;
}

log.info("FCM TOKEN before: " + fcmToken);
fcmRepository.saveToken(fcmToken, memberId);
log.info("FCM TOKEN after: " + findTokenByMemberId(memberId));
}

public void deleteTokenByMemberId(Long memberId) {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/moabam/global/auth/filter/AuthorizationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ protected void doFilterInternal(@NotNull HttpServletRequest httpServletRequest,
try {
invoke(httpServletRequest, httpServletResponse);
} catch (UnauthorizedException unauthorizedException) {
log.error("Login Failed");
authorizationService.removeToken(httpServletRequest, httpServletResponse);
handlerExceptionResolver.resolveException(httpServletRequest, httpServletResponse, null,
unauthorizedException);
Expand Down
6 changes: 5 additions & 1 deletion src/test/java/com/moabam/api/application/auth/AuthorizationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import com.moabam.api.dto.auth.AuthorizationTokenRequest;
import com.moabam.api.dto.auth.AuthorizationTokenResponse;
import com.moabam.api.dto.auth.LoginResponse;
import com.moabam.api.infrastructure.fcm.FcmService;
import com.moabam.global.auth.model.AuthMember;
import com.moabam.global.auth.model.PublicClaim;
import com.moabam.global.common.util.cookie.CookieDevUtils;
Expand Down Expand Up @@ -66,6 +67,9 @@ class AuthorizationServiceTest {
@Mock
JwtProviderService jwtProviderService;

@Mock
FcmService fcmService;

@Mock
TokenRepository tokenRepository;

Expand Down Expand Up @@ -93,7 +97,7 @@ public void initParams() {
noOAuthConfig = new OAuthConfig(
new OAuthConfig.Provider(null, null, null, null, null),
new OAuthConfig.Client(null, null, null, null, null, null));
noPropertyService = new AuthorizationService(noOAuthConfig, tokenConfig,
noPropertyService = new AuthorizationService(fcmService, noOAuthConfig, tokenConfig,
oAuth2AuthorizationServerRequestService, memberService, jwtProviderService, tokenRepository, cookieUtils);
}

Expand Down
4 changes: 4 additions & 0 deletions src/test/java/com/moabam/api/application/member/MemberServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.moabam.api.dto.member.MemberInfo;
import com.moabam.api.dto.member.MemberInfoResponse;
import com.moabam.api.dto.member.ModifyMemberRequest;
import com.moabam.api.infrastructure.fcm.FcmService;
import com.moabam.global.auth.model.AuthMember;
import com.moabam.global.common.util.ClockHolder;
import com.moabam.global.error.exception.BadRequestException;
Expand Down Expand Up @@ -68,6 +69,9 @@ class MemberServiceTest {
@Mock
InventoryRepository inventoryRepository;

@Mock
FcmService fcmService;

@Mock
ItemRepository itemRepository;

Expand Down