IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into apollo-clicktipp-connector

Browse Source
This commit is contained in:
elweyn 2021-09-09 12:05:25 +02:00
commit 4264fbd48c
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configs/login_server/grd_login.properties
View File

@ -22,7 +22,8 @@ loginServer.db.user = root
loginServer.db.password = loginServer.db.password =
loginServer.db.port = 3306 loginServer.db.port = 3306
frontend.checkEmailPath = http://localhost/reset frontend.checkEmailPath = vue/checkEmail
frontend.resetPasswordPath = vue/reset
email.disable = true email.disable = true

10
login_server/src/cpp/JSONInterface/JsonSendEmail.cpp
View File

@ -105,12 +105,13 @@ Poco::JSON::Object* JsonSendEmail::handle(Poco::Dynamic::Var params)
return stateSuccess(); return stateSuccess();
} }
auto receiver_user_id = receiver_user->getModel()->getID(); auto receiver_user_id = receiver_user->getModel()->getID();
std::string checkEmailUrl = receiver_user->getGroupBaseUrl() + ServerConfig::g_frontend_checkEmailPath; std::string linkInEmail = "";
if (emailVerificationCodeType == model::table::EMAIL_OPT_IN_RESET_PASSWORD) if (emailVerificationCodeType == model::table::EMAIL_OPT_IN_RESET_PASSWORD)
{ {
linkInEmail = receiver_user->getGroupBaseUrl() + ServerConfig::g_frontend_resetPasswordPath;
session = sm->getNewSession(); session = sm->getNewSession();
if (emailType == model::EMAIL_USER_RESET_PASSWORD) { if (emailType == model::EMAIL_USER_RESET_PASSWORD) {
auto r = session->sendResetPasswordEmail(receiver_user, true, checkEmailUrl); auto r = session->sendResetPasswordEmail(receiver_user, true, linkInEmail);
if (1 == r) { if (1 == r) {
return stateWarning("email already sended"); return stateWarning("email already sended");
} }
@ -120,7 +121,7 @@ Poco::JSON::Object* JsonSendEmail::handle(Poco::Dynamic::Var params)
} }
else if (emailType == model::EMAIL_CUSTOM_TEXT) { else if (emailType == model::EMAIL_CUSTOM_TEXT) {
auto email_verification_code_object = controller::EmailVerificationCode::loadOrCreate(receiver_user_id, model::table::EMAIL_OPT_IN_RESET_PASSWORD); auto email_verification_code_object = controller::EmailVerificationCode::loadOrCreate(receiver_user_id, model::table::EMAIL_OPT_IN_RESET_PASSWORD);
email_verification_code_object->setBaseUrl(checkEmailUrl); email_verification_code_object->setBaseUrl(linkInEmail);
auto email = new model::Email(email_verification_code_object, receiver_user, emailCustomText, emailCustomSubject); auto email = new model::Email(email_verification_code_object, receiver_user, emailCustomText, emailCustomSubject);
em->addEmail(email); em->addEmail(email);
} }
@ -131,12 +132,13 @@ Poco::JSON::Object* JsonSendEmail::handle(Poco::Dynamic::Var params)
} }
else else
{ {
linkInEmail = receiver_user->getGroupBaseUrl() + ServerConfig::g_frontend_checkEmailPath;
if (session->getNewUser()->getModel()->getRole() != model::table::ROLE_ADMIN) { if (session->getNewUser()->getModel()->getRole() != model::table::ROLE_ADMIN) {
return stateError("admin needed"); return stateError("admin needed");
} }
auto email_verification_code_object = controller::EmailVerificationCode::loadOrCreate(receiver_user_id, emailVerificationCodeType); auto email_verification_code_object = controller::EmailVerificationCode::loadOrCreate(receiver_user_id, emailVerificationCodeType);
email_verification_code_object->setBaseUrl(checkEmailUrl); email_verification_code_object->setBaseUrl(linkInEmail);
model::Email* email = nullptr; model::Email* email = nullptr;
if (emailType == model::EMAIL_CUSTOM_TEXT) { if (emailType == model::EMAIL_CUSTOM_TEXT) {
email = new model::Email(email_verification_code_object, receiver_user, emailCustomText, emailCustomSubject); email = new model::Email(email_verification_code_object, receiver_user, emailCustomText, emailCustomSubject);

4
login_server/src/cpp/ServerConfig.cpp
View File

@ -51,6 +51,7 @@ namespace ServerConfig {
std::string g_php_serverPath; std::string g_php_serverPath;
std::string g_php_serverHost; std::string g_php_serverHost;
std::string g_frontend_checkEmailPath; std::string g_frontend_checkEmailPath;
std::string g_frontend_resetPasswordPath;
int g_phpServerPort; int g_phpServerPort;
Poco::Mutex g_TimeMutex; Poco::Mutex g_TimeMutex;
int g_FakeLoginSleepTime = 820; int g_FakeLoginSleepTime = 820;
@ -238,8 +239,9 @@ namespace ServerConfig {
if ("" != app_secret_string) { if ("" != app_secret_string) {
g_CryptoAppSecret = DataTypeConverter::hexToBin(app_secret_string); g_CryptoAppSecret = DataTypeConverter::hexToBin(app_secret_string);
} }
std::string defaultCheckEmailPath = g_serverPath + "/checkEmail"; std::string defaultCheckEmailPath = "/account/checkEmail";
g_frontend_checkEmailPath = cfg.getString("frontend.checkEmailPath", defaultCheckEmailPath); g_frontend_checkEmailPath = cfg.getString("frontend.checkEmailPath", defaultCheckEmailPath);
g_frontend_resetPasswordPath = cfg.getString("frontend.resetPasswordPath", defaultCheckEmailPath);
//g_CryptoAppSecret //g_CryptoAppSecret
// unsecure flags // unsecure flags

1
login_server/src/cpp/ServerConfig.h
View File

@ -67,6 +67,7 @@ namespace ServerConfig {
extern std::string g_php_serverPath; extern std::string g_php_serverPath;
extern std::string g_php_serverHost; extern std::string g_php_serverHost;
extern std::string g_frontend_checkEmailPath; extern std::string g_frontend_checkEmailPath;
extern std::string g_frontend_resetPasswordPath;
extern int g_phpServerPort; extern int g_phpServerPort;
extern Poco::Mutex g_TimeMutex; extern Poco::Mutex g_TimeMutex;
extern int g_FakeLoginSleepTime; extern int g_FakeLoginSleepTime;