Skip to content

PD-6002 remove old pw reset link logic #7743

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

Merged
amontenegro merged 5 commits into from
Oct 8, 2026
Merged

PD-6002 remove old pw reset link logic #7743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
353b594
PD-6002 remove old pw reset link logic
aromanovv Oct 5, 2026
f74bc8e
fix test
aromanovv Oct 5, 2026
3a90f80
Merge branch 'main' into aromanovv/PD-6002-remove-old-pw-reset-link-l…
amontenegro Oct 7, 2026
dda8331
Merge branch 'main' into aromanovv/PD-6002-remove-old-pw-reset-link-l…
aromanovv Oct 8, 2026
c40a2c5
update test
aromanovv Oct 8, 2026
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
51 changes: 3 additions & 48 deletions orcid-web/src/main/java/org/orcid/frontend/web/controllers/PasswordResetController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,36 +317,8 @@ public ModelAndView resetPasswordEmail(HttpServletRequest request, @PathVariable
oneTimeResetPasswordForm.getErrors().add("expiredPasswordResetToken");
return oneTimeResetPasswordForm;
} else {
// Old logic support
// TODO: remove once PD-6002 is stable on prod
PasswordResetToken passwordResetToken;
try {
passwordResetToken = buildResetTokenFromEncryptedLink(oneTimeResetPasswordForm.getToken());
} catch (EncryptionOperationNotPossibleException e) {
oneTimeResetPasswordForm.getErrors().add("invalidPasswordResetToken");
return oneTimeResetPasswordForm;
}

if (isTokenExpired(passwordResetToken)) {
String message = "expiredPasswordResetToken";
oneTimeResetPasswordForm.getErrors().add(message);
return oneTimeResetPasswordForm;
}

//check first if valid orcid as the admin portal can send either and email or an orcid
if(OrcidStringUtils.isValidOrcid(passwordResetToken.getEmail()) ){
if(profileEntityManager.orcidExists(passwordResetToken.getEmail())) {
orcid = passwordResetToken.getEmail();
}
else {
String message = "invalidPasswordResetToken";
oneTimeResetPasswordForm.getErrors().add(message);
return oneTimeResetPasswordForm;
}
}
else {
orcid = emailManagerReadOnly.findOrcidIdByEmail(passwordResetToken.getEmail());
}
oneTimeResetPasswordForm.getErrors().add("invalidPasswordResetToken");
return oneTimeResetPasswordForm;
}

passwordConfirmValidate(oneTimeResetPasswordForm.getRetypedPassword(), oneTimeResetPasswordForm.getNewPassword());
Expand Down Expand Up @@ -429,25 +401,8 @@ else if (oneTimeResetPasswordForm.getTwoFactorCode() != null && !oneTimeResetPas
} else if (verificationResult.getStatus() == ExpiringLinkService.VerificationStatus.EXPIRED) {
oneTimeResetPasswordForm.getErrors().add("expiredPasswordResetToken");
return oneTimeResetPasswordForm;
}

// Old logic support
// TODO: remove once PD-6002 is stable on prod
PasswordResetToken passwordResetToken;

try {
passwordResetToken = buildResetTokenFromEncryptedLink(oneTimeResetPasswordForm.getToken());

} catch (EncryptionOperationNotPossibleException e) {
oneTimeResetPasswordForm.getErrors().add("invalidPasswordResetToken");
return oneTimeResetPasswordForm;
}

if (isTokenExpired(passwordResetToken)) {
String message = "expiredPasswordResetToken";
oneTimeResetPasswordForm.getErrors().add(message);
return oneTimeResetPasswordForm;
} else {
oneTimeResetPasswordForm.getErrors().add("invalidPasswordResetToken");
return oneTimeResetPasswordForm;
}

Expand Down
Loading
Loading