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

use correct community server link in check transactions, login and register direct

Browse Source
This commit is contained in:
Dario 2020-11-05 17:05:06 +01:00 committed by Ulf Gebhardt
parent d9d5dc81cd
commit 46e8a43492
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
13 changed files with 93 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpp/HTTPInterface/CheckTransactionPage.cpp
View File

@ -267,7 +267,7 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
} else if(!account_user->getModel()->getGroupId()) {
response.redirect(ServerConfig::g_serverPath + "/userUpdateGroup");
} else {
response.redirect(ServerConfig::g_php_serverPath + "state-balances/overview");
response.redirect(account_user->getGroupBaseUrl() + "state-balances/overview");
}
return;
}

66
src/cpp/HTTPInterface/LoginPage.cpp
View File

@ -5,7 +5,7 @@
#include "Poco/DeflatingStream.h"
#line 7 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login.cpsp"
#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
#include "../gettext.h"
@ -16,7 +16,7 @@
#include "../SingletonManager/LanguageManager.h"
#include "../SingletonManager/ErrorManager.h"
#line 1 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
#include "../ServerConfig.h"
@ -35,7 +35,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
if (_compressResponse) response.set("Content-Encoding", "gzip");
Poco::Net::HTMLForm form(request, request.stream());
#line 18 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login.cpsp"
#line 18 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
const char* pageName = "Login";
auto sm = SessionManager::getInstance();
@ -180,7 +180,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
response.redirect(refererString);
} else {
//printf("redirect to: %s\n", ServerConfig::g_php_serverPath.data());
response.redirect(ServerConfig::g_php_serverPath + "/");
response.redirect(user->getGroupBaseUrl() + "/");
}
return;
}
@ -201,7 +201,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
sm->deleteLoginCookies(request, response);
}
#line 3 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
bool withMaterialIcons = false;
std::ostream& _responseStream = response.send();
@ -216,20 +216,20 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << "<meta charset=\"UTF-8\">\n";
responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n";
responseStream << "<title>Gradido Login Server: ";
#line 11 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
#line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( pageName );
responseStream << "</title>\n";
responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
#line 12 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
#line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "css/main.css\">\n";
#line 13 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
if(withMaterialIcons) { responseStream << "\n";
responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
#line 14 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
#line 14 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "css/materialdesignicons.min.css\">\n";
#line 15 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
#line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
} responseStream << "\n";
responseStream << "</head>\n";
responseStream << "<body>\n";
@ -237,20 +237,20 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << " <div class=\"center-form-single\">\n";
responseStream << " <div class=\"center-form-header\">\n";
responseStream << " <a href=\"";
#line 21 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
#line 21 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "\" class=\"center-logo\">\n";
responseStream << " <picture>\n";
responseStream << " <source srcset=\"";
#line 23 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "img/logo_schrift.webp\" type=\"image/webp\">\n";
responseStream << " <source srcset=\"";
#line 24 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
#line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "img/logo_schrift.png\" type=\"image/png\">\n";
responseStream << " <img src=\"";
#line 25 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
#line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "img/logo_schrift.png\" alt=\"logo\" />\n";
responseStream << " </picture>\n";
@ -258,11 +258,11 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << " </div>";
// end include header.cpsp
responseStream << "\n";
#line 170 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login.cpsp"
#line 170 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( getErrorsHtml() );
responseStream << "\n";
responseStream << "<!--<input type=\"hidden\" name=\"lang\" value=\"";
#line 171 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login.cpsp"
#line 171 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( LanguageManager::keyForLanguage(lang) );
responseStream << "\">-->\n";
responseStream << "<div class=\"center-form-container\">\n";
@ -271,22 +271,22 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << "<div class=\"center-form-selectors\">\n";
responseStream << "<form method=\"GET\" action=\"\">\n";
responseStream << "\t<button id=\"flag-england\" name=\"lang\" value=\"en\" title=\"English\" type=\"submit\" ";
#line 3 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\flags.cpsp"
#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
if(lang != LANG_EN) { responseStream << "class=\"flag-btn\"";
#line 3 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\flags.cpsp"
#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
}
else { responseStream << "class=\"flag-btn\" disabled";
#line 4 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\flags.cpsp"
#line 4 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
} responseStream << ">\n";
responseStream << "\t <span class=\"flag flag-england\"></span>\n";
responseStream << "\t</button>\n";
responseStream << "\t<button id=\"flag-germany\" name=\"lang\" value=\"de\" title=\"Deutsch\" type=\"submit\" ";
#line 7 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\flags.cpsp"
#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
if(lang != LANG_DE) { responseStream << "class=\"flag-btn\"";
#line 7 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\flags.cpsp"
#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
}
else { responseStream << "class=\"flag-btn\" disabled";
#line 8 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\flags.cpsp"
#line 8 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
} responseStream << ">\n";
responseStream << "\t <span class=\"flag flag-germany\"></span>\n";
responseStream << "\t</button>\n";
@ -296,22 +296,22 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << "\n";
responseStream << " <div class=\"center-form-form\">\n";
responseStream << "\t\t<form action=\"";
#line 175 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login.cpsp"
#line 175 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( ServerConfig::g_serverPath );
responseStream << "/\" method=\"POST\">\n";
responseStream << "\t\t\t<input class=\"form-control\" type=\"text\" name=\"login-email\" placeholder=\"";
#line 176 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login.cpsp"
#line 176 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("E-Mail") );
responseStream << "\" value=\"";
#line 176 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login.cpsp"
#line 176 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( presetEmail );
responseStream << "\"/>\n";
responseStream << "\t\t\t<input class=\"form-control\" type=\"password\" name=\"login-password\" placeholder=\"";
#line 177 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login.cpsp"
#line 177 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("Password") );
responseStream << "\" />\n";
responseStream << "\t\t <button type=\"submit\" name=\"submit\" class=\"center-form-submit form-button\">";
#line 178 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login.cpsp"
#line 178 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext(" Login ") );
responseStream << "</button>\n";
responseStream << "\t\t</form>\n";
@ -319,7 +319,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << " <div class=\"center-form-bottom\">\n";
responseStream << " <div class=\"signup-link\">\n";
responseStream << "\t <p>";
#line 176 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
#line 183 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("You haven't any account yet? Please follow the link to create one.") );
responseStream << "</p>\n";
responseStream << "\t <a href=\"";
@ -327,17 +327,17 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << ( ServerConfig::g_serverPath );
responseStream << "/registerDirect\">\n";
responseStream << "\t\t\t";
#line 178 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
#line 185 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("Create New Account") );
responseStream << "\n";
responseStream << "\t\t </a>\n";
responseStream << "\t </div>\n";
responseStream << "\t\t<div class=\"reset-pwd-link\">\n";
responseStream << "\t\t\t<a href=\"";
#line 189 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login.cpsp"
#line 189 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( ServerConfig::g_serverPath );
responseStream << "/resetPassword\">";
#line 189 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login.cpsp"
#line 189 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("Passwort vergessen") );
responseStream << "</a>\n";
responseStream << "\t\t</div>\n";
@ -357,14 +357,14 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << " </div>\n";
responseStream << " <div class=\"bottomleft\">\n";
responseStream << " ";
#line 6 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\footer.cpsp"
#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
responseStream << ( mTimeProfiler.string() );
responseStream << "\n";
responseStream << " </div>\n";
responseStream << " <div class=\"bottomright\">\n";
responseStream << " <p>Login Server in Entwicklung</p>\n";
responseStream << " <p>Alpha ";
#line 10 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\footer.cpsp"
#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
responseStream << ( ServerConfig::g_versionString );
responseStream << "</p>\n";
responseStream << " </div>\n";

