Relintai/rcpp_framework
1
0
Fork 0
mirror of https://github.com/Relintai/rcpp_framework.git synced 2024-11-14 04:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Postfix the fields in User with "ui" that are input from the user.

Browse Source
This commit is contained in:
Relintai 2021-08-20 13:08:15 +02:00
parent 78bf94ffb4
commit af9979d9a7
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/users/db_based_user.cpp
View File

@ -14,8 +14,8 @@ void DBBasedUser::save() {
b->insert(_table_name, "username, email, rank, pre_salt, post_salt, password_hash, banned, password_reset_token, locked"); b->insert(_table_name, "username, email, rank, pre_salt, post_salt, password_hash, banned, password_reset_token, locked");
b->values(); b->values();
b->eval(name); b->eval(nameui);
b->eval(email); b->eval(emailui);
b->val(rank); b->val(rank);
b->val(pre_salt); b->val(pre_salt);
b->val(post_salt); b->val(post_salt);
@ -37,8 +37,8 @@ void DBBasedUser::save() {
} else { } else {
b->udpate(_table_name); b->udpate(_table_name);
b->set(); b->set();
b->esetp("username", name); b->esetp("username", nameui);
b->esetp("email", email); b->esetp("email", emailui);
b->setp("rank", rank); b->setp("rank", rank);
b->setp("pre_salt", pre_salt); b->setp("pre_salt", pre_salt);
b->setp("post_salt", post_salt); b->setp("post_salt", post_salt);
@ -98,8 +98,8 @@ void DBBasedUser::load() {
QueryResult *r = b->run(); QueryResult *r = b->run();
if (r->next_row()) { if (r->next_row()) {
name = r->get_cell(0); nameui = r->get_cell(0);
email = r->get_cell(1); emailui = r->get_cell(1);
rank = r->get_cell_int(2); rank = r->get_cell_int(2);
pre_salt = r->get_cell(3); pre_salt = r->get_cell(3);
post_salt = r->get_cell(4); post_salt = r->get_cell(4);

10
modules/users/file_based_user.cpp
View File

@ -24,15 +24,15 @@ void FileBasedUser::set_path(const std::string &path) {
void FileBasedUser::save() { void FileBasedUser::save() {
//todo sanitize name! //todo sanitize name!
_file_path = _path + name; _file_path = _path + nameui;
rapidjson::Document document; rapidjson::Document document;
document.SetObject(); document.SetObject();
document.AddMember("id", id, document.GetAllocator()); document.AddMember("id", id, document.GetAllocator());
document.AddMember("name", rapidjson::Value(name.c_str(), document.GetAllocator()), document.GetAllocator()); document.AddMember("name", rapidjson::Value(nameui.c_str(), document.GetAllocator()), document.GetAllocator());
document.AddMember("email", rapidjson::Value(email.c_str(), document.GetAllocator()), document.GetAllocator()); document.AddMember("email", rapidjson::Value(emailui.c_str(), document.GetAllocator()), document.GetAllocator());
document.AddMember("rank", rank, document.GetAllocator()); document.AddMember("rank", rank, document.GetAllocator());
document.AddMember("pre_salt", rapidjson::Value(pre_salt.c_str(), document.GetAllocator()), document.GetAllocator()); document.AddMember("pre_salt", rapidjson::Value(pre_salt.c_str(), document.GetAllocator()), document.GetAllocator());
document.AddMember("post_salt", rapidjson::Value(post_salt.c_str(), document.GetAllocator()), document.GetAllocator()); document.AddMember("post_salt", rapidjson::Value(post_salt.c_str(), document.GetAllocator()), document.GetAllocator());
@ -94,8 +94,8 @@ void FileBasedUser::load() {
rapidjson::Value uobj = data.GetObject(); rapidjson::Value uobj = data.GetObject();
id = uobj["id"].GetInt(); id = uobj["id"].GetInt();
name = uobj["name"].GetString(); nameui = uobj["name"].GetString();
email = uobj["email"].GetString(); emailui = uobj["email"].GetString();
rank = uobj["rank"].GetInt(); rank = uobj["rank"].GetInt();
pre_salt = uobj["pre_salt"].GetString(); pre_salt = uobj["pre_salt"].GetString();
post_salt = uobj["post_salt"].GetString(); post_salt = uobj["post_salt"].GetString();

10
modules/users/user.cpp
View File

@ -43,8 +43,8 @@ bool User::check_password(const std::string &p_password) {
void User::create_password(const std::string &p_password) { void User::create_password(const std::string &p_password) {
//todo improve a bit //todo improve a bit
pre_salt = hash_password(name + email); pre_salt = hash_password(nameui + emailui);
post_salt = hash_password(email + name); post_salt = hash_password(emailui + nameui);
password_hash = hash_password(p_password); password_hash = hash_password(p_password);
} }
@ -238,7 +238,7 @@ void User::handle_register_request_default(Request *request) {
continue; continue;
} }
if (u->email == email_val) { if (u->emailui == email_val) {
email_found = true; email_found = true;
break; break;
} }
@ -255,8 +255,8 @@ void User::handle_register_request_default(Request *request) {
if (error_str.size() == 0) { if (error_str.size() == 0) {
user = UserManager::get_singleton()->create_user(); user = UserManager::get_singleton()->create_user();
user->name = uname_val; user->nameui = uname_val;
user->email = email_val; user->emailui = email_val;
//todo //todo
user->rank = 1; user->rank = 1;
user->create_password(pass_val); user->create_password(pass_val);

4
modules/users/user.h
View File

@ -13,8 +13,8 @@ class User : public Object {
public: public:
int id; int id;
std::string name; std::string nameui;
std::string email; std::string emailui;
int rank; int rank;
std::string pre_salt; std::string pre_salt;
std::string post_salt; std::string post_salt;

4
modules/users/user_manager.cpp
View File

@ -15,7 +15,7 @@ void UserManager::add_user(User *user) {
std::lock_guard<std::mutex> lock(_mutex); std::lock_guard<std::mutex> lock(_mutex);
_users_vec.push_back(user); _users_vec.push_back(user);
_users[user->name] = user; _users[user->nameui] = user;
} }
void UserManager::remove_user(User *user) { void UserManager::remove_user(User *user) {
@ -26,7 +26,7 @@ void UserManager::remove_user(User *user) {
std::lock_guard<std::mutex> lock(_mutex); std::lock_guard<std::mutex> lock(_mutex);
_users.erase(user->name); _users.erase(user->nameui);
for (int i = 0; i < _users_vec.size(); ++i) { for (int i = 0; i < _users_vec.size(); ++i) {
if (_users_vec[i] == user) { if (_users_vec[i] == user) {