From 07990db670d53114dcc44f25690bbe682abcedf1 Mon Sep 17 00:00:00 2001
From: Dario <dario.rekowski@gmx.de>
Date: Sun, 22 Mar 2020 17:03:13 +0100
Subject: [PATCH] update json get user infos

---
 src/cpp/JSONInterface/JsonGetUserInfos.cpp    | 67 ++++++++++---------
 .../JsonRequestHandlerFactory.cpp             |  2 +-
 2 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/cpp/JSONInterface/JsonGetUserInfos.cpp b/src/cpp/JSONInterface/JsonGetUserInfos.cpp
index 0d611f26e..b6d325c75 100644
--- a/src/cpp/JSONInterface/JsonGetUserInfos.cpp
+++ b/src/cpp/JSONInterface/JsonGetUserInfos.cpp
@@ -5,6 +5,8 @@
 #include "../controller/User.h"
 #include "../controller/EmailVerificationCode.h"
 
+#include "../ServerConfig.h"
+
 Poco::JSON::Object* JsonGetUserInfos::handle(Poco::Dynamic::Var params)
 {
 	/*
@@ -15,7 +17,7 @@ Poco::JSON::Object* JsonGetUserInfos::handle(Poco::Dynamic::Var params)
 	// incoming
 	int session_id = 0;
 	std::string email;
-	Poco::Dynamic::Var ask;
+	Poco::JSON::Array::Ptr askArray;
 
 	auto sm = SessionManager::getInstance();
 
@@ -30,7 +32,7 @@ Poco::JSON::Object* JsonGetUserInfos::handle(Poco::Dynamic::Var params)
 		try {
 			paramJsonObject->get("email").convert(email);
 			paramJsonObject->get("session_id").convert(session_id);
-			ask = paramJsonObject->get("ask");
+			askArray = paramJsonObject->getArray("ask");
 		}
 		catch (Poco::Exception& ex) {
 			return stateError("json exception", ex.displayText());
@@ -43,6 +45,9 @@ Poco::JSON::Object* JsonGetUserInfos::handle(Poco::Dynamic::Var params)
 	if (!session_id) {
 		return stateError("session_id invalid");
 	}
+	if (askArray.isNull()) {
+		return stateError("ask is zero or not an array");
+	}
 
 	auto session = sm->getSession(session_id);
 	if (!session) {
@@ -54,41 +59,41 @@ Poco::JSON::Object* JsonGetUserInfos::handle(Poco::Dynamic::Var params)
 		return customStateError("not found", "user not found");
 	}
 	auto userModel = user->getModel();
-	if (ask.isArray()) {
-		Poco::JSON::Object* result = new Poco::JSON::Object;
-		result->set("state", "success");
-		Poco::JSON::Array  jsonErrorsArray;
-		Poco::JSON::Object jsonUser;
 
-		for (auto it = ask.begin(); it != ask.end(); it++) {
-			auto parameter = *it;
-			if (parameter.isString()) {
-				std::string parameterString;
+	
+	Poco::JSON::Object* result = new Poco::JSON::Object;
+	result->set("state", "success");
+	Poco::JSON::Array  jsonErrorsArray;
+	Poco::JSON::Object jsonUser;
+	Poco::JSON::Object jsonServer;
+
+	for (auto it = askArray->begin(); it != askArray->end(); it++) {
+		auto parameter = *it;
+		std::string parameterString;
+		try {
+			parameter.convert(parameterString);
+			if (parameterString == "EmailVerificationCode.Register") {
 				try {
-					parameter.convert(parameterString);
-					if (parameterString == "EmailOptIn.Register") {
-						try {
-							auto emailVerificationCode = controller::EmailVerificationCode::load(
-								userModel->getID(), model::table::EMAIL_OPT_IN_REGISTER
-							);
-							jsonUser.set("verificationCode", std::to_string(emailVerificationCode->getModel()->getCode()));
-						}
-						catch (...) {
-
-						}
-
-					}
+					auto emailVerificationCode = controller::EmailVerificationCode::load(
+						userModel->getID(), model::table::EMAIL_OPT_IN_REGISTER
+					);
+					jsonUser.set("EmailVerificationCode.Register", std::to_string(emailVerificationCode->getModel()->getCode()));
 				}
 				catch (Poco::Exception& ex) {
-					jsonErrorsArray.add("ask parameter invalid");
+					printf("exception: %s\n", ex.displayText().data());
 				}
 			}
+			else if (parameterString == "loginServer.path") {
+				jsonServer.set("loginServer.path", ServerConfig::g_php_serverPath);
+			}
+		}
+		catch (Poco::Exception& ex) {
+			jsonErrorsArray.add("ask parameter invalid");
 		}
-		result->set("errors", jsonErrorsArray);
-		result->set("userData", jsonUser);
-		return result;
-	}
-	else {
-		return stateError("ask isn't a array");
 	}
+	result->set("errors", jsonErrorsArray);
+	result->set("userData", jsonUser);
+	result->set("server", jsonServer);
+	return result;
+	
 }
\ No newline at end of file
diff --git a/src/cpp/JSONInterface/JsonRequestHandlerFactory.cpp b/src/cpp/JSONInterface/JsonRequestHandlerFactory.cpp
index c1cac1bfc..c86ab0b15 100644
--- a/src/cpp/JSONInterface/JsonRequestHandlerFactory.cpp
+++ b/src/cpp/JSONInterface/JsonRequestHandlerFactory.cpp
@@ -45,7 +45,7 @@ Poco::Net::HTTPRequestHandler* JsonRequestHandlerFactory::createRequestHandler(c
 	else if (url_first_part == "/adminEmailVerificationResend") {
 		return new JsonAdminEmailVerificationResend;
 	}
-	else if (url_first_part == "/JsonGetUserInfos") {
+	else if (url_first_part == "/getUserInfos") {
 		return new JsonGetUserInfos;
 	}