From 1d49721957f3e4acb42714560c9391826be6959b Mon Sep 17 00:00:00 2001 From: Dario Date: Mon, 7 Dec 2020 17:24:25 +0100 Subject: [PATCH] remove group from register --- src/cpp/HTTPInterface/RegisterDirectPage.cpp | 43 +++----------------- src/cpp/model/Session.cpp | 4 +- src/cpp/model/Session.h | 2 +- src/cpsp/registerDirect.cpsp | 22 +--------- 4 files changed, 11 insertions(+), 60 deletions(-) diff --git a/src/cpp/HTTPInterface/RegisterDirectPage.cpp b/src/cpp/HTTPInterface/RegisterDirectPage.cpp index 6aeb48c92..7e042c46a 100644 --- a/src/cpp/HTTPInterface/RegisterDirectPage.cpp +++ b/src/cpp/HTTPInterface/RegisterDirectPage.cpp @@ -43,22 +43,12 @@ void RegisterDirectPage::handleRequest(Poco::Net::HTTPServerRequest& request, Po session->setClientIp(user_host); response.addCookie(session->getLoginCookie()); } - auto group_id_string = form.get("register-group", "0"); - int group_id = 0; - if(!sm->isValid(group_id_string, VALIDATE_ONLY_INTEGER)) { - addError(new Error("Group id", "group_id not integer")); - } else { - if(DataTypeConverter::strToInt(group_id_string, group_id) != DataTypeConverter::NUMBER_PARSE_OKAY) { - addError(new Error("Int Convert Error", "Error converting group_id to int")); - } - } - + userReturned = session->createUserDirect( form.get("register-first-name", ""), form.get("register-last-name", ""), form.get("register-email", ""), - form.get("register-password", ""), - group_id + form.get("register-password", "") ); getErrors(session); @@ -78,7 +68,6 @@ void RegisterDirectPage::handleRequest(Poco::Net::HTTPServerRequest& request, Po sm->deleteLoginCookies(request, response); } - auto groups = controller::Group::listAll(); #line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" @@ -137,7 +126,7 @@ void RegisterDirectPage::handleRequest(Poco::Net::HTTPServerRequest& request, Po responseStream << " "; // end include header.cpsp responseStream << "\n"; -#line 68 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\registerDirect.cpsp" +#line 57 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\registerDirect.cpsp" responseStream << ( getErrorsHtml() ); responseStream << "\n"; responseStream << "
\n"; @@ -149,43 +138,23 @@ void RegisterDirectPage::handleRequest(Poco::Net::HTTPServerRequest& request, Po responseStream << "\t\t\t

Bitte gib deine Daten um einen Account anzulegen:

\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; - responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\n"; responseStream << "
\n"; diff --git a/src/cpp/model/Session.cpp b/src/cpp/model/Session.cpp index 336de07a0..1dcc75701 100644 --- a/src/cpp/model/Session.cpp +++ b/src/cpp/model/Session.cpp @@ -318,7 +318,7 @@ bool Session::createUser(const std::string& first_name, const std::string& last_ } -bool Session::createUserDirect(const std::string& first_name, const std::string& last_name, const std::string& email, const std::string& password, int groupId) +bool Session::createUserDirect(const std::string& first_name, const std::string& last_name, const std::string& email, const std::string& password) { std::unique_lock _lock(mSharedMutex); static const char* function_name = "Session::createUserDirect"; @@ -350,7 +350,7 @@ bool Session::createUserDirect(const std::string& first_name, const std::string& } // user - mNewUser = controller::User::create(email, first_name, last_name, groupId); + mNewUser = controller::User::create(email, first_name, last_name, 0); auto user_model = mNewUser->getModel(); user_model->insertIntoDB(true); auto user_id = user_model->getID(); diff --git a/src/cpp/model/Session.h b/src/cpp/model/Session.h index ca6365dff..b076fdc33 100644 --- a/src/cpp/model/Session.h +++ b/src/cpp/model/Session.h @@ -74,7 +74,7 @@ public: // ---------------- User functions ---------------------------- //! \brief new register function, without showing user pubkeys, using controller/user - bool createUserDirect(const std::string& first_name, const std::string& last_name, const std::string& email, const std::string& password, int groupId); + bool createUserDirect(const std::string& first_name, const std::string& last_name, const std::string& email, const std::string& password); // adminRegister without passwort diff --git a/src/cpsp/registerDirect.cpsp b/src/cpsp/registerDirect.cpsp index fa7681f9a..1a7c02819 100644 --- a/src/cpsp/registerDirect.cpsp +++ b/src/cpsp/registerDirect.cpsp @@ -27,22 +27,12 @@ session->setClientIp(user_host); response.addCookie(session->getLoginCookie()); } - auto group_id_string = form.get("register-group", "0"); - int group_id = 0; - if(!sm->isValid(group_id_string, VALIDATE_ONLY_INTEGER)) { - addError(new Error("Group id", "group_id not integer")); - } else { - if(DataTypeConverter::strToInt(group_id_string, group_id) != DataTypeConverter::NUMBER_PARSE_OKAY) { - addError(new Error("Int Convert Error", "Error converting group_id to int")); - } - } - + userReturned = session->createUserDirect( form.get("register-first-name", ""), form.get("register-last-name", ""), form.get("register-email", ""), - form.get("register-password", ""), - group_id + form.get("register-password", "") ); getErrors(session); @@ -62,7 +52,6 @@ sm->deleteLoginCookies(request, response); } - auto groups = controller::Group::listAll(); %><%@ include file="header.cpsp" %> <%= getErrorsHtml() %> @@ -83,13 +72,6 @@ -