From 91cb215b09c910df728a1f9c725c46d88e1e6f23 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 4 Dec 2018 18:11:34 -0500 Subject: [PATCH] fix SPARK-1914 --- src/server/sparkd/user/UserServiceServer.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/server/sparkd/user/UserServiceServer.cpp b/src/server/sparkd/user/UserServiceServer.cpp index e1ffb1857..4c4e38206 100644 --- a/src/server/sparkd/user/UserServiceServer.cpp +++ b/src/server/sparkd/user/UserServiceServer.cpp @@ -60,17 +60,19 @@ void UserServiceServer::authenticate_login(const api::user::AuthenticateLoginReq me->admin.get_admin_data(vod, [=](const api::Result& admin_data) { api::user::AuthenticateLoginResponse resp; resp.set_is_valid(false); - if (admin_data.success()) { + if (admin_data.success()) + { for (const auto& user : admin_data.result()->users()) { - if (user.name() == req.login() && user.password() == req.password() && user.is_present()) { - resp.set_is_valid(user.is_active()); + if (user.name() == req.login() && user.password() == req.password() && user.is_present()) { + auto toke = api::auth::generate_token(user); + api::user::TokenPayload payload; + api::auth::decode_token(toke.token(), &payload); + + resp.set_is_valid(payload.wheel() || user.is_active()); if(!resp.is_valid()) resp.set_reason("User login privledges restricted, please contact your risk manager"); resp.set_user_id(user.id()); - resp.mutable_token()->CopyFrom(api::auth::generate_token(user)); - - api::user::TokenPayload payload; - api::auth::decode_token(resp.token().token(), &payload); + resp.mutable_token()->CopyFrom(toke); resp.set_can_create(payload.wheel() || user.can_create()); respond(resp); return;