From 4389e47cabd5ddf196c46eed4e55cd0968ba4071 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 12 Nov 2021 07:17:30 +0100 Subject: [PATCH] Adding a check that the user is activated before letting them login. --- login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp b/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp index 991e412a0..0e7df24e2 100644 --- a/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp +++ b/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp @@ -147,7 +147,6 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params) infos.add("set user.group_id to default group_id = 1"); case USER_NO_PRIVATE_KEY: case USER_COMPLETE: - case USER_EMAIL_NOT_ACTIVATED: result->set("state", "success"); result->set("user", session->getNewUser()->getJson()); result->set("session_id", session->getHandle()); @@ -158,6 +157,10 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params) AWAIT(hasElopageTask) result->set("hasElopage", hasElopageTask->hasElopage()); return result; + case USER_EMAIL_NOT_ACTIVATED: + result->set("state", "processing"); + result->set("msg", "user email not validated"); + break; default: result->set("state", "error"); result->set("msg", "unknown user state");