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

temp authentication user

Browse Source
This commit is contained in:
dirgantarasiahaan
2023-05-25 11:55:47 +07:00
parent 77dfe44ee6
commit d50b2a8eef
16 changed files with 368 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/iconplus/smartproc/configuration/JwtTokenUtil.java
View File

@@ -39,11 +39,11 @@ public class JwtTokenUtil implements Serializable {
return expiration.before(new Date());
}
public String generateToken(String username, TokenContent tokenContent, Integer expirationInMs, String channel, String scopeType) {
public String generateToken(String username, TokenContent tokenContent, Integer expirationInMs) {
Map<String, Object> claims = new HashMap<>();
claims.put("authorities", tokenContent.getAccessMenu());
claims.put("fullname", tokenContent.getFullname());
claims.put("nama", tokenContent.getNama());
claims.put("username", tokenContent.getUsername());
claims.put("user_id", tokenContent.getUserId());
claims.put("role", tokenContent.getRole());

35
src/main/java/com/iconplus/smartproc/controller/AuthenticationController.java Normal file
View File

@@ -0,0 +1,35 @@
package com.iconplus.smartproc.controller;
import com.iconplus.smartproc.model.request.LoginRequest;
import com.iconplus.smartproc.model.request.RefreshTokenRequest;
import com.iconplus.smartproc.model.response.LoginResponse;
import com.iconplus.smartproc.model.response.RefreshTokenResponse;
import com.iconplus.smartproc.service.authentication.LoginService;
import com.iconplus.smartproc.service.authentication.TokenManagementService;
import org.springframework.web.bind.annotation.*;
@CrossOrigin(origins = "http://localhost:8080", allowCredentials = "true")
@RestController
@RequestMapping("/api/authentication")
public class AuthenticationController {
private LoginService loginService;
private TokenManagementService tokenManagementService;
public AuthenticationController(LoginService loginService,
TokenManagementService tokenManagementService) {
this.loginService = loginService;
this.tokenManagementService = tokenManagementService;
}
@PostMapping("/login")
public LoginResponse getLoginResponse(@RequestBody LoginRequest loginRequest) {
return loginService.execute(loginRequest);
}
@PostMapping("/refresh-token")
public RefreshTokenResponse getRefreshToken(@RequestBody RefreshTokenRequest refreshTokenRequest) {
return tokenManagementService.execute(refreshTokenRequest);
}
}

52
src/main/java/com/iconplus/smartproc/model/entity/Menu.java
View File

@@ -1,52 +0,0 @@
package com.iconplus.smartproc.model.entity;
import com.iconplus.smartproc.helper.base.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.GeneratorType;
import org.hibernate.annotations.Type;
import javax.persistence.*;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Entity
@Table(name = "permission")
public class Menu extends BaseEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
private Long id;
@Column(name = "subMenu")
private String subMenu;
@Column(name = "menu")
private String menu;
// @Column(name = "can_view")
// @Type(type = "org.hibernate.type.NumericBooleanType")
// private Boolean canView;
//
// @Column(name = "can_read")
// @Type(type = "org.hibernate.type.NumericBooleanType")
// private Boolean canRead;
//
// @Column(name = "can_create")
// @Type(type = "org.hibernate.type.NumericBooleanType")
// private Boolean canCreate;
//
// @Column(name = "can_delete")
// @Type(type = "org.hibernate.type.NumericBooleanType")
// private Boolean canDelete;
@Column(name = "deleted")
@Type(type = "org.hibernate.type.NumericBooleanType")
private Boolean deleted;
}

45
src/main/java/com/iconplus/smartproc/model/entity/Menus.java Normal file
View File

@@ -0,0 +1,45 @@
package com.iconplus.smartproc.model.entity;
import com.iconplus.smartproc.helper.base.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.GeneratorType;
import org.hibernate.annotations.Type;
import javax.persistence.*;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Entity
@Table(name = "menus")
public class Menus extends BaseEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
private Long id;
@Column(name = "parent_id")
private Long parentId;
@Column(name = "nama")
private String nama;
@Column(name = "link")
private String link;
@Column(name = "urutan")
private Long urutan;
@Column(name = "icon")
private String icon;
@Column(name = "is_delete")
@Type(type = "org.hibernate.type.NumericBooleanType")
private Boolean isDelete;
}