2
src/cpp/HTTPInterface/RegisterDirectPage.cpp
View File

@ -67,7 +67,7 @@ void RegisterDirectPage::handleRequest(Poco::Net::HTTPServerRequest& request, Po
auto user_host = request.clientAddress().host();
session->setClientIp(user_host);
response.addCookie(session->getLoginCookie());
response.redirect(ServerConfig::g_php_serverPath + "/");
response.redirect(ServerConfig::g_serverPath + "/userUpdateGroup");
return;
}
}

7
src/cpp/controller/NodeServer.cpp
View File

@ -189,4 +189,11 @@ namespace controller {
return JsonRequest(connection.getUri(), model->getPort());
}
std::string NodeServer::getBaseUri()
{
auto model = getModel();
NodeServerConnection connection(model->getUrl(), model->getPort());
return connection.getUri();
}
}

1
src/cpp/controller/NodeServer.h
View File

@ -53,6 +53,7 @@ namespace controller {
inline void setHederaId(Poco::AutoPtr<controller::HederaId> hederaId) { mHederaID = hederaId; }
inline Poco::AutoPtr<controller::HederaId> getHederaId() { return mHederaID; }
std::string getBaseUri();
JsonRequest createJsonRequest();
protected:
NodeServer(model::table::NodeServer* dbModel);

25
src/cpp/controller/User.cpp
View File

@ -7,6 +7,8 @@
#include "../SingletonManager/ErrorManager.h"
#include "../SingletonManager/SingletonTaskObserver.h"
#include "NodeServer.h"
#include "../lib/DataTypeConverter.h"
#include "../tasks/VerificationEmailResendTask.h"
@ -515,4 +517,27 @@ namespace controller {
}
return updated_count;
}
std::string User::getGroupBaseUrl()
{
UNIQUE_LOCK;
if (mGroupBaseUrl != "") {
return mGroupBaseUrl;
}
static const char* function_name = "User::getGroupBaseUrl";
auto model = getModel();
if (!model->getGroupId()) return ServerConfig::g_php_serverPath;
auto servers = controller::NodeServer::load(model::table::NODE_SERVER_GRADIDO_COMMUNITY, model->getGroupId());
if (!servers.size()) return ServerConfig::g_php_serverPath;
if (servers.size() > 1) {
auto em = ErrorManager::getInstance();
em->addError(new ParamError(function_name, "error, more than one community server found for group", model->getGroupId()));
em->sendErrorsAsEmail();
return ServerConfig::g_php_serverPath;
}
mGroupBaseUrl = servers[0]->getBaseUri();
return mGroupBaseUrl;
}
}

