Added url knowage-vue for mail

Author: masseb974

knowage-core/src/main/java/it/eng/spagobi/commons/services/ForgotPasswordResource.java

@@ -22,6 +22,7 @@
 
 import com.auth0.jwt.exceptions.TokenExpiredException;
 
+import it.eng.knowage.commons.security.KnowageSystemConfiguration;
 import it.eng.spago.error.EMFErrorSeverity;
 import it.eng.spago.error.EMFUserError;
 import it.eng.spagobi.commons.bo.Config;
@@ -221,7 +222,7 @@ private void setPasswordExpirationDate(SbiUser user, Date beginDate) throws EMFU
 	}
 
 	private String buildResetPasswordUrl(HttpServletRequest req, String token, String version) throws Exception {
-		String urlString = req.getContextPath() + "/restful-services/signup/changePasswordMail?token=" + token + "&version=" + version;
+		String urlString = KnowageSystemConfiguration.getKnowageVueContext() + "/login?resetToken=" + token + "&version=" + version;
 		URL url = new URL(req.getScheme(), req.getServerName(), req.getServerPort(), urlString);
 		return url.toString();
 	}

knowage-core/src/main/java/it/eng/spagobi/commons/services/SignupResource.java

@@ -26,6 +26,7 @@
 import com.auth0.jwt.exceptions.TokenExpiredException;
 import com.google.common.io.Resources;
 
+import it.eng.knowage.commons.security.KnowageSystemConfiguration;
 import it.eng.knowage.mailsender.IMailSender;
 import it.eng.knowage.mailsender.dto.MessageMailDto;
 import it.eng.knowage.mailsender.dto.ProfileNameMailEnum;
@@ -312,7 +313,7 @@ private void sendActivationEmail(HttpServletRequest req, SbiUser user, String us
 		String token = SignupJWTTokenManager.createJWTToken(user.getUserId());
 		String version = SbiCommonInfo.getVersion().substring(0, SbiCommonInfo.getVersion().lastIndexOf("."));
 
-		String urlString = req.getContextPath() + "/restful-services/signup/prepareActive?token=" + token + "&version=" + version;
+		String urlString = KnowageSystemConfiguration.getKnowageVueContext() + "/login?registrationToken=" + token + "&version=" + version;
 		URL url = new URL(req.getScheme(), host, port, urlString);
 
 		// Replace placeholders in template