From b7dfc5e7cdc68dda7a5747654f6e341f52659806 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 13 May 2021 19:14:02 +0200 Subject: [PATCH] again --- login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp | 2 +- login_server/src/cpp/HTTPInterface/ResetPassword.cpp | 2 +- login_server/src/cpp/JSONInterface/JsonCreateUser.cpp | 2 +- login_server/src/cpsp/resetPassword.cpsp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp b/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp index 481f35474..af36bcb5a 100644 --- a/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp +++ b/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp @@ -382,7 +382,7 @@ int HandleElopageRequestTask::run() DataTypeConverter::strToInt(mRequestData.get("noEmail", "0"), noEMail); if (noEMail != 1) { - emailVerification->setBaseUrl(newUser->getGroupBaseUrl() + "/checkEmail"); + emailVerification->setBaseUrl(ServerConfig::g_serverPath + "/checkEmail"); em->addEmail(new model::Email(emailVerification, newUser, model::EMAIL_USER_VERIFICATION_CODE)); } } diff --git a/login_server/src/cpp/HTTPInterface/ResetPassword.cpp b/login_server/src/cpp/HTTPInterface/ResetPassword.cpp index 1c84d4d12..0d47ef89e 100644 --- a/login_server/src/cpp/HTTPInterface/ResetPassword.cpp +++ b/login_server/src/cpp/HTTPInterface/ResetPassword.cpp @@ -95,7 +95,7 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N // send reset password email int result = 0; if(user_exist) { - result = session->sendResetPasswordEmail(user, sendUserEmail, getBaseUrl() + "/checkEmail"); + result = session->sendResetPasswordEmail(user, sendUserEmail, ServerConfig::g_serverPath + "/checkEmail"); } if(2 == result) { diff --git a/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp b/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp index 4917f611a..fe31fd5a2 100644 --- a/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp +++ b/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp @@ -109,7 +109,7 @@ Poco::JSON::Object* JsonCreateUser::handle(Poco::Dynamic::Var params) emailOptInModel->sendErrorsAsEmail(); return stateError("insert emailOptIn failed"); } - emailOptIn->setBaseUrl(mServerHost + "/" + ServerConfig::g_frontend_checkEmailPath); + emailOptIn->setBaseUrl(user->getGroupBaseUrl() + ServerConfig::g_frontend_checkEmailPath); em->addEmail(new model::Email(emailOptIn, user, model::Email::convertTypeFromInt(emailType))); if (login_after_register && session) { diff --git a/login_server/src/cpsp/resetPassword.cpsp b/login_server/src/cpsp/resetPassword.cpsp index 03e82559a..393b5cf53 100644 --- a/login_server/src/cpsp/resetPassword.cpsp +++ b/login_server/src/cpsp/resetPassword.cpsp @@ -78,7 +78,7 @@ enum PageState { // send reset password email int result = 0; if(user_exist) { - result = session->sendResetPasswordEmail(user, sendUserEmail, getBaseUrl() + "/checkEmail"); + result = session->sendResetPasswordEmail(user, sendUserEmail, ServerConfig::g_serverPath + "/checkEmail"); } if(2 == result) {