4
src/cpp/controller/User.h
View File

@ -146,6 +146,8 @@ namespace controller {
inline void setBalance(int gradidoBalance) { std::unique_lock<std::shared_mutex> _lock(mSharedMutex); mGradidoCurrentBalance = gradidoBalance; }
inline int getBalance() { std::shared_lock<std::shared_mutex> _lock(mSharedMutex); return mGradidoCurrentBalance; }
std::string getGroupBaseUrl();
// connection to other tables
@ -164,6 +166,8 @@ namespace controller {
//! use it for showing balance in menu in check transaction
int mGradidoCurrentBalance;
std::string mGroupBaseUrl;
mutable std::shared_mutex mSharedMutex;
};
}

2
src/cpp/model/table/ModelBase.h
View File

@ -226,9 +226,7 @@ namespace model {
Poco::ScopedLock<Poco::Mutex> _poco_lock(mWorkMutex);
UNIQUE_LOCK;
if (fieldNames.size() != fieldValues.size() || fieldNames.size() <= 1) {
lock();
addError(new Error(getTableName(), "fieldNames and fieldValues size don't match or smaller as 1"));
unlock();
return results;
}
if (expectedResults > 0) {

17
src/cpp/model/table/NodeServer.cpp
View File

@ -86,6 +86,23 @@ namespace model {
return select;
}
Poco::Data::Statement NodeServer::_loadMultipleFromDB(Poco::Data::Session session, const std::vector<std::string> fieldNames, MysqlConditionType conditionType/* = MYSQL_CONDITION_AND*/)
{
Poco::Data::Statement select(session);
select << "SELECT id, url, port, group_id, server_type, node_hedera_id, last_live_sign FROM " << getTableName()
<< " where " << fieldNames[0] << " = ? ";
if (conditionType == MYSQL_CONDITION_AND) {
for (int i = 1; i < fieldNames.size(); i++) {
select << " AND " << fieldNames[i] << " = ?";
}
}
else if (conditionType == MYSQL_CONDITION_OR) {
for (int i = 1; i < fieldNames.size(); i++) {
select << " OR " << fieldNames[i] << " = ?";
}
}
return select;
}
Poco::Data::Statement NodeServer::_loadIdFromDB(Poco::Data::Session session)
{

1
src/cpp/model/table/NodeServer.h
View File

@ -55,6 +55,7 @@ namespace model {
protected:
Poco::Data::Statement _loadFromDB(Poco::Data::Session session, const std::string& fieldName);
Poco::Data::Statement _loadMultipleFromDB(Poco::Data::Session session, const std::string& fieldName);
Poco::Data::Statement _loadMultipleFromDB(Poco::Data::Session session, const std::vector<std::string> fieldNames, MysqlConditionType conditionType = MYSQL_CONDITION_AND);
Poco::Data::Statement _loadIdFromDB(Poco::Data::Session session);
Poco::Data::Statement _insertIntoDB(Poco::Data::Session session);

2
src/cpsp/checkTransaction.cpsp
View File

@ -249,7 +249,7 @@ enum PageState {
} else if(!account_user->getModel()->getGroupId()) {
response.redirect(ServerConfig::g_serverPath + "/userUpdateGroup");
} else {
response.redirect(ServerConfig::g_php_serverPath + "state-balances/overview");
response.redirect(account_user->getGroupBaseUrl() + "state-balances/overview");
}
return;
}

2
src/cpsp/login.cpsp
View File

@ -156,7 +156,7 @@
response.redirect(refererString);
} else {
//printf("redirect to: %s\n", ServerConfig::g_php_serverPath.data());
response.redirect(ServerConfig::g_php_serverPath + "/");
response.redirect(user->getGroupBaseUrl() + "/");
}
return;
}

2
src/cpsp/registerDirect.cpsp
View File

@ -51,7 +51,7 @@
auto user_host = request.clientAddress().host();
session->setClientIp(user_host);
response.addCookie(session->getLoginCookie());
response.redirect(ServerConfig::g_php_serverPath + "/");
response.redirect(ServerConfig::g_serverPath + "/userUpdateGroup");
return;
}
}