From 593f8eab838fba89e9617a6e52dc825042a6ae6a Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 13 Jul 2021 17:42:18 +0200 Subject: [PATCH] handle empty host --- login_server/src/cpp/lib/JsonRequest.cpp | 4 ++++ login_server/src/cpp/lib/JsonRequest.h | 1 + .../JSONInterface/TestJsonCreateTransaction.cpp | 13 ++++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/login_server/src/cpp/lib/JsonRequest.cpp b/login_server/src/cpp/lib/JsonRequest.cpp index 411ec07a0..09bbffb1e 100644 --- a/login_server/src/cpp/lib/JsonRequest.cpp +++ b/login_server/src/cpp/lib/JsonRequest.cpp @@ -36,6 +36,10 @@ JsonRequestReturn JsonRequest::request(const char* methodName, const Poco::JSON: // send post request via https // 443 = HTTPS Default // TODO: adding port into ServerConfig + if (mServerHost.empty() || !mServerPort) { + addError(new Error(functionName, "server host or server port not given")); + return JSON_REQUEST_PARAMETER_ERROR; + } try { Profiler phpRequestTime; diff --git a/login_server/src/cpp/lib/JsonRequest.h b/login_server/src/cpp/lib/JsonRequest.h index cfb9055d5..43b60ca40 100644 --- a/login_server/src/cpp/lib/JsonRequest.h +++ b/login_server/src/cpp/lib/JsonRequest.h @@ -20,6 +20,7 @@ enum JsonRequestReturn JSON_REQUEST_RETURN_OK, JSON_REQUEST_RETURN_PARSE_ERROR, JSON_REQUEST_RETURN_ERROR, + JSON_REQUEST_PARAMETER_ERROR, JSON_REQUEST_CONNECT_ERROR }; diff --git a/login_server/src/cpp/test/JSONInterface/TestJsonCreateTransaction.cpp b/login_server/src/cpp/test/JSONInterface/TestJsonCreateTransaction.cpp index 81a6ab25b..2a51f8f2e 100644 --- a/login_server/src/cpp/test/JSONInterface/TestJsonCreateTransaction.cpp +++ b/login_server/src/cpp/test/JSONInterface/TestJsonCreateTransaction.cpp @@ -9,6 +9,7 @@ void TestJsonCreateTransaction::SetUp() mUserSession = sm->getNewSession(); auto user = controller::User::create(); user->load("Jeet_bb@gmail.com"); + user->login("TestP4ssword&H"); mUserSession->setUser(user); } @@ -25,7 +26,10 @@ Poco::JSON::Object::Ptr TestJsonCreateTransaction::basisSetup() { Poco::JSON::Object::Ptr params = new Poco::JSON::Object; params->set("session_id", mUserSession->getHandle()); - + params->set("blockchain_type", "mysql"); + params->set("memo", "Placolder for memo for test"); + params->set("auto_sign", true); + return params; } @@ -35,6 +39,13 @@ TEST_F(TestJsonCreateTransaction, Creation) auto params = basisSetup(); params->set("transaction_type", "creation"); + params->set("target_email", "Elfenhausen@arcor.de"); + params->set("amount", 10000000); + params->set("target_date", "2021-07-13T13:00:00"); auto result = jsonCall.handle(params); + std::stringstream ss; + result->stringify(ss); + printf("result: %s\n", ss.str().data()); + //*/ } \ No newline at end of file