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

additional error check, return correct field name for transaction count

Browse Source
This commit is contained in:
einhornimmond 2021-03-18 12:54:44 +01:00
parent db02002680
commit 98859461bc
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
#include "Poco/DeflatingStream.h" #include "Poco/DeflatingStream.h"
#line 7 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\login.cpsp" #line 7 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\login.cpsp"
#include "../gettext.h" #include "../gettext.h"
@ -16,7 +16,7 @@
#include "../SingletonManager/LanguageManager.h" #include "../SingletonManager/LanguageManager.h"
#include "../SingletonManager/ErrorManager.h" #include "../SingletonManager/ErrorManager.h"
#line 1 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\header.cpsp" #line 1 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
#include "../ServerConfig.h" #include "../ServerConfig.h"
@ -35,7 +35,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
if (_compressResponse) response.set("Content-Encoding", "gzip"); if (_compressResponse) response.set("Content-Encoding", "gzip");
Poco::Net::HTMLForm form(request, request.stream()); Poco::Net::HTMLForm form(request, request.stream());
#line 18 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\login.cpsp" #line 18 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\login.cpsp"
const char* pageName = "Login"; const char* pageName = "Login";
auto sm = SessionManager::getInstance(); auto sm = SessionManager::getInstance();
@ -109,7 +109,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
} }
auto user = mSession->getNewUser(); auto user = mSession->getNewUser();
if(user_state >= USER_LOADED_FROM_DB && !user->getModel()->getPublicKey()) { if(user_state >= USER_LOADED_FROM_DB && !user.isNull() && !user->getModel()->getPublicKey()) {
if(mSession->generateKeys(true, true)) { if(mSession->generateKeys(true, true)) {
user_state = USER_COMPLETE; user_state = USER_COMPLETE;
if(user->getModel()->isDisabled()) { if(user->getModel()->isDisabled()) {
@ -192,7 +192,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
sm->deleteLoginCookies(request, response); sm->deleteLoginCookies(request, response);
} }
#line 3 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\header.cpsp" #line 3 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
bool withMaterialIcons = false; bool withMaterialIcons = false;
std::ostream& _responseStream = response.send(); std::ostream& _responseStream = response.send();
@ -207,20 +207,20 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << "<meta charset=\"UTF-8\">\n"; responseStream << "<meta charset=\"UTF-8\">\n";
responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n"; responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n";
responseStream << "<title>Gradido Login Server: "; responseStream << "<title>Gradido Login Server: ";
#line 11 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\header.cpsp" #line 11 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
responseStream << ( pageName ); responseStream << ( pageName );
responseStream << "</title>\n"; responseStream << "</title>\n";
responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\""; responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
#line 12 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\header.cpsp" #line 12 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "css/main.css\">\n"; responseStream << "css/main.css\">\n";
#line 13 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\header.cpsp" #line 13 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
if(withMaterialIcons) { responseStream << "\n"; if(withMaterialIcons) { responseStream << "\n";
responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\""; responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
#line 14 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\header.cpsp" #line 14 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "css/materialdesignicons.min.css\">\n"; responseStream << "css/materialdesignicons.min.css\">\n";
#line 15 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\header.cpsp" #line 15 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
} responseStream << "\n"; } responseStream << "\n";
responseStream << "</head>\n"; responseStream << "</head>\n";
responseStream << "<body>\n"; responseStream << "<body>\n";
@ -228,20 +228,20 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << " <div class=\"center-form-single\">\n"; responseStream << " <div class=\"center-form-single\">\n";
responseStream << " <div class=\"center-form-header\">\n"; responseStream << " <div class=\"center-form-header\">\n";
responseStream << " <a href=\""; responseStream << " <a href=\"";
#line 21 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\header.cpsp" #line 21 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "\" class=\"center-logo\">\n"; responseStream << "\" class=\"center-logo\">\n";
responseStream << " <picture>\n"; responseStream << " <picture>\n";
responseStream << " <source srcset=\""; responseStream << " <source srcset=\"";
#line 23 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\header.cpsp" #line 23 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "img/logo_schrift.webp\" type=\"image/webp\">\n"; responseStream << "img/logo_schrift.webp\" type=\"image/webp\">\n";
responseStream << " <source srcset=\""; responseStream << " <source srcset=\"";
#line 24 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\header.cpsp" #line 24 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "img/logo_schrift.png\" type=\"image/png\">\n"; responseStream << "img/logo_schrift.png\" type=\"image/png\">\n";
responseStream << " <img src=\""; responseStream << " <img src=\"";
#line 25 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\header.cpsp" #line 25 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "img/logo_schrift.png\" alt=\"logo\" />\n"; responseStream << "img/logo_schrift.png\" alt=\"logo\" />\n";
responseStream << " </picture>\n"; responseStream << " </picture>\n";
@ -249,11 +249,11 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << " </div>"; responseStream << " </div>";
// end include header.cpsp // end include header.cpsp
responseStream << "\n"; responseStream << "\n";
#line 175 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\login.cpsp" #line 175 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\login.cpsp"
responseStream << ( getErrorsHtml() ); responseStream << ( getErrorsHtml() );
responseStream << "\n"; responseStream << "\n";
responseStream << "<!--<input type=\"hidden\" name=\"lang\" value=\""; responseStream << "<!--<input type=\"hidden\" name=\"lang\" value=\"";
#line 176 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\login.cpsp" #line 176 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\login.cpsp"
responseStream << ( LanguageManager::keyForLanguage(lang) ); responseStream << ( LanguageManager::keyForLanguage(lang) );
responseStream << "\">-->\n"; responseStream << "\">-->\n";
responseStream << "<div class=\"center-form-container\">\n"; responseStream << "<div class=\"center-form-container\">\n";
@ -262,22 +262,22 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << "<div class=\"center-form-selectors\">\n"; responseStream << "<div class=\"center-form-selectors\">\n";
responseStream << "<form method=\"GET\" action=\"\">\n"; responseStream << "<form method=\"GET\" action=\"\">\n";
responseStream << "\t<button id=\"flag-england\" name=\"lang\" value=\"en\" title=\"English\" type=\"submit\" "; responseStream << "\t<button id=\"flag-england\" name=\"lang\" value=\"en\" title=\"English\" type=\"submit\" ";
#line 3 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\flags.cpsp" #line 3 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\flags.cpsp"
if(lang != LANG_EN) { responseStream << "class=\"flag-btn\""; if(lang != LANG_EN) { responseStream << "class=\"flag-btn\"";
#line 3 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\flags.cpsp" #line 3 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\flags.cpsp"
} }
else { responseStream << "class=\"flag-btn\" disabled"; else { responseStream << "class=\"flag-btn\" disabled";
#line 4 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\flags.cpsp" #line 4 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\flags.cpsp"
} responseStream << ">\n"; } responseStream << ">\n";
responseStream << "\t <span class=\"flag flag-england\"></span>\n"; responseStream << "\t <span class=\"flag flag-england\"></span>\n";
responseStream << "\t</button>\n"; responseStream << "\t</button>\n";
responseStream << "\t<button id=\"flag-germany\" name=\"lang\" value=\"de\" title=\"Deutsch\" type=\"submit\" "; responseStream << "\t<button id=\"flag-germany\" name=\"lang\" value=\"de\" title=\"Deutsch\" type=\"submit\" ";
#line 7 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\flags.cpsp" #line 7 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\flags.cpsp"
if(lang != LANG_DE) { responseStream << "class=\"flag-btn\""; if(lang != LANG_DE) { responseStream << "class=\"flag-btn\"";
#line 7 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\flags.cpsp" #line 7 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\flags.cpsp"
} }
else { responseStream << "class=\"flag-btn\" disabled"; else { responseStream << "class=\"flag-btn\" disabled";
#line 8 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\flags.cpsp" #line 8 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\flags.cpsp"
} responseStream << ">\n"; } responseStream << ">\n";
responseStream << "\t <span class=\"flag flag-germany\"></span>\n"; responseStream << "\t <span class=\"flag flag-germany\"></span>\n";
responseStream << "\t</button>\n"; responseStream << "\t</button>\n";
@ -287,22 +287,22 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << "\n"; responseStream << "\n";
responseStream << " <div class=\"center-form-form\">\n"; responseStream << " <div class=\"center-form-form\">\n";
responseStream << "\t\t<form action=\""; responseStream << "\t\t<form action=\"";
#line 180 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\login.cpsp" #line 180 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\login.cpsp"
responseStream << ( ServerConfig::g_serverPath ); responseStream << ( ServerConfig::g_serverPath );
responseStream << "/\" method=\"POST\">\n"; responseStream << "/\" method=\"POST\">\n";
responseStream << "\t\t\t<input class=\"form-control\" type=\"text\" name=\"login-email\" placeholder=\""; responseStream << "\t\t\t<input class=\"form-control\" type=\"text\" name=\"login-email\" placeholder=\"";
#line 181 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\login.cpsp" #line 181 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("E-Mail") ); responseStream << ( langCatalog->gettext("E-Mail") );
responseStream << "\" value=\""; responseStream << "\" value=\"";
#line 181 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\login.cpsp" #line 181 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\login.cpsp"
responseStream << ( presetEmail ); responseStream << ( presetEmail );
responseStream << "\"/>\n"; responseStream << "\"/>\n";
responseStream << "\t\t\t<input class=\"form-control\" type=\"password\" name=\"login-password\" placeholder=\""; responseStream << "\t\t\t<input class=\"form-control\" type=\"password\" name=\"login-password\" placeholder=\"";
#line 182 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\login.cpsp" #line 182 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("Password") ); responseStream << ( langCatalog->gettext("Password") );
responseStream << "\" />\n"; responseStream << "\" />\n";
responseStream << "\t\t <button type=\"submit\" name=\"submit\" class=\"center-form-submit form-button\">"; responseStream << "\t\t <button type=\"submit\" name=\"submit\" class=\"center-form-submit form-button\">";
#line 183 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\login.cpsp" #line 183 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext(" Login ") ); responseStream << ( langCatalog->gettext(" Login ") );
responseStream << "</button>\n"; responseStream << "</button>\n";
responseStream << "\t\t</form>\n"; responseStream << "\t\t</form>\n";
@ -310,22 +310,22 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << " <div class=\"center-form-bottom\">\n"; responseStream << " <div class=\"center-form-bottom\">\n";
responseStream << " <div class=\"signup-link\">\n"; responseStream << " <div class=\"signup-link\">\n";
responseStream << "\t <p>"; responseStream << "\t <p>";
#line 188 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\login.cpsp" #line 188 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("You haven't any account yet? Please follow the link to create one.") ); responseStream << ( langCatalog->gettext("You haven't any account yet? Please follow the link to create one.") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t <a href=\"https://elopage.com/s/gradido/registration-de/payment?locale=de\">\n"; responseStream << "\t <a href=\"https://elopage.com/s/gradido/registration-de/payment?locale=de\">\n";
responseStream << "\t\t\t"; responseStream << "\t\t\t";
#line 190 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\login.cpsp" #line 190 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("Create New Account") ); responseStream << ( langCatalog->gettext("Create New Account") );
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t </a>\n"; responseStream << "\t\t </a>\n";
responseStream << "\t </div>\n"; responseStream << "\t </div>\n";
responseStream << "\t\t<div class=\"reset-pwd-link\">\n"; responseStream << "\t\t<div class=\"reset-pwd-link\">\n";
responseStream << "\t\t\t<a href=\""; responseStream << "\t\t\t<a href=\"";
#line 194 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\login.cpsp" #line 194 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\login.cpsp"
responseStream << ( ServerConfig::g_serverPath ); responseStream << ( ServerConfig::g_serverPath );
responseStream << "/resetPassword\">"; responseStream << "/resetPassword\">";
#line 194 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\login.cpsp" #line 194 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("Passwort vergessen") ); responseStream << ( langCatalog->gettext("Passwort vergessen") );
responseStream << "</a>\n"; responseStream << "</a>\n";
responseStream << "\t\t</div>\n"; responseStream << "\t\t</div>\n";
@ -345,14 +345,14 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << " </div>\n"; responseStream << " </div>\n";
responseStream << " <div class=\"bottomleft\">\n"; responseStream << " <div class=\"bottomleft\">\n";
responseStream << " "; responseStream << " ";
#line 6 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\footer.cpsp" #line 6 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\footer.cpsp"
responseStream << ( mTimeProfiler.string() ); responseStream << ( mTimeProfiler.string() );
responseStream << "\n"; responseStream << "\n";
responseStream << " </div>\n"; responseStream << " </div>\n";
responseStream << " <div class=\"bottomright\">\n"; responseStream << " <div class=\"bottomright\">\n";
responseStream << " <p>Login Server in Entwicklung</p>\n"; responseStream << " <p>Login Server in Entwicklung</p>\n";
responseStream << " <p>Alpha "; responseStream << " <p>Alpha ";
#line 10 "F:\\Gradido\\gradido_login_server_v1\\src\\cpsp\\footer.cpsp" #line 10 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\footer.cpsp"
responseStream << ( ServerConfig::g_versionString ); responseStream << ( ServerConfig::g_versionString );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << " </div>\n"; responseStream << " </div>\n";

4
login_server/src/cpp/JSONInterface/JsonGetLogin.cpp
View File

@ -71,12 +71,12 @@ Poco::JSON::Object* JsonGetLogin::handle(Poco::Dynamic::Var params)
em->addError(new Error("JsonGetLogin::handle", "generic exception calling userModel->getJson: ")); em->addError(new Error("JsonGetLogin::handle", "generic exception calling userModel->getJson: "));
em->sendErrorsAsEmail(); em->sendErrorsAsEmail();
} }
result->set("Transaction.pending", session->getProcessingTransactionCount()); result->set("Transactions.pending", session->getProcessingTransactionCount());
auto executing = observer->getTaskCount(userModel->getEmail(), TASK_OBSERVER_SIGN_TRANSACTION); auto executing = observer->getTaskCount(userModel->getEmail(), TASK_OBSERVER_SIGN_TRANSACTION);
if (executing < 0) { if (executing < 0) {
executing = 0; executing = 0;
} }
result->set("Transaction.executing", executing); result->set("Transactions.executing", executing);
//printf("pending: %d\n", session->getProcessingTransactionCount()); //printf("pending: %d\n", session->getProcessingTransactionCount());
//std::string user_string = userModel->toString(); //std::string user_string = userModel->toString();
//printf("[JsonGetLogin] %s\n", user_string.data()); //printf("[JsonGetLogin] %s\n", user_string.data());

2
login_server/src/cpsp/login.cpsp
View File

@ -88,7 +88,7 @@
} }
auto user = mSession->getNewUser(); auto user = mSession->getNewUser();
if(user_state >= USER_LOADED_FROM_DB && !user->getModel()->getPublicKey()) { if(user_state >= USER_LOADED_FROM_DB && !user.isNull() && !user->getModel()->getPublicKey()) {
if(mSession->generateKeys(true, true)) { if(mSession->generateKeys(true, true)) {
user_state = USER_COMPLETE; user_state = USER_COMPLETE;
if(user->getModel()->isDisabled()) { if(user->getModel()->isDisabled()) {