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

debugging, fixing

Browse Source
This commit is contained in:
Dario 2020-01-15 16:33:19 +01:00
parent 7b0828d22d
commit 1c5159930e
8 changed files with 123 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,15 +72,16 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
size_t notReadyTransactions = 0; size_t notReadyTransactions = 0;
size_t sumTransactions = mSession->getProcessingTransactionCount(); size_t sumTransactions = mSession->getProcessingTransactionCount();
if(sumTransactions == 0) { if(sumTransactions == 0) {
auto observer = SingletonTaskObserver::getInstance(); /*auto observer = SingletonTaskObserver::getInstance();
auto emailHash = DRMakeStringHash(mSession->getUser()->getEmail()); auto emailHash = DRMakeStringHash(mSession->getUser()->getEmail());
int breakCount = 0; int breakCount = 0;
while(observer->getTaskCount(emailHash, TASK_OBSERVER_SIGN_TRANSACTION) > 0) { while(observer->getTaskCount(emailHash, TASK_OBSERVER_SIGN_TRANSACTION) > 0) {
if(breakCount > 100) break; if(breakCount > 100) break;
breakCount++; breakCount++;
Poco::Thread::sleep(10); Poco::Thread::sleep(10);
} }*/
auto lastExternReferer = mSession->getLastReferer(); auto lastExternReferer = mSession->getLastReferer();
//lastExternReferer = "";
if(lastExternReferer != "") { if(lastExternReferer != "") {
printf("last extern referer: %s\n", lastExternReferer.data()); printf("last extern referer: %s\n", lastExternReferer.data());
response.redirect(lastExternReferer); response.redirect(lastExternReferer);
@ -243,71 +244,71 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
responseStream << "<div class=\"col-md-10 equel-grid mb-3\">\n"; responseStream << "<div class=\"col-md-10 equel-grid mb-3\">\n";
responseStream << "\t<small class=\"text-gray d-block mt-3\">\n"; responseStream << "\t<small class=\"text-gray d-block mt-3\">\n";
responseStream << "\t"; responseStream << "\t";
#line 87 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 88 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
if(sumTransactions > 0 && sumTransactions - notReadyTransactions != 1) { responseStream << "\n"; if(sumTransactions > 0 && sumTransactions - notReadyTransactions != 1) { responseStream << "\n";
responseStream << "\t\t"; responseStream << "\t\t";
#line 88 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 89 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
if(notReadyTransactions > 0) { responseStream << " \n"; if(notReadyTransactions > 0) { responseStream << " \n";
responseStream << "\t\t\t"; responseStream << "\t\t\t";
#line 89 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 90 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( sumTransactions - notReadyTransactions ); responseStream << ( sumTransactions - notReadyTransactions );
responseStream << " "; responseStream << " ";
#line 89 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 90 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("von") ); responseStream << ( gettext("von") );
responseStream << " "; responseStream << " ";
#line 89 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 90 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( sumTransactions ); responseStream << ( sumTransactions );
responseStream << " "; responseStream << " ";
#line 89 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 90 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Transaktionen sind bereit zum best&auml;tigen") ); responseStream << ( gettext("Transaktionen sind bereit zum best&auml;tigen") );
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t"; responseStream << "\t\t";
#line 90 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 91 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
} else { responseStream << "\n"; } else { responseStream << "\n";
responseStream << "\t\t\t"; responseStream << "\t\t\t";
#line 91 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 92 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( sumTransactions ); responseStream << ( sumTransactions );
responseStream << " "; responseStream << " ";
#line 91 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 92 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Transaktionen warten darauf best&auml;tigt zu werden.") ); responseStream << ( gettext("Transaktionen warten darauf best&auml;tigt zu werden.") );
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t"; responseStream << "\t\t";
#line 92 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
} responseStream << "\n";
responseStream << "\t";
#line 93 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 93 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
} responseStream << "\n"; } responseStream << "\n";
responseStream << "\t"; responseStream << "\t";
#line 94 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 94 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
} responseStream << "\n";
responseStream << "\t";
#line 95 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
if(state == PAGE_NO_TRANSACTIONS) { responseStream << "\n"; if(state == PAGE_NO_TRANSACTIONS) { responseStream << "\n";
responseStream << "\t\t"; responseStream << "\t\t";
#line 95 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 96 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
if(sumTransactions == 0) { responseStream << "\n"; if(sumTransactions == 0) { responseStream << "\n";
responseStream << "\t\t\t"; responseStream << "\t\t\t";
#line 96 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 97 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Es gibt zurzeit keine Transaktionen zum best&auml;tigen") ); responseStream << ( gettext("Es gibt zurzeit keine Transaktionen zum best&auml;tigen") );
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t"; responseStream << "\t\t";
#line 97 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 98 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
} else { responseStream << "\n"; } else { responseStream << "\n";
responseStream << "\t\t\t"; responseStream << "\t\t\t";
#line 98 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 99 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Transaktion(en) werden noch vorbereitet, bitte lade die Seite in wenigen Augenblicken erneut.") ); responseStream << ( gettext("Transaktion(en) werden noch vorbereitet, bitte lade die Seite in wenigen Augenblicken erneut.") );
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t"; responseStream << "\t\t";
#line 99 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 100 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
} responseStream << "\n"; } responseStream << "\n";
responseStream << " "; responseStream << " ";
#line 100 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 101 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
} responseStream << "\n"; } responseStream << "\n";
responseStream << "\t</small>\n"; responseStream << "\t</small>\n";
responseStream << "</div>\n"; responseStream << "</div>\n";
#line 103 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 104 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
if(state != PAGE_NO_TRANSACTIONS) { responseStream << "\n"; if(state != PAGE_NO_TRANSACTIONS) { responseStream << "\n";
responseStream << "<div class=\"col-md-10 equel-grid\">\n"; responseStream << "<div class=\"col-md-10 equel-grid\">\n";
responseStream << "\t<div class=\"grid\">\n"; responseStream << "\t<div class=\"grid\">\n";
responseStream << "\t <p class=\"grid-header\">"; responseStream << "\t <p class=\"grid-header\">";
#line 106 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 107 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Transaktion Unterzeichnen") ); responseStream << ( gettext("Transaktion Unterzeichnen") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t <div class=\"grid-body\">\n"; responseStream << "\t <div class=\"grid-body\">\n";
@ -315,96 +316,96 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
responseStream << "\t\t <div class=\"row mb-3\">\n"; responseStream << "\t\t <div class=\"row mb-3\">\n";
responseStream << "\t\t\t<div class=\"col-md-10 mx-auto\">\n"; responseStream << "\t\t\t<div class=\"col-md-10 mx-auto\">\n";
responseStream << "\t\t\t"; responseStream << "\t\t\t";
#line 111 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 112 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
if(state == PAGE_TRANSACTION_TRANSFER) { if(state == PAGE_TRANSACTION_TRANSFER) {
auto transferTransaction = processingTransaction->getTransferTransaction(); auto transferTransaction = processingTransaction->getTransferTransaction();
memo = transferTransaction->getMemo(); memo = transferTransaction->getMemo();
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t\t <p class=\"card-title ml-n1 mb-3\">"; responseStream << "\t\t\t <p class=\"card-title ml-n1 mb-3\">";
#line 115 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 116 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("&Uuml;berweisung") ); responseStream << ( gettext("&Uuml;berweisung") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t\t <div class=\"table-responsive mb-4\">\n"; responseStream << "\t\t\t <div class=\"table-responsive mb-4\">\n";
responseStream << "\t\t\t\t<table class=\"table info-table table-striped table-bordered\">\n"; responseStream << "\t\t\t\t<table class=\"table info-table table-striped table-bordered\">\n";
responseStream << "\t\t\t\t <thead>\n"; responseStream << "\t\t\t\t <thead>\n";
responseStream << "\t\t\t\t\t<tr><th>"; responseStream << "\t\t\t\t\t<tr><th>";
#line 119 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 120 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Konto") ); responseStream << ( gettext("Konto") );
responseStream << "</th><th>"; responseStream << "</th><th>";
#line 119 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 120 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Gradido") ); responseStream << ( gettext("Gradido") );
responseStream << "</th></tr>\n"; responseStream << "</th></tr>\n";
responseStream << "\t\t\t\t </thead>\n"; responseStream << "\t\t\t\t </thead>\n";
responseStream << "\t\t\t\t <tbody>\n"; responseStream << "\t\t\t\t <tbody>\n";
responseStream << "\t\t\t\t "; responseStream << "\t\t\t\t ";
#line 122 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 123 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
for(int i = 0; i < transferTransaction->getKontoTableSize(); i++) { responseStream << "\n"; for(int i = 0; i < transferTransaction->getKontoTableSize(); i++) { responseStream << "\n";
responseStream << "\t\t\t\t\t<tr>\n"; responseStream << "\t\t\t\t\t<tr>\n";
responseStream << "\t\t\t\t\t\t"; responseStream << "\t\t\t\t\t\t";
#line 124 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 125 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( transferTransaction->getKontoNameCell(i) ); responseStream << ( transferTransaction->getKontoNameCell(i) );
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t\t\t\t\t"; responseStream << "\t\t\t\t\t\t";
#line 125 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 126 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( transferTransaction->getAmountCell(i) ); responseStream << ( transferTransaction->getAmountCell(i) );
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t\t\t\t</tr>\n"; responseStream << "\t\t\t\t\t</tr>\n";
responseStream << "\t\t\t\t\t"; responseStream << "\t\t\t\t\t";
#line 127 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 128 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
} responseStream << "\n"; } responseStream << "\n";
responseStream << "\t\t\t\t </tbody>\n"; responseStream << "\t\t\t\t </tbody>\n";
responseStream << "\t\t\t\t</table>\n"; responseStream << "\t\t\t\t</table>\n";
responseStream << "\t\t\t </div>\n"; responseStream << "\t\t\t </div>\n";
responseStream << "\t\t\t \n"; responseStream << "\t\t\t \n";
responseStream << "\t\t\t "; responseStream << "\t\t\t ";
#line 132 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 133 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
} else if(state == PAGE_TRANSACTION_CREATION) { } else if(state == PAGE_TRANSACTION_CREATION) {
auto creationTransaction = processingTransaction->getCreationTransaction(); auto creationTransaction = processingTransaction->getCreationTransaction();
auto transactionUser = creationTransaction->getUser(); auto transactionUser = creationTransaction->getUser();
memo = creationTransaction->getMemo(); memo = creationTransaction->getMemo();
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t\t <p class=\"card-title ml-n1 mb-3\">"; responseStream << "\t\t\t <p class=\"card-title ml-n1 mb-3\">";
#line 137 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 138 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Sch&ouml;pfung") ); responseStream << ( gettext("Sch&ouml;pfung") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t\t <div class=\"table-responsive mb-4\">\n"; responseStream << "\t\t\t <div class=\"table-responsive mb-4\">\n";
responseStream << "\t\t\t\t<table class=\"table info-table table-striped table-bordered\">\n"; responseStream << "\t\t\t\t<table class=\"table info-table table-striped table-bordered\">\n";
responseStream << "\t\t\t\t <thead>\n"; responseStream << "\t\t\t\t <thead>\n";
responseStream << "\t\t\t\t\t<tr><th>"; responseStream << "\t\t\t\t\t<tr><th>";
#line 141 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 142 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Konto") ); responseStream << ( gettext("Konto") );
responseStream << "</th><th>"; responseStream << "</th><th>";
#line 141 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 142 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Gradido") ); responseStream << ( gettext("Gradido") );
responseStream << "</th></tr>\n"; responseStream << "</th></tr>\n";
responseStream << "\t\t\t\t </thead>\n"; responseStream << "\t\t\t\t </thead>\n";
responseStream << "\t\t\t\t <tbody>\n"; responseStream << "\t\t\t\t <tbody>\n";
responseStream << "\t\t\t\t\t<tr>\n"; responseStream << "\t\t\t\t\t<tr>\n";
responseStream << "\t\t\t\t\t\t"; responseStream << "\t\t\t\t\t\t";
#line 145 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 146 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
if(transactionUser) { responseStream << "\n"; if(transactionUser) { responseStream << "\n";
responseStream << "\t\t\t\t\t\t\t<td>"; responseStream << "\t\t\t\t\t\t\t<td>";
#line 146 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( transactionUser->getFirstName() ); responseStream << ( transactionUser->getFirstName() );
responseStream << " "; responseStream << " ";
#line 146 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( transactionUser->getLastName() ); responseStream << ( transactionUser->getLastName() );
responseStream << " &lt;"; responseStream << " &lt;";
#line 146 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( transactionUser->getEmail() ); responseStream << ( transactionUser->getEmail() );
responseStream << "&gt;</td>\n"; responseStream << "&gt;</td>\n";
responseStream << "\t\t\t\t\t\t"; responseStream << "\t\t\t\t\t\t";
#line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 148 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
} else { responseStream << "\n"; } else { responseStream << "\n";
responseStream << "\t\t\t\t\t\t\t<td class=\"small\">0x"; responseStream << "\t\t\t\t\t\t\t<td class=\"small\">0x";
#line 148 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 149 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( creationTransaction->getPublicHex() ); responseStream << ( creationTransaction->getPublicHex() );
responseStream << "</td>\n"; responseStream << "</td>\n";
responseStream << "\t\t\t\t\t\t"; responseStream << "\t\t\t\t\t\t";
#line 149 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 150 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
} responseStream << "\n"; } responseStream << "\n";
responseStream << "\t\t\t\t\t\t<td class=\"grd-success-color\">"; responseStream << "\t\t\t\t\t\t<td class=\"grd-success-color\">";
#line 150 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 151 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( creationTransaction->getAmountString() ); responseStream << ( creationTransaction->getAmountString() );
responseStream << " GDD</td>\n"; responseStream << " GDD</td>\n";
responseStream << "\t\t\t\t\t</tr>\n"; responseStream << "\t\t\t\t\t</tr>\n";
@ -412,22 +413,22 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
responseStream << "\t\t\t\t</table>\n"; responseStream << "\t\t\t\t</table>\n";
responseStream << "\t\t\t </div>\n"; responseStream << "\t\t\t </div>\n";
responseStream << "\t\t\t "; responseStream << "\t\t\t ";
#line 155 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 156 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
} responseStream << "\n"; } responseStream << "\n";
responseStream << "\t\t\t <div class=\"table-responsive mb-4\">\n"; responseStream << "\t\t\t <div class=\"table-responsive mb-4\">\n";
responseStream << "\t\t\t\t<table class=\"table info-table table-bordered table-auto-break\">\n"; responseStream << "\t\t\t\t<table class=\"table info-table table-bordered table-auto-break\">\n";
responseStream << "\t\t\t\t <thead><tr><th>"; responseStream << "\t\t\t\t <thead><tr><th>";
#line 158 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 159 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Aktives Konto") ); responseStream << ( gettext("Aktives Konto") );
responseStream << "</th></tr></thead>\n"; responseStream << "</th></tr></thead>\n";
responseStream << "\t\t\t\t <tbody><tr><td>"; responseStream << "\t\t\t\t <tbody><tr><td>";
#line 159 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 160 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( accountUser->getFirstName() ); responseStream << ( accountUser->getFirstName() );
responseStream << " "; responseStream << " ";
#line 159 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 160 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( accountUser->getLastName() ); responseStream << ( accountUser->getLastName() );
responseStream << " &lt;"; responseStream << " &lt;";
#line 159 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 160 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( accountUser->getEmail() ); responseStream << ( accountUser->getEmail() );
responseStream << "&gt;</td></tr></tbody>\n"; responseStream << "&gt;</td></tr></tbody>\n";
responseStream << "\t\t\t\t</table>\n"; responseStream << "\t\t\t\t</table>\n";
@ -435,12 +436,12 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
responseStream << "\t\t\t <div class=\"table-responsive mb-4\">\n"; responseStream << "\t\t\t <div class=\"table-responsive mb-4\">\n";
responseStream << "\t\t\t\t<table class=\"table info-table table-bordered table-auto-break tab-container\">\n"; responseStream << "\t\t\t\t<table class=\"table info-table table-bordered table-auto-break tab-container\">\n";
responseStream << "\t\t\t\t <thead><tr><th>"; responseStream << "\t\t\t\t <thead><tr><th>";
#line 164 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 165 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Verwendungszweck") ); responseStream << ( gettext("Verwendungszweck") );
responseStream << "</th></tr></thead>\n"; responseStream << "</th></tr></thead>\n";
responseStream << "\t\t\t\t <tbody><tr>\n"; responseStream << "\t\t\t\t <tbody><tr>\n";
responseStream << "\t\t\t\t\t <td class=\"tab-content\">"; responseStream << "\t\t\t\t\t <td class=\"tab-content\">";
#line 166 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 167 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( memo ); responseStream << ( memo );
responseStream << "</td></tr></tbody>\n"; responseStream << "</td></tr></tbody>\n";
responseStream << "\t\t\t\t</table>\n"; responseStream << "\t\t\t\t</table>\n";
@ -451,32 +452,32 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
responseStream << "\t\t\t <div class=\"row mb-3\">\n"; responseStream << "\t\t\t <div class=\"row mb-3\">\n";
responseStream << "\t\t\t\t<div class=\"col-md-10 mx-auto\">\n"; responseStream << "\t\t\t\t<div class=\"col-md-10 mx-auto\">\n";
responseStream << "\t\t\t\t "; responseStream << "\t\t\t\t ";
#line 174 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 175 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
if(!accountUser->hasCryptoKey()) { responseStream << "\n"; if(!accountUser->hasCryptoKey()) { responseStream << "\n";
responseStream << "\t\t\t\t <div class=\"form-group\">\n"; responseStream << "\t\t\t\t <div class=\"form-group\">\n";
responseStream << "\t\t\t\t\t <label for=\"sign-password\">"; responseStream << "\t\t\t\t\t <label for=\"sign-password\">";
#line 176 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 177 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Ich brauche nochmal dein Passwort") ); responseStream << ( gettext("Ich brauche nochmal dein Passwort") );
responseStream << "</label>\n"; responseStream << "</label>\n";
responseStream << "\t\t\t\t\t <input type=\"password\" class=\"form-control\" id=\"sign-password\" name=\"sign-password\" placeholder=\""; responseStream << "\t\t\t\t\t <input type=\"password\" class=\"form-control\" id=\"sign-password\" name=\"sign-password\" placeholder=\"";
#line 177 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 178 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Passwort") ); responseStream << ( gettext("Passwort") );
responseStream << "\">\n"; responseStream << "\">\n";
responseStream << "\t\t\t\t </div>\n"; responseStream << "\t\t\t\t </div>\n";
responseStream << "\t\t\t\t"; responseStream << "\t\t\t\t";
#line 179 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 180 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
} responseStream << "\n"; } responseStream << "\n";
responseStream << "\t\t\t\t <button type=\"submit\" class=\"btn btn-sm btn-primary\" name=\"ok\" value=\"ok\">\n"; responseStream << "\t\t\t\t <button type=\"submit\" class=\"btn btn-sm btn-primary\" name=\"ok\" value=\"ok\">\n";
responseStream << "\t\t\t\t\t<i class=\"mdi mdi-signature-freehand\"></i>\n"; responseStream << "\t\t\t\t\t<i class=\"mdi mdi-signature-freehand\"></i>\n";
responseStream << "\t\t\t\t\t"; responseStream << "\t\t\t\t\t";
#line 182 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 183 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Transaktion unterzeichnen") ); responseStream << ( gettext("Transaktion unterzeichnen") );
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t\t\t </button>\n"; responseStream << "\t\t\t\t </button>\n";
responseStream << "\t\t\t\t <button type=\"submit\" class=\"btn btn-sm btn-warning\" name=\"abort\" value=\"abort\">\n"; responseStream << "\t\t\t\t <button type=\"submit\" class=\"btn btn-sm btn-warning\" name=\"abort\" value=\"abort\">\n";
responseStream << "\t\t\t\t\t<i class=\"mdi mdi-delete\"></i>\n"; responseStream << "\t\t\t\t\t<i class=\"mdi mdi-delete\"></i>\n";
responseStream << "\t\t\t\t\t"; responseStream << "\t\t\t\t\t";
#line 186 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 187 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
responseStream << ( gettext("Transaktion verwerfen") ); responseStream << ( gettext("Transaktion verwerfen") );
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t\t\t </button>\n"; responseStream << "\t\t\t\t </button>\n";
@ -487,7 +488,7 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
responseStream << "\t </div>\n"; responseStream << "\t </div>\n";
responseStream << "\t</div>\n"; responseStream << "\t</div>\n";
responseStream << "</div>\n"; responseStream << "</div>\n";
#line 195 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 196 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
} // begin include footer_ripple.cpsp } // begin include footer_ripple.cpsp
responseStream << "\t</div>\n"; responseStream << "\t</div>\n";
responseStream << " </div>\n"; responseStream << " </div>\n";

50
src/cpp/JSONInterface/JsonGetRunningUserTasks.cpp
View File

@ -7,9 +7,29 @@ Poco::JSON::Object* JsonGetRunningUserTasks::handle(Poco::Dynamic::Var params)
{ {
std::string email; std::string email;
Poco::JSON::Object* result = new Poco::JSON::Object; Poco::JSON::Object* result = new Poco::JSON::Object;
if (params.isStruct()) { bool parameterReaded = false;
// if is json object
if (params.type() == typeid(Poco::JSON::Object::Ptr)) {
Poco::JSON::Object::Ptr paramJsonObject = params.extract<Poco::JSON::Object::Ptr>();
/// Throws a RangeException if the value does not fit
/// into the result variable.
/// Throws a NotImplementedException if conversion is
/// not available for the given type.
/// Throws InvalidAccessException if Var is empty.
try {
paramJsonObject->get("email").convert(email);
parameterReaded = true;
}
catch (Poco::Exception& ex) {
printf("[JsonGetRunningUserTasks::handle] try to use params as jsonObject: %s\n", ex.displayText().data());
result->set("state", "error");
result->set("msg", "json exception");
result->set("details", ex.displayText());
}
}
else if (params.isStruct()) {
auto _email = params["email"]; auto _email = params["email"];
int zahl = 0; parameterReaded = true;
//std::string miau = params["miau"]; //std::string miau = params["miau"];
} }
else if (params.isVector()) { else if (params.isVector()) {
@ -20,9 +40,31 @@ Poco::JSON::Object* JsonGetRunningUserTasks::handle(Poco::Dynamic::Var params)
break; break;
} }
} }
parameterReaded = true;
}
else if (params.isArray()) {
result->set("state", "error");
result->set("msg", "array not implemented yet");
}
else if (params.isList()) {
result->set("state", "error");
result->set("msg", "list not implemented yet");
}
else if (params.isString()) {
result->set("state", "error");
result->set("msg", "string not implemented yet");
}
else if (params.isDeque()) {
result->set("state", "error");
result->set("msg", "deque not implemented yet");
}
else {
result->set("state", "error");
result->set("msg", "format not implemented");
result->set("details", std::string(params.type().name()));
} }
if (email != "") { if (parameterReaded && email != "") {
auto ob = SingletonTaskObserver::getInstance(); auto ob = SingletonTaskObserver::getInstance();
auto tasks = ob->getTasksCount(email); auto tasks = ob->getTasksCount(email);
Poco::JSON::Object tasksJson; Poco::JSON::Object tasksJson;
@ -38,7 +80,7 @@ Poco::JSON::Object* JsonGetRunningUserTasks::handle(Poco::Dynamic::Var params)
result->set("state", "success"); result->set("state", "success");
result->set("runningTasks", tasksJson); result->set("runningTasks", tasksJson);
} }
else { else if(parameterReaded) {
result->set("state", "error"); result->set("state", "error");
result->set("msg", "empty email"); result->set("msg", "empty email");
} }

5
src/cpp/SingletonManager/SingletonTaskObserver.cpp
View File

@ -46,6 +46,9 @@ void SingletonTaskObserver::addTask(const std::string& email, TaskObserverType t
em->addError(new ParamError(funcName, "and ", entry->mEmail.data())); em->addError(new ParamError(funcName, "and ", entry->mEmail.data()));
em->sendErrorsAsEmail(); em->sendErrorsAsEmail();
} }
if (entry->mEmail == "") {
entry->mEmail = email;
}
entry->mTasksCount[type]++; entry->mTasksCount[type]++;
unlock(); unlock();
} }
@ -162,7 +165,7 @@ int SingletonTaskObserver::getTaskCount(const std::string& email, TaskObserverTy
lock("SingletonTaskObserver::getTaskCount"); lock("SingletonTaskObserver::getTaskCount");
UserObserverEntry* entry = static_cast<UserObserverEntry*>(mObserverEntrys.findByHash(id)); UserObserverEntry* entry = static_cast<UserObserverEntry*>(mObserverEntrys.findByHash(id));
if (!entry || entry->mEmail != email) { if (!entry || (entry->mEmail != "" && entry->mEmail != email)) {
unlock(); unlock();
return -1; return -1;
} }

2
src/cpp/lib/JsonRequest.cpp
View File

@ -37,7 +37,7 @@ JsonRequestReturn JsonRequest::request(const char* methodName, const Poco::Net::
try { try {
Profiler phpRequestTime; Profiler phpRequestTime;
Poco::Net::HTTPSClientSession httpsClientSession(mServerHost, mServerPort); Poco::Net::HTTPSClientSession httpsClientSession(mServerHost, mServerPort);
Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, "/TransactionJsonRequestHandler"); Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, "/JsonRequestHandler");
request.setChunkedTransferEncoding(true); request.setChunkedTransferEncoding(true);
std::ostream& requestStream = httpsClientSession.sendRequest(request); std::ostream& requestStream = httpsClientSession.sendRequest(request);

15
src/cpp/model/Session.cpp
View File

@ -103,9 +103,9 @@ void Session::reset()
//printf("[Session::reset]\n"); //printf("[Session::reset]\n");
lock("Session::reset"); lock("Session::reset");
mSessionUser = nullptr; mSessionUser.assign(nullptr);
mNewUser = nullptr; mNewUser.assign(nullptr);
mEmailVerificationCodeObject = nullptr; mEmailVerificationCodeObject.assign(nullptr);
// watch out // watch out
//updateTimeout(); //updateTimeout();
@ -115,7 +115,6 @@ void Session::reset()
mPassphrase = ""; mPassphrase = "";
mClientLoginIP = Poco::Net::IPAddress(); mClientLoginIP = Poco::Net::IPAddress();
mEmailVerificationCodeObject = nullptr;
unlock(); unlock();
//printf("[Session::reset] finished\n"); //printf("[Session::reset] finished\n");
} }
@ -336,7 +335,7 @@ int Session::updateEmailVerification(Poco::UInt64 emailVerificationCode)
if (emailVerificationCodeModel->getType() == model::table::EMAIL_OPT_IN_RESET_PASSWORD) { if (emailVerificationCodeModel->getType() == model::table::EMAIL_OPT_IN_RESET_PASSWORD) {
unlock(); unlock();
if (mEmailVerificationCodeObject->deleteFromDB()) { if (mEmailVerificationCodeObject->deleteFromDB()) {
mEmailVerificationCodeObject = nullptr; mEmailVerificationCodeObject.assign(nullptr);
} }
else { else {
em->getErrors(mEmailVerificationCodeObject->getModel()); em->getErrors(mEmailVerificationCodeObject->getModel());
@ -528,7 +527,7 @@ void Session::finalizeTransaction(bool sign, bool reject)
signingTransaction->scheduleTask(signingTransaction); signingTransaction->scheduleTask(signingTransaction);
} }
} }
mCurrentActiveProcessingTransaction = nullptr; mCurrentActiveProcessingTransaction.assign(nullptr);
unlock(); unlock();
} }
@ -575,8 +574,8 @@ UserStates Session::loadUser(const std::string& email, const std::string& passwo
//Profiler usedTime; //Profiler usedTime;
lock("Session::loadUser"); lock("Session::loadUser");
if (mSessionUser && mSessionUser->getEmail() != email) { if (mSessionUser && mSessionUser->getEmail() != email) {
mSessionUser = nullptr; mSessionUser.assign(nullptr);
mNewUser = nullptr; mNewUser.assign(nullptr);
} }
//if (!mSessionUser) { //if (!mSessionUser) {
if (mNewUser.isNull()) { if (mNewUser.isNull()) {

2
src/cpp/tasks/ProcessingTransaction.cpp
View File

@ -28,7 +28,7 @@ ProcessingTransaction::~ProcessingTransaction()
} }
auto observer = SingletonTaskObserver::getInstance(); auto observer = SingletonTaskObserver::getInstance();
if (mUserEmailHash != 0) { if (mUserEmailHash != 0) {
observer->addTask(mUserEmailHash, TASK_OBSERVER_PREPARE_TRANSACTION); observer->removeTask(mUserEmailHash, TASK_OBSERVER_PREPARE_TRANSACTION);
} }
unlock(); unlock();
} }

