Merged in wheel_login (pull request #120)
RTM - fix SPARK-1914 Approved-by: Eric Harding <eric.harding@bluetradesys.com>
This commit is contained in:
commit
8e75c80e02
1 file changed
+7
-6
@@ -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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user