Few tweaks [skip ci]

This commit is contained in:
Akkadius 2019-07-09 17:22:11 -05:00
parent 86943ce6be
commit 193dbe5938
4 changed files with 20 additions and 16 deletions

View File

@ -105,19 +105,22 @@ bool AccountManagement::CreateLoginserverWorldAdminAccount(
return false; return false;
} }
if (server.db->CreateLoginserverWorldAdminAccount( uint32 created_world_admin_id = server.db->CreateLoginserverWorldAdminAccount(
username, username,
hash, hash,
first_name, first_name,
last_name, last_name,
email, email,
ip_address ip_address
)) { );
if (created_world_admin_id > 0) {
LogInfo( LogInfo(
"Account creation success for user [{0}] encryption algorithm [{1}] ({2})", "Account creation success for user [{0}] encryption algorithm [{1}] ({2}) new admin id [{3}]",
username, username,
GetEncryptionByModeId(mode), GetEncryptionByModeId(mode),
mode mode,
created_world_admin_id
); );
return true; return true;
} }

View File

@ -622,7 +622,7 @@ void Database::LoadLogSettings(EQEmuLogSys::LogSettings *log_settings)
* @param ip_address * @param ip_address
* @return * @return
*/ */
bool Database::CreateLoginserverWorldAdminAccount( uint32 Database::CreateLoginserverWorldAdminAccount(
const std::string &account_name, const std::string &account_name,
const std::string &account_password, const std::string &account_password,
const std::string &first_name, const std::string &first_name,
@ -645,7 +645,7 @@ bool Database::CreateLoginserverWorldAdminAccount(
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
return results.Success(); return (results.Success() ? results.LastInsertedID() : 0);
} }
/** /**

View File

@ -221,7 +221,7 @@ public:
* @param ip_address * @param ip_address
* @return * @return
*/ */
bool CreateLoginserverWorldAdminAccount( uint32 CreateLoginserverWorldAdminAccount(
const std::string &account_name, const std::string &account_name,
const std::string &account_password, const std::string &account_password,
const std::string &first_name, const std::string &first_name,

View File

@ -71,10 +71,10 @@ namespace LoginserverCommandHandler {
*/ */
std::map<std::string, void (*)(int argc, char **argv, argh::parser &cmd)> function_map; std::map<std::string, void (*)(int argc, char **argv, argh::parser &cmd)> function_map;
function_map["create-loginserver-api-token"] = &LoginserverCommandHandler::CreateLoginserverApiToken;
function_map["list-loginserver-api-tokens"] = &LoginserverCommandHandler::ListLoginserverApiTokens;
function_map["create-loginserver-account"] = &LoginserverCommandHandler::CreateLocalLoginserverAccount; function_map["create-loginserver-account"] = &LoginserverCommandHandler::CreateLocalLoginserverAccount;
function_map["create-loginserver-api-token"] = &LoginserverCommandHandler::CreateLoginserverApiToken;
function_map["create-loginserver-world-admin-account"] = &LoginserverCommandHandler::CreateLoginserverWorldAdminAccount; function_map["create-loginserver-world-admin-account"] = &LoginserverCommandHandler::CreateLoginserverWorldAdminAccount;
function_map["list-loginserver-api-tokens"] = &LoginserverCommandHandler::ListLoginserverApiTokens;
std::map<std::string, void (*)( std::map<std::string, void (*)(
int argc, int argc,
@ -153,14 +153,12 @@ namespace LoginserverCommandHandler {
*/ */
void ListLoginserverApiTokens(int argc, char **argv, argh::parser &cmd) void ListLoginserverApiTokens(int argc, char **argv, argh::parser &cmd)
{ {
for (auto it = server.token_manager->loaded_api_tokens.begin(); for (auto &it : server.token_manager->loaded_api_tokens) {
it != server.token_manager->loaded_api_tokens.end();
++it) {
LogInfo( LogInfo(
"token [{0}] can_write [{1}] can_read [{2}]", "token [{0}] can_write [{1}] can_read [{2}]",
it->second.token, it.second.token,
it->second.can_write, it.second.can_write,
it->second.can_read it.second.can_read
); );
} }
} }
@ -177,7 +175,10 @@ namespace LoginserverCommandHandler {
exit(1); exit(1);
} }
AccountManagement::CreateLocalLoginServerAccount(cmd("--username").str(), cmd("--password").str()); AccountManagement::CreateLocalLoginServerAccount(
cmd("--username").str(),
cmd("--password").str()
);
} }
/** /**