5
src/cpp/tasks/SigningTransaction.cpp
View File

@ -30,6 +30,7 @@ SigningTransaction::SigningTransaction(Poco::AutoPtr<ProcessingTransaction> proc
SigningTransaction::~SigningTransaction() SigningTransaction::~SigningTransaction()
{ {
auto ob = SingletonTaskObserver::getInstance(); auto ob = SingletonTaskObserver::getInstance();
//Poco::Thread::sleep(10000);
if (!mUser.isNull() && mUser->getEmail() != "") { if (!mUser.isNull() && mUser->getEmail() != "") {
ob->removeTask(mUser->getEmail(), TASK_OBSERVER_SIGN_TRANSACTION); ob->removeTask(mUser->getEmail(), TASK_OBSERVER_SIGN_TRANSACTION);
} }
@ -135,7 +136,7 @@ int SigningTransaction::run() {
try { try {
Profiler phpRequestTime; Profiler phpRequestTime;
Poco::Net::HTTPSClientSession httpsClientSession(ServerConfig::g_php_serverHost, 443); Poco::Net::HTTPSClientSession httpsClientSession(ServerConfig::g_php_serverHost, 443);
Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, "/TransactionJsonRequestHandler"); Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, "/JsonRequestHandler");
request.setChunkedTransferEncoding(true); request.setChunkedTransferEncoding(true);
std::ostream& requestStream = httpsClientSession.sendRequest(request); std::ostream& requestStream = httpsClientSession.sendRequest(request);
@ -198,7 +199,7 @@ int SigningTransaction::run() {
return -8; return -8;
} }
//Poco::Thread::sleep(10000);
return 0; return 0;
} }

5
src/cpsp/checkTransaction.cpsp
View File

@ -50,15 +50,16 @@ enum PageState {
size_t notReadyTransactions = 0; size_t notReadyTransactions = 0;
size_t sumTransactions = mSession->getProcessingTransactionCount(); size_t sumTransactions = mSession->getProcessingTransactionCount();
if(sumTransactions == 0) { if(sumTransactions == 0) {
auto observer = SingletonTaskObserver::getInstance(); /*auto observer = SingletonTaskObserver::getInstance();
auto emailHash = DRMakeStringHash(mSession->getUser()->getEmail()); auto emailHash = DRMakeStringHash(mSession->getUser()->getEmail());
int breakCount = 0; int breakCount = 0;
while(observer->getTaskCount(emailHash, TASK_OBSERVER_SIGN_TRANSACTION) > 0) { while(observer->getTaskCount(emailHash, TASK_OBSERVER_SIGN_TRANSACTION) > 0) {
if(breakCount > 100) break; if(breakCount > 100) break;
breakCount++; breakCount++;
Poco::Thread::sleep(10); Poco::Thread::sleep(10);
} }*/
auto lastExternReferer = mSession->getLastReferer(); auto lastExternReferer = mSession->getLastReferer();
//lastExternReferer = "";
if(lastExternReferer != "") { if(lastExternReferer != "") {
printf("last extern referer: %s\n", lastExternReferer.data()); printf("last extern referer: %s\n", lastExternReferer.data());
response.redirect(lastExternReferer); response.redirect(lastExternReferer);