From 7f7b363c9ce25567438440f419b297b3ffa1d7f9 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Fri, 23 Apr 2021 17:21:23 +0200 Subject: [PATCH 1/5] fix empty reply by empty group_id --- .../src/cpp/JSONInterface/JsonUnsecureLogin.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp b/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp index 07aa9e1d3..5eba547d0 100644 --- a/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp +++ b/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp @@ -79,6 +79,8 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params) USER_DISABLED */ auto user_state = session->loadUser(email, password); + auto user_model = session->getNewUser()->getModel(); + Poco::JSON::Array infos; switch (user_state) { case USER_EMPTY: @@ -98,6 +100,10 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params) result->set("state", "disabled"); result->set("msg", "user is disabled"); break; + case USER_NO_GROUP: + user_model->setGroupId(1); + user_model->updateIntoDB("group_id", 1); + infos.add("set user.group_id to default group_id = 1"); case USER_NO_PRIVATE_KEY: case USER_COMPLETE: case USER_EMAIL_NOT_ACTIVATED: @@ -105,7 +111,14 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params) result->set("user", session->getNewUser()->getJson()); result->set("session_id", session->getHandle()); session->setClientIp(mClientIP); + if(infos.size() > 0) { + result->set("info", infos); + } return result; + default: + result->set("state", "error"); + result->set("msg", "unknown user state"); + result->set("details", USER_NO_GROUP); } sm->releaseSession(session); From 92ba58858d1bde88df3689527b65302631af8270 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 26 Apr 2021 14:23:18 +0200 Subject: [PATCH 2/5] fix bug #221 --- .../src/components/SidebarPlugin/SideBar.vue | 2 +- frontend/src/views/KontoOverview/GddSend.vue | 25 +++++++++++++------ frontend/src/views/KontoOverview/GddTable.vue | 11 +++----- frontend/src/views/Layout/DashboardNavbar.vue | 2 +- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue index 42d1e5fb1..65f92489b 100755 --- a/frontend/src/components/SidebarPlugin/SideBar.vue +++ b/frontend/src/components/SidebarPlugin/SideBar.vue @@ -58,7 +58,7 @@