33
src/main/java/com/iconplus/smartproc/model/entity/Permission.java
View File

@@ -8,10 +8,7 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.*;
@Data
@Builder
@@ -21,13 +18,9 @@ import javax.persistence.Table;
public class Permission extends BaseEntity {
@Id
@GeneratedValue(generator = "UUID")
@GenericGenerator(
name = "UUID",
strategy = "org.hibernate.id.UUIDGenerator"
)
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
private String id;
private Long id;
@Column(name = "role_id")
private Long roleId;
@@ -35,7 +28,23 @@ public class Permission extends BaseEntity {
@Column(name = "menu_id")
private Long menuId;
@Column(name = "deleted")
@Column(name = "can_view")
@Type(type = "org.hibernate.type.NumericBooleanType")
private Boolean deleted;
private Boolean canView;
@Column(name = "can_read")
@Type(type = "org.hibernate.type.NumericBooleanType")
private Boolean canRead;
@Column(name = "can_update")
@Type(type = "org.hibernate.type.NumericBooleanType")
private Boolean canUpdate;
@Column(name = "can_delete")
@Type(type = "org.hibernate.type.NumericBooleanType")
private Boolean canDelete;
@Column(name = "is_delete")
@Type(type = "org.hibernate.type.NumericBooleanType")
private Boolean isDelete;
}

2
src/main/java/com/iconplus/smartproc/model/entity/TokenManagement.java
View File

@@ -29,7 +29,7 @@ public class TokenManagement extends BaseEntity {
private String id;
@Column(name = "user_id")
private String userId;
private Long userId;
@Lob
@Column(name = "access_token")

15
src/main/java/com/iconplus/smartproc/model/request/RefreshTokenRequest.java Normal file
View File

@@ -0,0 +1,15 @@
package com.iconplus.smartproc.model.request;
import com.iconplus.smartproc.helper.base.BaseRequest;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class RefreshTokenRequest extends BaseRequest {
private String refreshToken;
}

2
src/main/java/com/iconplus/smartproc/model/response/LoginResponse.java
View File

@@ -15,7 +15,7 @@ import java.util.Set;
public class LoginResponse extends BaseResponse {
private String accessToken;
private String validity;
private Integer validity;
private String refreshToken;
private String username;
private String email;

17
src/main/java/com/iconplus/smartproc/model/response/RefreshTokenResponse.java Normal file
View File

@@ -0,0 +1,17 @@
package com.iconplus.smartproc.model.response;
import com.iconplus.smartproc.helper.base.BaseResponse;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class RefreshTokenResponse extends BaseResponse {
private String accessToken;
private String refreshToken;
private Integer validity;
}

4
src/main/java/com/iconplus/smartproc/model/token/TokenContent.java
View File

@@ -8,9 +8,9 @@ import java.util.Set;
@Builder
@Data
public class TokenContent {
private String userId;
private Long userId;
private String role;
private Set<String> accessMenu;
private String fullname;
private String nama;
private String username;
}

8
src/main/java/com/iconplus/smartproc/repository/TokenManagementRepository.java
View File

@@ -7,6 +7,7 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Optional;
@Repository
public interface TokenManagementRepository extends JpaRepository<TokenManagement, String> {
@@ -16,4 +17,11 @@ public interface TokenManagementRepository extends JpaRepository<TokenManagement
"AND isDelete = false " +
"AND expired_time >= SYSDATE", nativeQuery = true)
List<TokenManagementView> findAccessTokenByUserIdAndDeletedFalse(String userId);
@Query(value = "SELECT tm from TokenManagement tm " +
"WHERE tm.refreshToken = :refreshToken " +
"and tm.isDelete = false")
Optional<TokenManagement> findByRefreshToken(String refreshToken);
Optional<TokenManagement> findByUserId(Long id);
}

22
src/main/java/com/iconplus/smartproc/repository/UsersRepository.java
View File

@@ -44,6 +44,28 @@ public interface UsersRepository extends JpaRepository<Users, Long> {
Optional<Users> findByEmailAndIsDeleteFalse(String email);
@Query("SELECT u.id as id, " +
"u.nama as nama, " +
"u.username as username, " +
"u.password as password, " +
"u.jabatan as jabatan, " +
"u.roleId as roleId, " +
"r.role as role, " +
"u.bidangId as bidangId, " +
"b.bidang as bidang, " +
"u.instansiId as instansiId, " +
"i.instansi as instansi, " +
"u.email as email, " +
"u.isActive as isActive, " +
"u.isDelete as isDelete " +
"FROM Users u " +
"JOIN Roles r ON r.id = u.roleId " +
"JOIN Bidang b ON b.id = u.bidangId " +
"JOIN Instansi i ON i.id = u.instansiId " +
"Where u.isDelete = false " +
"AND (u.username = :input OR u.email = :input)")
Optional<UserRoleView> getByUsernameOrEmail(String input);
Optional<Users> findByIdAndIsDeleteFalse(Long id);
@Query("SELECT u.id as id, " +

47
src/main/java/com/iconplus/smartproc/service/CommonService.java
View File

@@ -1,14 +1,15 @@
package com.iconplus.smartproc.service;
import com.iconplus.smartproc.exception.BusinessException;
import com.iconplus.smartproc.model.entity.TokenManagement;
import com.iconplus.smartproc.model.request.UsersRequest;
import com.iconplus.smartproc.repository.BidangRepository;
import com.iconplus.smartproc.repository.InstansiRepository;
import com.iconplus.smartproc.repository.RolesRepository;
import com.iconplus.smartproc.repository.UsersRepository;
import com.iconplus.smartproc.repository.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.sql.Timestamp;
import java.time.Instant;
@Service
public class CommonService {
@@ -16,15 +17,18 @@ public class CommonService {
private RolesRepository rolesRepository;
private BidangRepository bidangRepository;
private InstansiRepository instansiRepository;
private TokenManagementRepository tokenManagementRepository;
public CommonService(UsersRepository usersRepository,
RolesRepository rolesRepository,
BidangRepository bidangRepository,
InstansiRepository instansiRepository) {
InstansiRepository instansiRepository,
TokenManagementRepository tokenManagementRepository) {
this.usersRepository = usersRepository;
this.rolesRepository = rolesRepository;
this.bidangRepository = bidangRepository;
this.instansiRepository = instansiRepository;
this.tokenManagementRepository = tokenManagementRepository;
}
public void validateUserRequst(UsersRequest input) {
@@ -44,4 +48,37 @@ public class CommonService {
throw new BusinessException("err", "err", "err");
}
}
public void saveUserToken(TokenManagement tokenManagement, Integer tokenExpiry) {
var issuedTime = Timestamp.from(Instant.now());
var expirationTime = Timestamp.from(Instant.now().plusMillis(tokenExpiry * (long) 60000));
if (StringUtils.isNotBlank(tokenManagement.getId())) {
tokenManagement.setIssuedTime(issuedTime);
tokenManagement.setExpiredTime(expirationTime);
tokenManagementRepository.save(tokenManagement);
return;
}
var existToken = tokenManagementRepository.findByUserId(tokenManagement.getUserId());
if (existToken.isPresent()) {
existToken.get().setAccessToken(tokenManagement.getAccessToken());
existToken.get().setRefreshToken(tokenManagement.getRefreshToken());
existToken.get().setIsDelete(false);
existToken.get().setIssuedTime(issuedTime);
existToken.get().setExpiredTime(expirationTime);
tokenManagementRepository.save(existToken.get());
} else {
tokenManagementRepository.save(TokenManagement.builder()
.userId(tokenManagement.getUserId())
.accessToken(tokenManagement.getAccessToken())
.refreshToken(tokenManagement.getRefreshToken())
.issuedTime(issuedTime)
.expiredTime(expirationTime)
.isDelete(false)
.build());
}
}
}

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

@@ -1,47 +1,98 @@
package com.iconplus.smartproc.service.authentication;
import com.iconplus.smartproc.configuration.JwtTokenUtil;
import com.iconplus.smartproc.exception.BusinessException;
import com.iconplus.smartproc.helper.service.BaseService;
import com.iconplus.smartproc.model.entity.TokenManagement;
import com.iconplus.smartproc.model.request.LoginRequest;
import com.iconplus.smartproc.model.response.LoginResponse;
import com.iconplus.smartproc.model.token.TokenContent;
import com.iconplus.smartproc.repository.UsersRepository;
import com.iconplus.smartproc.service.CommonService;
import com.iconplus.smartproc.util.Constants;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.Map;
@Service
@Slf4j
public class LoginService implements BaseService<LoginRequest, LoginResponse> {
@Value("${jwt.expired-time.access-token:15}")
private Integer accessTokenExp;
@Value("${jwt.expired-time.refresh-token:60}")
private Integer refreshTokenExp;
private final UsersRepository usersRepository;
private final JwtTokenUtil jwtTokenUtil;
private final CommonService commonService;
public LoginService(UsersRepository userRepository) {
public LoginService(UsersRepository userRepository,
JwtTokenUtil jwtTokenUtil,
CommonService commonService) {
this.usersRepository = userRepository;
this.jwtTokenUtil = jwtTokenUtil;
this.commonService = commonService;
}
@Transactional
@Override
public LoginResponse execute(LoginRequest input) {
var user= usersRepository.findByEmailAndIsDeleteFalse(input.getEmail())
var userRoleView= usersRepository.getByUsernameOrEmail(input.getEmail())
.orElseThrow(() -> new BusinessException(HttpStatus.CONFLICT,
Constants.ERR_CODE_10003,
Constants.ERR_TTL_10003,
String.format(Constants.ERR_MSG_10003, input.getEmail())));
if (!StringUtils.equalsIgnoreCase(input.getPassword(), user.getPassword())) {
if (!StringUtils.equalsIgnoreCase(input.getPassword(), userRoleView.getPassword())) {
throw new BusinessException(HttpStatus.CONFLICT,
Constants.ERR_CODE_10004,
Constants.ERR_TTL_10004,
Constants.ERR_MSG_10004);
}
var tokenContent = TokenContent.builder()
.userId(userRoleView.getId())
.username(userRoleView.getUsername())
.nama(userRoleView.getNama())
.role(userRoleView.getRole())
.accessMenu(null)
.build();
Map<String, Object> claims = new HashMap<>();
claims.put("userId", userRoleView.getId());
final String accessToken = jwtTokenUtil.generateToken(String.valueOf(userRoleView.getId()), tokenContent, accessTokenExp * 60000);
String refreshToken = jwtTokenUtil.doGenerateToken(claims, String.valueOf(userRoleView.getId()), refreshTokenExp * 60000);
if (StringUtils.isBlank(accessToken) || StringUtils.isBlank(refreshToken)) {
log.error("token null");
throw new BusinessException("err", "err", "err");
}
commonService.saveUserToken(TokenManagement.builder()
.userId(userRoleView.getId())
.accessToken(accessToken)
.refreshToken(refreshToken)
.build(), accessTokenExp);
return LoginResponse.builder()
.accessToken(accessToken)
.validity(accessTokenExp * 60)
.refreshToken(refreshToken)
.username(userRoleView.getUsername())
.email(userRoleView.getEmail())
.role(userRoleView.getRole())
.build();
}
}

100
src/main/java/com/iconplus/smartproc/service/authentication/TokenManagementService.java Normal file
View File

@@ -0,0 +1,100 @@
package com.iconplus.smartproc.service.authentication;
import com.iconplus.smartproc.configuration.JwtTokenUtil;
import com.iconplus.smartproc.exception.BusinessException;
import com.iconplus.smartproc.helper.service.BaseService;
import com.iconplus.smartproc.helper.service.TokenUtils;
import com.iconplus.smartproc.model.entity.TokenManagement;
import com.iconplus.smartproc.model.request.RefreshTokenRequest;
import com.iconplus.smartproc.model.response.RefreshTokenResponse;
import com.iconplus.smartproc.model.token.TokenContent;
import com.iconplus.smartproc.repository.TokenManagementRepository;
import com.iconplus.smartproc.repository.UsersRepository;
import com.iconplus.smartproc.service.CommonService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Objects;
@Service
@Slf4j
public class TokenManagementService implements BaseService<RefreshTokenRequest, RefreshTokenResponse> {
@Value("${jwt.expired-time.access-token:15}")
private Integer accessTokenExp;
private final TokenManagementRepository tokenManagementRepository;
private final UsersRepository usersRepository;
private final JwtTokenUtil jwtTokenUtil;
private final CommonService commonService;
public TokenManagementService(TokenManagementRepository tokenManagementRepository,
JwtTokenUtil jwtTokenUtil,
UsersRepository usersRepository,
CommonService commonService) {
this.tokenManagementRepository = tokenManagementRepository;
this.jwtTokenUtil = jwtTokenUtil;
this.usersRepository = usersRepository;
this.commonService = commonService;
}
@Transactional
@Override
public RefreshTokenResponse execute(RefreshTokenRequest input) {
try {
jwtTokenUtil.validateTokenOnly(input.getRefreshToken());
} catch (Exception e) {
throw new BusinessException(HttpStatus.UNAUTHORIZED, "err", "err", "err");
}
var decodeToken = TokenUtils.decodeToken(input.getRefreshToken());
Long userId = Long.valueOf(decodeToken.get("userId"));
var tokenManagement1 = tokenManagementRepository.findByRefreshToken(input.getRefreshToken());
TokenManagement tokenManagement = tokenManagementRepository.findByRefreshToken(input.getRefreshToken())
.map(c -> verifyRefreshToken(c, userId))
.orElseThrow(() -> {
log.error("failed validate token to existing db");
return new BusinessException(
HttpStatus.UNAUTHORIZED, "err", "err",
"err");
});
var userRoleView = usersRepository.getUserByIdAndDeletedFase(userId).orElseThrow(() -> new BusinessException("err", "err", "err"));
var tokenContent = TokenContent.builder()
.userId(userRoleView.getId())
.username(userRoleView.getUsername())
.nama(userRoleView.getNama())
.role(userRoleView.getRole())
.accessMenu(null)
.build();
final String accessToken = jwtTokenUtil.generateToken(String.valueOf(userRoleView.getId()), tokenContent, accessTokenExp * 60000);
tokenManagement.setAccessToken(accessToken);
tokenManagement.setRefreshToken(input.getRefreshToken());
commonService.saveUserToken(tokenManagement, accessTokenExp);
return RefreshTokenResponse.builder()
.accessToken(accessToken)
.refreshToken(input.getRefreshToken())
.validity(accessTokenExp * 60)
.build();
}
private TokenManagement verifyRefreshToken(TokenManagement tokenManagement, Long userId) {
if (!Objects.equals(userId, tokenManagement.getUserId())) {
throw new BusinessException(HttpStatus.UNAUTHORIZED,
"err",
"err",
"err");
}
return tokenManagement;
}
}