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

clean up things from old register process

Browse Source
This commit is contained in:
Dario 2020-06-20 12:21:07 +02:00
parent a0f88c548b
commit b4c0d6b062
5 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,17 +321,22 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
#line 180 "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 << " <a href=\"https://gradido.com\">";
responseStream << " <a href=\"";
#line 181 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( ServerConfig::g_serverPath );
responseStream << "/registerDirect\">\n";
responseStream << "\t\t\t\t\t\t";
#line 182 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("Create New Account") );
responseStream << "</a>\n";
responseStream << "\n";
responseStream << "\t\t\t\t\t </a>\n";
responseStream << " </div>\n";
responseStream << "\t\t\t\t\t<div class=\"reset-pwd-link\">\n";
responseStream << "\t\t\t\t\t\t<a href=\"";
#line 184 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
#line 186 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( ServerConfig::g_serverPath );
responseStream << "/resetPassword\">";
#line 184 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
#line 186 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("Passwort vergessen") );
responseStream << "</a>\n";
responseStream << "\t\t\t\t\t</div>\n";

41
src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp
View File

@ -35,6 +35,7 @@
#include "../SingletonManager/SessionManager.h"
#include "../lib/Profiler.h"
#include "../lib/DataTypeConverter.h"
#include "../ServerConfig.h"
#include "../Crypto/DRRandom.h"
@ -216,30 +217,8 @@ Poco::Net::HTTPRequestHandler* PageRequestHandlerFactory::createRequestHandler(c
}
}
auto sessionState = s->getSessionState();
printf("session state: %s\n", s->getSessionStateString());
if (url_first_part == "/updateUserPassword" && sessionState == SESSION_STATE_RESET_PASSWORD_REQUEST) {
auto pageRequestHandler = new UpdateUserPasswordPage(s);
pageRequestHandler->setProfiler(timeUsed);
return pageRequestHandler;
}
//printf("session state: %s\n", s->getSessionStateString());
if(sessionState == SESSION_STATE_EMAIL_VERIFICATION_CODE_CHECKED ||
sessionState == SESSION_STATE_PASSPHRASE_GENERATED ||
sessionState == SESSION_STATE_RESET_PASSWORD_REQUEST) {
//if (url_first_part == "/passphrase") {
//return handlePassphrase(s, request);
auto pageRequestHandler = new PassphrasePage(s);
pageRequestHandler->setProfiler(timeUsed);
return pageRequestHandler;
}
else if(sessionState == SESSION_STATE_PASSPHRASE_SHOWN) {
//else if (uri == "/saveKeys") {
auto pageRequestHandler = new SaveKeysPage(s);
pageRequestHandler->setProfiler(timeUsed);
return pageRequestHandler;
}
else if (sessionState == SESSION_STATE_RESET_PASSWORD_REQUEST) {
//
if (url_first_part == "/updateUserPassword") {
auto pageRequestHandler = new UpdateUserPasswordPage(s);
pageRequestHandler->setProfiler(timeUsed);
return pageRequestHandler;
@ -293,20 +272,8 @@ Poco::Net::HTTPRequestHandler* PageRequestHandlerFactory::handleCheckEmail(Sessi
// try to get code from uri parameter
if (!verificationCode) {
size_t pos = uri.find_last_of("/");
try {
auto str = uri.substr(pos + 1);
verificationCode = stoull(uri.substr(pos + 1));
} catch (const std::invalid_argument& ia) {
std::cerr << __FUNCTION__ << " Invalid argument: " << ia.what() << ", str: " << uri.substr(pos + 1) << '\n';
} catch (const std::out_of_range& oor) {
std::cerr << __FUNCTION__ << " Out of Range error: " << oor.what() << '\n';
}
catch (const std::logic_error & ler) {
std::cerr << __FUNCTION__ << " Logical error: " << ler.what() << '\n';
}
catch (...) {
std::cerr << __FUNCTION__ << " Unknown error" << '\n';
}
auto str = uri.substr(pos + 1);
DataTypeConverter::strToInt(str, verificationCode);
}
// if no verification code given or error with given code, show form

23
src/cpp/lib/DataTypeConverter.cpp
View File

@ -32,6 +32,29 @@ namespace DataTypeConverter
}
}
NumberParseState strToInt(const std::string& input, unsigned long long& result)
{
try {
result = stoull(input);
return NUMBER_PARSE_OKAY;
}
catch (const std::invalid_argument& ia)
{
printf("[strToInt] exception: invalid argument: %s\n", ia.what());
return NUMBER_PARSE_INVALID_ARGUMENT;
}
catch (const std::out_of_range& oor)
{
printf("[strToInt] exception: out or range: %s\n", oor.what());
return NUMBER_PARSE_OUT_OF_RANGE;
}
catch (const std::logic_error & ler)
{
printf("[strToInt] exception: logical error: %s\n", ler.what());
return NUMBER_PARSE_LOGIC_ERROR;
}
}
const char* numberParseStateToString(NumberParseState state)
{
switch (state) {

1
src/cpp/lib/DataTypeConverter.h
View File

@ -19,6 +19,7 @@ namespace DataTypeConverter {
};
NumberParseState strToInt(const std::string& input, int& result);
NumberParseState strToInt(const std::string& input, unsigned long long& result);
MemoryBin* hexToBin(const std::string& hexString);
MemoryBin* base64ToBin(const std::string& base64String);

4
src/cpsp/login.cpsp
View File

@ -178,7 +178,9 @@
<button type="submit" name="submit" class="btn btn-primary btn-block"><%= langCatalog->gettext(" Login ") %></button>
<div class="signup-link">
<p><%= langCatalog->gettext("You haven't any account yet? Please follow the link to create one.") %></p>
<a href="https://gradido.com"><%= langCatalog->gettext("Create New Account") %></a>
<a href="<%= ServerConfig::g_serverPath %>/registerDirect">
<%= langCatalog->gettext("Create New Account") %>
</a>
</div>
<div class="reset-pwd-link">
<a href="<%= ServerConfig::g_serverPath %>/resetPassword"><%= langCatalog->gettext("Passwort vergessen") %></a>