From f2f06d76dedffb4430a8767423b34f938287a817 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Jul 2019 17:43:28 -0400 Subject: [PATCH] PR feedback --- src/lib/utils/AuthSessionManager.cpp | 8 ++++---- src/lib/utils/AuthToken.cpp | 13 +++---------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/lib/utils/AuthSessionManager.cpp b/src/lib/utils/AuthSessionManager.cpp index 6170fdb40..dddb415fd 100644 --- a/src/lib/utils/AuthSessionManager.cpp +++ b/src/lib/utils/AuthSessionManager.cpp @@ -86,7 +86,7 @@ bool AuthSessionManager::add_or_replace_session(const api::user::TokenPayload& t return true; if(datetime::ll_diff_in_us(datetime::ll_now(), _expiration) < 0) { - LOG(Gen,Error, "Your BTS Keycode is expired!"); + LOG(User,Error, "Your BTS Keycode is expired!"); if(msg) *msg = "Your BTS Keycode is EXPIRED! Please contact sales@bluetradesys.com"; return false; @@ -105,18 +105,18 @@ bool AuthSessionManager::add_or_replace_session(const api::user::TokenPayload& t if(it != _map.end()) { _map[tok.id()] = Session{tok}; - LOG(Gen, Warn, "KEYCODE: Replacing session {} ", tok.id()); + LOG(User, Warn, "KEYCODE: Replacing session {} ", tok.id()); return true; } else if(_map.size() < _nusers) { _map[tok.id()] = Session{tok}; - LOG(Gen, Warn, "KEYCODE: Creating session {} ", tok.id()); + LOG(User, Warn, "KEYCODE: Creating session {} ", tok.id()); return true; } if(msg) *msg = "KEYCODES: Not Enough Logins available for session"; - LOG(Gen, Error, "KEYCODES: Not Enough Logins available for session {}", tok.id()); + LOG(User, Error, "KEYCODES: Not Enough Logins available for session {}", tok.id()); return false; } diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index ebd753957..2423638a8 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -53,7 +53,6 @@ AuthSessionManager& session_manager() bool requires_auth_session(const admin::BTSUser& user) { - bool needs_session = false; //if the user can trade in any account or see market data, it needs a session if(user.has_user_data() && user.user_data().has_account_permissions() && @@ -62,10 +61,7 @@ bool requires_auth_session(const admin::BTSUser& user) for(const auto& i: user.user_data().account_permissions().account_permissions()) { if(i.second.has_trading_permission() && i.second.trading_permission().has_permissions()) - { - needs_session = true; - break; - } + return true; } } @@ -77,14 +73,11 @@ bool requires_auth_session(const admin::BTSUser& user) for(const auto& i: user.user_data().exchange_user_data().cme_data().md_permissions()) { if(i.enabled()) - { - needs_session = true; - break; - } + return true; } } } - return needs_session; + return false; } AuthToken generate_token(const admin::BTSUser& user, std::string* msg)