Merge pull request #1068 from bprize15/fix-reactivate-account

create activation key before sending email
oncokb · Dec 21, 2023 · e2fd26c · e2fd26c
2 parents 605bca4 + 43fc3f9
commit e2fd26c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/java/org/mskcc/cbio/oncokb/web/rest/AccountResource.java b/src/main/java/org/mskcc/cbio/oncokb/web/rest/AccountResource.java
@@ -492,6 +492,9 @@ public void resendVerification(@RequestBody LoginVM loginVM, HttpServletRequest
         // if (rs.getStatusCode() == HttpStatus.OK) {
         Optional<User> userOptional = userService.getUserWithAuthoritiesByLogin(loginVM.getUsername());
         if (userOptional.isPresent() && passwordEncoder.matches(loginVM.getPassword(), userOptional.get().getPassword())) {
+            if (StringUtils.isEmpty(userOptional.get().getActivationKey())) {
+                userService.generateNewActivationKey(userOptional.get());
+            }
             mailService.sendActivationEmail(userMapper.userToUserDTO(userOptional.get()));
         }
         // }