From c42d6815674d2735f160d2863322acad1c723cc8 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 21 Apr 2021 18:32:46 +0200 Subject: [PATCH 1/3] add user.language as option --- docu/login_server.api.md | 2 ++ login_server/src/cpp/JSONInterface/JsonGetUserInfos.cpp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/docu/login_server.api.md b/docu/login_server.api.md index 57996d797..072cf89ab 100644 --- a/docu/login_server.api.md +++ b/docu/login_server.api.md @@ -235,6 +235,7 @@ with: "user.last_name", "user.disabled", "user.email_checked", + "user.language" ] } ``` @@ -269,6 +270,7 @@ Return only the fields which are defined in request - `user.disabled`: User will be disabled if he wants a account delete but has transactions. Until transactions are saved in real blockchain, we need this data because the public key is in db only saved in state_users so if we delete this entry, validating all transactions is no longer possible. Disabled User cannot login and cannot receive transactions. - `email_checked`: If user has clicked on link in verification email (register), can only transfer gradidos if email_checked is 1 +- `language`: Language Key for User, currently 'de' or 'en' - `errors`: array of strings if error occure ## Login by Email Verification Code diff --git a/login_server/src/cpp/JSONInterface/JsonGetUserInfos.cpp b/login_server/src/cpp/JSONInterface/JsonGetUserInfos.cpp index 7f13c7d29..2b1f229de 100644 --- a/login_server/src/cpp/JSONInterface/JsonGetUserInfos.cpp +++ b/login_server/src/cpp/JSONInterface/JsonGetUserInfos.cpp @@ -131,6 +131,9 @@ Poco::JSON::Object* JsonGetUserInfos::handle(Poco::Dynamic::Var params) auto email = user_model->getEmail(); jsonUser.set("identHash", DRMakeStringHash(email.data(), email.size())); } + else if (parameterString == "user.language") { + jsonUser.set("language", user_model->getLanguageKey()); + } } catch (Poco::Exception& ex) { jsonErrorsArray.add("ask parameter invalid"); From e16b6ec257ae125b7d9d399b3aa62245a9fc04ea Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 21 Apr 2021 19:30:59 +0200 Subject: [PATCH 2/3] Update docu/login_server.api.md Co-authored-by: Ulf Gebhardt --- docu/login_server.api.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docu/login_server.api.md b/docu/login_server.api.md index 072cf89ab..9bf08dfa7 100644 --- a/docu/login_server.api.md +++ b/docu/login_server.api.md @@ -304,7 +304,7 @@ In case of success returns: "public_hex": "131c7f68dd94b2be4c913400ff7ff4cdc03ac2bda99c2d29edcacb3b065c67e6", "role": "none", "username": "" - } + }, "session_id":1853761475 } ``` @@ -493,4 +493,4 @@ or: "state":"not found", "msg": "session not found" } -``` \ No newline at end of file +``` From 7226e6aab0ce570af818bc338574447e2dd01135 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 22 Apr 2021 11:54:19 +0200 Subject: [PATCH 3/3] Update docu/login_server.api.md Co-authored-by: Ulf Gebhardt --- docu/login_server.api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docu/login_server.api.md b/docu/login_server.api.md index 9bf08dfa7..1c3ceefc6 100644 --- a/docu/login_server.api.md +++ b/docu/login_server.api.md @@ -60,7 +60,7 @@ In case of success returns: "public_hex": "131c7f68dd94b2be4c913400ff7ff4cdc03ac2bda99c2d29edcacb3b065c67e6", "role": "none", "username": "" - } + }, "session_id": -127182, "clientIP":"123.123.123.123" }