| @@ -75,8 +75,7 @@ public class JwtAuthenticationController { | |||||
| private final Log logger = LogFactory.getLog(getClass()); | private final Log logger = LogFactory.getLog(getClass()); | ||||
| private static final long EXPIRY_IN_MINTUE = 60000; | |||||
| private static final long TOKEN_DURATION = 5; | |||||
| private static final long TOKEN_DURATION_MINUTES = 5; | |||||
| @PostMapping("/login") | @PostMapping("/login") | ||||
| public ResponseEntity<?> login(@RequestBody JwtRequest authenticationRequest, HttpServletRequest request) | public ResponseEntity<?> login(@RequestBody JwtRequest authenticationRequest, HttpServletRequest request) | ||||
| @@ -192,7 +191,7 @@ public class JwtAuthenticationController { | |||||
| } | } | ||||
| // === END 2FA CHECK === | // === END 2FA CHECK === | ||||
| long accessTokenExpiry = TOKEN_DURATION * EXPIRY_IN_MINTUE; | |||||
| long accessTokenExpiry = TOKEN_DURATION_MINUTES * 60 * 1000; | |||||
| final String accessToken = jwtTokenUtil.generateToken(userDetails, accessTokenExpiry); | final String accessToken = jwtTokenUtil.generateToken(userDetails, accessTokenExpiry); | ||||
| final String refreshToken = jwtTokenUtil.createRefreshToken(userDetails.getUsername()).getToken(); | final String refreshToken = jwtTokenUtil.createRefreshToken(userDetails.getUsername()).getToken(); | ||||
| @@ -205,8 +204,7 @@ public class JwtAuthenticationController { | |||||
| @PostMapping("/refresh-token") | @PostMapping("/refresh-token") | ||||
| public ResponseEntity<TokenRefreshResponse> refreshtoken(@Valid @RequestBody TokenRefreshRequest request) | public ResponseEntity<TokenRefreshResponse> refreshtoken(@Valid @RequestBody TokenRefreshRequest request) | ||||
| throws Exception { | throws Exception { | ||||
| long accessTokenExpiry = /* settingsService.getInt(SettingNames.SYS_IDLE_LOGOUT_TIME) */ TOKEN_DURATION | |||||
| * EXPIRY_IN_MINTUE; | |||||
| long accessTokenExpiry = TOKEN_DURATION_MINUTES * 60 * 1000; | |||||
| String requestRefreshToken = request.getRefreshToken(); | String requestRefreshToken = request.getRefreshToken(); | ||||
| requestRefreshToken = requestRefreshToken.replaceAll("\"", ""); | requestRefreshToken = requestRefreshToken.replaceAll("\"", ""); | ||||
| @@ -49,6 +49,18 @@ public class ConsultantService extends AbstractBaseEntityService<Consultant, Lon | |||||
| ); | ); | ||||
| } | } | ||||
| public Map<String, Object> markDelete(UpdateConsultantReq req) { | |||||
| Consultant instance; | |||||
| // List<SubDivision> onUsingIdList = new ArrayList<SubDivision>(); | |||||
| instance = find(req.getId()).get(); | |||||
| instance.setDeleted(true); | |||||
| instance = save(instance); | |||||
| return Map.of( | |||||
| "id", instance.getId() | |||||
| ); | |||||
| } | |||||
| public List<Map<String,Object>> list(Map<String, Object> args){ | public List<Map<String,Object>> list(Map<String, Object> args){ | ||||
| StringBuilder sql = new StringBuilder("SELECT" | StringBuilder sql = new StringBuilder("SELECT" | ||||
| + " c.id, " | + " c.id, " | ||||
| @@ -70,9 +70,15 @@ public class ConsultantController { | |||||
| logger.info("saveOrUpdate"); | logger.info("saveOrUpdate"); | ||||
| return Map.of( | return Map.of( | ||||
| Params.DATA,consultantService.saveOrUpdate(req) | Params.DATA,consultantService.saveOrUpdate(req) | ||||
| ); | |||||
| ); | |||||
| } | |||||
| @Transactional(isolation = Isolation.SERIALIZABLE, rollbackFor = Exception.class) | |||||
| @PostMapping("/delete") | |||||
| public Map<String, Object> delete(@RequestBody @Valid UpdateConsultantReq req) { | |||||
| logger.info("Deleting consultant with id: {}", req.getId()); | |||||
| consultantService.markDelete(req); // assuming this handles soft/hard delete | |||||
| return Map.of(Params.DATA, true); // or whatever your frontend expects | |||||
| } | } | ||||
| @GetMapping("/combo") | @GetMapping("/combo") | ||||
| @@ -23,9 +23,9 @@ import java.util.Map; | |||||
| import com.ffii.lioner.modules.user.entity.User; | import com.ffii.lioner.modules.user.entity.User; | ||||
| import com.ffii.lioner.modules.user.service.UserService; | import com.ffii.lioner.modules.user.service.UserService; | ||||
| import com.ffii.lioner.modules.user.service.UserAuthorityService; // ← ADD THIS IMPORT | |||||
| import com.ffii.lioner.modules.user.service.UserAuthorityService; | |||||
| import com.ffii.lioner.config.security.jwt.service.JwtUserDetailsService; | import com.ffii.lioner.config.security.jwt.service.JwtUserDetailsService; | ||||
| import com.ffii.core.utils.JwtTokenUtil; // ← Use the correct path from your project | |||||
| import com.ffii.core.utils.JwtTokenUtil; | |||||
| import com.ffii.lioner.model.JwtResponse; | import com.ffii.lioner.model.JwtResponse; | ||||
| @RestController | @RestController | ||||