diff --git a/login_server/src/cpp/HTTPInterface/LoginPage.cpp b/login_server/src/cpp/HTTPInterface/LoginPage.cpp index bdf4ea8b4..f3e6aa077 100644 --- a/login_server/src/cpp/HTTPInterface/LoginPage.cpp +++ b/login_server/src/cpp/HTTPInterface/LoginPage.cpp @@ -5,7 +5,7 @@ #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" @@ -16,7 +16,7 @@ #include "../SingletonManager/LanguageManager.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" @@ -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 "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"; auto sm = SessionManager::getInstance(); @@ -109,7 +109,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: } 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)) { user_state = USER_COMPLETE; if(user->getModel()->isDisabled()) { @@ -192,7 +192,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: 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; std::ostream& _responseStream = response.send(); @@ -207,20 +207,20 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << "\n"; responseStream << "\n"; responseStream << "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 << "\n"; responseStream << "\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"; responseStream << "\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 << "\n"; @@ -228,20 +228,20 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << "
\n"; responseStream << "
\n"; responseStream << " \n"; responseStream << " \n"; responseStream << " \n"; responseStream << " \n"; responseStream << " \"logo\"\n"; responseStream << " \n"; @@ -249,11 +249,11 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << "
"; // end include header.cpsp 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 << "\n"; responseStream << "\n"; responseStream << "
\n"; @@ -262,22 +262,22 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << "
\n"; responseStream << "
\n"; responseStream << "\t\n"; responseStream << "\t\n"; @@ -287,22 +287,22 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << "\n"; responseStream << "
\n"; responseStream << "\t\t\n"; responseStream << "\t\t\tgettext("E-Mail") ); 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 << "\"/>\n"; responseStream << "\t\t\tgettext("Password") ); responseStream << "\" />\n"; responseStream << "\t\t \n"; responseStream << "\t\t\n"; @@ -310,22 +310,22 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << "
\n"; responseStream << "
\n"; responseStream << "\t

"; -#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 << "

\n"; responseStream << "\t \n"; 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 << "\n"; responseStream << "\t\t \n"; responseStream << "\t
\n"; responseStream << "\t\t
\n"; responseStream << "\t\t\t"; -#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 << "\n"; responseStream << "\t\t
\n"; @@ -345,14 +345,14 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << "
\n"; responseStream << "
\n"; 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 << "\n"; responseStream << "
\n"; responseStream << "
\n"; responseStream << "

Login Server in Entwicklung

\n"; responseStream << "

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 << "

\n"; responseStream << "
\n"; diff --git a/login_server/src/cpp/JSONInterface/JsonGetLogin.cpp b/login_server/src/cpp/JSONInterface/JsonGetLogin.cpp index a881ae8a0..a376db77c 100644 --- a/login_server/src/cpp/JSONInterface/JsonGetLogin.cpp +++ b/login_server/src/cpp/JSONInterface/JsonGetLogin.cpp @@ -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->sendErrorsAsEmail(); } - result->set("Transaction.pending", session->getProcessingTransactionCount()); + result->set("Transactions.pending", session->getProcessingTransactionCount()); auto executing = observer->getTaskCount(userModel->getEmail(), TASK_OBSERVER_SIGN_TRANSACTION); if (executing < 0) { executing = 0; } - result->set("Transaction.executing", executing); + result->set("Transactions.executing", executing); //printf("pending: %d\n", session->getProcessingTransactionCount()); //std::string user_string = userModel->toString(); //printf("[JsonGetLogin] %s\n", user_string.data()); diff --git a/login_server/src/cpsp/login.cpsp b/login_server/src/cpsp/login.cpsp index eca27299d..87a2aac3d 100644 --- a/login_server/src/cpsp/login.cpsp +++ b/login_server/src/cpsp/login.cpsp @@ -88,7 +88,7 @@ } 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)) { user_state = USER_COMPLETE; if(user->getModel()->isDisabled()) {