diff --git a/src/server/sparkd/user/AuthServiceServer.cpp b/src/server/sparkd/user/AuthServiceServer.cpp index 48bb5cc64..13c05abf7 100644 --- a/src/server/sparkd/user/AuthServiceServer.cpp +++ b/src/server/sparkd/user/AuthServiceServer.cpp @@ -63,15 +63,16 @@ void AuthServiceServer::authenticate_login(const api::user::AuthenticateLoginReq if (admin_data.success()) { for (const auto& user : admin_data.value()->users()) { if (user.name() == req.login() && user.password() == req.password() && user.is_present()) { - resp.set_is_valid(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(), &payload); - resp.set_can_create(payload.wheel() || user.can_create()); + + resp.set_can_create(payload.wheel() || user.can_create()); + 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()); + respond(resp); return; }