Skip to content

Commit

Permalink
fixed confusing error messages around changing email on profile page, c…
Browse files Browse the repository at this point in the history 
…loses #451
  • Loading branch information
@albogdano
albogdano committed May 30, 2024
1 parent bb7e284 commit dd9a57c
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 24 deletions.
71 changes: 47 additions & 24 deletions src/main/java/com/erudika/scoold/controllers/ProfileController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@
import com.erudika.scoold.utils.HttpUtils;
import com.erudika.scoold.utils.ScooldUtils;
import com.erudika.scoold.utils.avatars.*;
import jakarta.inject.Inject;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import jakarta.inject.Inject;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -206,8 +206,16 @@ public String edit(@PathVariable(required = false) String id, @RequestParam(requ
if (utils.isAdmin(authUser) || CONF.allowUnverifiedEmails()) {
changeEmail(showUser.getUser(), showUser, email);
} else {
updateProfile = updateProfile || sendConfirmationEmail(showUser.getUser(), showUser, email, req);
queryString = updateProfile ? "?code=signin.verify.start&success=true" : "?code=9&error=true";
if (!utils.isEmailDomainApproved(email)) {
queryString = "?code=9&error=true";
} else if (!isAvailableEmail(email)) {
queryString = "?code=1&error=true";
} else if (sendConfirmationEmail(showUser.getUser(), showUser, email, req)) {
updateProfile = true;
queryString = "?code=signin.verify.start&success=true";
} else {
queryString = "?code=signin.verify.fail&error=true";
}
}
}

Expand Down Expand Up @@ -339,14 +347,14 @@ public String confirmEmail(@RequestParam(name = "id", required = false) String i
if (StringUtils.isBlank((String) s.getProperty(Config._EMAIL_TOKEN + "2"))) {
return changeEmail(u, authUser, authUser.getPendingEmail());
}
return "redirect:" + PROFILELINK + "?code=signin.verify.done&success=true";
return "redirect:" + PROFILELINK + "?code=signin.verify.start&success=true";
} else if (s != null && StringUtils.equals(token2, (String) s.getProperty(Config._EMAIL_TOKEN + "2"))) {
s.addProperty(Config._EMAIL_TOKEN + "2", "");
pc.update(s);
if (StringUtils.isBlank((String) s.getProperty(Config._EMAIL_TOKEN))) {
return changeEmail(u, authUser, authUser.getPendingEmail());
}
return "redirect:" + PROFILELINK + "?code=signin.verify.done&success=true";
return "redirect:" + PROFILELINK + "?code=signin.verify.start&success=true";
} else {
return "redirect:" + SIGNINLINK;
}
Expand All @@ -361,9 +369,11 @@ public String retryChangeEmail(HttpServletRequest req, Model model) {
return "redirect:" + SIGNINLINK + "?returnto=" + PROFILELINK;
}
if (!StringUtils.isBlank(authUser.getPendingEmail())) {
boolean done = sendConfirmationEmail(authUser.getUser(), authUser, authUser.getPendingEmail(), req);
if (!done) {
return "redirect:" + PROFILELINK + "?code=7&error=true";
if (!isAvailableEmail(authUser.getPendingEmail())) {
return "redirect:" + PROFILELINK + "?code=1&error=true";
}
if (!sendConfirmationEmail(authUser.getUser(), authUser, authUser.getPendingEmail(), req)) {
return "redirect:" + PROFILELINK + "?code=signin.verify.fail&error=true";
}
}
return "redirect:" + PROFILELINK + "?code=signin.verify.start&success=true";
Expand All @@ -377,7 +387,16 @@ public String cancelChangeEmail(HttpServletRequest req, Model model) {
}
if (!StringUtils.isBlank(authUser.getPendingEmail())) {
authUser.setPendingEmail("");
authUser.update();
User u = (User) pc.read(authUser.getCreatorid());
Sysprop s = pc.read(u.getIdentifier());
if (s != null) {
s.removeProperty(Config._EMAIL_TOKEN);
s.removeProperty(Config._EMAIL_TOKEN + "2");
s.removeProperty("confirmationTimestamp");
pc.updateAll(List.of(s, authUser));
} else {
authUser.update();
}
}
return "redirect:" + PROFILELINK;
}
Expand Down Expand Up @@ -414,24 +433,28 @@ private String changeEmail(User u, Profile showUser, String email) {
}

private boolean sendConfirmationEmail(User user, Profile showUser, String email, HttpServletRequest req) {
if (pc.read(email) == null && pc.findTerms(Utils.type(User.class), Map.of(Config._EMAIL, email), true).isEmpty()) {
Sysprop ident = pc.read(user.getEmail());
if (ident != null) {
if (!ident.hasProperty("confirmationTimestamp") || Utils.timestamp() >
((long) ident.getProperty("confirmationTimestamp") + TimeUnit.HOURS.toMillis(6))) {
showUser.setPendingEmail(email);
utils.sendVerificationEmail(ident, email, PROFILELINK + "/confirm-email", req);
return true;
} else {
logger.warn("Failed to send email confirmation to '{}' - this can only be done once every 6h.", email);
}
Sysprop ident = pc.read(user.getEmail());
if (ident != null) {
if (!ident.hasProperty("confirmationTimestamp") || Utils.timestamp() >
((long) ident.getProperty("confirmationTimestamp") + TimeUnit.HOURS.toMillis(6))) {
showUser.setPendingEmail(email);
utils.sendVerificationEmail(ident, email, PROFILELINK + "/confirm-email", req);
return true;
} else {
logger.warn("Failed to send email confirmation to '{}' - this can only be done once every 6h.", email);
}
} else {
logger.info("Failed to send confirmation email to user {} - email {} has already been taken.", user.getId(), email);
}
return false;
}

private boolean isAvailableEmail(String email) {
boolean b = pc.read(email) == null && pc.findTerms(Utils.type(User.class), Map.of(Config._EMAIL, email), true).isEmpty();
if (!b) {
logger.info("Failed to send confirmation email to user - email {} has already been taken.", email);
}
return b;
}

private boolean canChangeEmail(User u, String email) {
return "generic".equals(u.getIdentityProvider()) && !StringUtils.equals(u.getEmail(), email);
}
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/lang_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ signin.verify.start = Follow both confirmation links that were sent to your old
signin.verify.change = Confirm email change to:
signin.verify.changed = Your email address was successfully changed.
signin.verify.text = Done! Check your email and follow the link to verify it.
signin.verify.fail = This can only be done once every 6 hours.
signin.verify.done = Email verified!
signin.facebook = Continue with Facebook
signin.google = Continue with Google
Expand Down

0 comments on commit dd9a57c

Please sign in to comment.