AndriDiki/smartproc-be
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix authentication

Browse Source
This commit is contained in:
dirgantarasiahaan
2023-05-25 14:54:43 +07:00
parent d50b2a8eef
commit c833f09200
8 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java
View File

@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@Service
@ -65,7 +66,7 @@ public class LoginService implements BaseService<LoginRequest, LoginResponse> {
.username(userRoleView.getUsername())
.nama(userRoleView.getNama())
.role(userRoleView.getRole())
.accessMenu(null)
.accessMenu(new HashSet<>())
.build();
Map<String, Object> claims = new HashMap<>();

4
src/main/java/com/iconplus/smartproc/service/authentication/PostCheckAccessTokenService.java
View File

@ -27,7 +27,7 @@ public class PostCheckAccessTokenService implements BaseService<PostAccessTokenR
public PostAccessTokenResponse execute(PostAccessTokenRequest input) {
var decodeToken = TokenUtils.decodeToken(input.getAccessToken());
String userId = decodeToken.get("user_id");
Long userId = Long.valueOf(decodeToken.get("user_id"));
List<TokenManagementView> tokenManagementViews = tokenManagementRepository.findAccessTokenByUserIdAndDeletedFalse(userId);
if (tokenManagementViews.isEmpty()) {
@ -38,7 +38,7 @@ public class PostCheckAccessTokenService implements BaseService<PostAccessTokenR
}
List<String> userTokenList = tokenManagementViews.stream()
.map(c-> CommonUtil.clobToString(c.getAccessToken()))
.map(TokenManagementView::getAccessToken)
.collect(Collectors.toList());
boolean isMatch = userTokenList.stream().anyMatch(s -> s.equals(input.getAccessToken()));

3
src/main/java/com/iconplus/smartproc/service/authentication/TokenManagementService.java
View File

@ -17,6 +17,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashSet;
import java.util.Objects;
@Service
@ -72,7 +73,7 @@ public class TokenManagementService implements BaseService<RefreshTokenRequest,
.username(userRoleView.getUsername())
.nama(userRoleView.getNama())
.role(userRoleView.getRole())
.accessMenu(null)
.accessMenu(new HashSet<>())
.build();
final String accessToken = jwtTokenUtil.generateToken(String.valueOf(userRoleView.getId()), tokenContent, accessTokenExp * 60000);