|
|
@ -199,6 +199,7 @@ public class AuthController extends BaseController { |
|
|
@ResponseBody |
|
|
@ResponseBody |
|
|
public JsonNode activateUser( |
|
|
public JsonNode activateUser( |
|
|
@RequestBody JsonNode activateRequest, |
|
|
@RequestBody JsonNode activateRequest, |
|
|
|
|
|
@RequestParam(required = false, defaultValue = "true") boolean sendActivationMail, |
|
|
HttpServletRequest request) throws ThingsboardException { |
|
|
HttpServletRequest request) throws ThingsboardException { |
|
|
try { |
|
|
try { |
|
|
String activateToken = activateRequest.get("activateToken").asText(); |
|
|
String activateToken = activateRequest.get("activateToken").asText(); |
|
|
@ -213,10 +214,12 @@ public class AuthController extends BaseController { |
|
|
String loginUrl = String.format("%s/login", baseUrl); |
|
|
String loginUrl = String.format("%s/login", baseUrl); |
|
|
String email = user.getEmail(); |
|
|
String email = user.getEmail(); |
|
|
|
|
|
|
|
|
try { |
|
|
if (sendActivationMail) { |
|
|
mailService.sendAccountActivatedEmail(loginUrl, email); |
|
|
try { |
|
|
} catch (Exception e) { |
|
|
mailService.sendAccountActivatedEmail(loginUrl, email); |
|
|
log.info("Unable to send account activation email [{}]", e.getMessage()); |
|
|
} catch (Exception e) { |
|
|
|
|
|
log.info("Unable to send account activation email [{}]", e.getMessage()); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
JwtToken accessToken = tokenFactory.createAccessJwtToken(securityUser); |
|
|
JwtToken accessToken = tokenFactory.createAccessJwtToken(securityUser); |
|
|
|