Merge branch 'master' of ssh://**REDACTED**/~/_C++/gradido_login_server

dependencies/iroha-ed25519

@@ -1 +1 @@
-Subproject commit 7307ffb8a89d2459f0c07ea5cab27c0d3496df00
+Subproject commit a0977c22d23f7e8cb596f1d9d812de74115f407b

src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp

@@ -38,6 +38,7 @@ Poco::Net::HTTPRequestHandler* PageRequestHandlerFactory::createRequestHandler(c
 	}
 
 	if (url_first_part == "/elopage_webhook_261") {
+		printf("choose elopage\n");
 		return new ElopageWebhook;
 	}
 

src/cpp/ServerConfig.cpp

@@ -130,7 +130,7 @@ namespace ServerConfig {
 		}
 	}
 
-	void writeToFile(std::istream& datas, std::string& fileName)
+	void writeToFile(std::istream& datas, std::string fileName)
 	{
 		static Poco::Mutex mutex;
 

src/cpp/ServerConfig.h

@@ -36,7 +36,7 @@ namespace ServerConfig {
 	bool initEMailAccount(const Poco::Util::LayeredConfiguration& cfg);
 	bool initSSLClientContext();
 
-	void writeToFile(std::istream& datas, std::string& fileName);
+	void writeToFile(std::istream& datas, std::string fileName);
 
 	void unload();
 };

src/cpp/model/Session.cpp

@@ -298,11 +298,15 @@ bool Session::isPwdValid(const std::string& pwd)
 
 bool Session::loadUser(const std::string& email, const std::string& password)
 {
-	Profiler usedTime;
+	//Profiler usedTime;
+	if (email == "" || password == "") {
+		addError(new Error("Login", "Benutzernamen und Passwort müssen angegeben werden!"));
+		return false;
+	}
 	if (mSessionUser) mSessionUser = nullptr;
 	mSessionUser = new User(email.data());
 	if (!mSessionUser->validatePwd(password)) {
-		addError(new Error("Login", "E-Mail oder Passwort nicht korrekt, bitte versuche es erneut"));
+		addError(new Error("Login", "E-Mail oder Passwort nicht korrekt, bitte versuche es erneut!"));
 		return false;
 	}
 	detectSessionState();