diff --git a/modules/users/managers/user_manager.h b/modules/users/managers/user_manager.h index a3b04db41..bf9902b12 100644 --- a/modules/users/managers/user_manager.h +++ b/modules/users/managers/user_manager.h @@ -66,7 +66,7 @@ public: virtual bool _is_username_taken(const String &user_name); virtual bool _is_email_taken(const String &email); - virtual Vector> get_all_as_vector(); + Vector> get_all_as_vector(); Array get_all_users(); virtual Array _get_all_users(); diff --git a/modules/users/managers/user_manager_db.cpp b/modules/users/managers/user_manager_db.cpp index 7e15374cd..19a3f43e6 100644 --- a/modules/users/managers/user_manager_db.cpp +++ b/modules/users/managers/user_manager_db.cpp @@ -274,38 +274,6 @@ bool UserManagerDB::_is_email_taken(const String &email) { return r->next_row(); } -Vector> UserManagerDB::get_all_as_vector() { - Ref b = get_query_builder(); - - b->select("id, username, email, rank, pre_salt, post_salt, password_hash, banned, password_reset_token, locked"); - b->from(_database_table_name); - b->end_command(); - // b->print(); - - Vector> users; - - Ref r = b->run(); - - while (r->next_row()) { - Ref user = create_user(); - - user->set_user_id(r->get_cell_int(0)); - user->set_user_name(r->get_cell(1)); - user->set_email(r->get_cell(2)); - user->set_rank(r->get_cell_int(3)); - user->set_pre_salt(r->get_cell(4)); - user->set_post_salt(r->get_cell(5)); - user->set_password_hash(r->get_cell(6)); - user->set_banned(r->get_cell_bool(7)); - user->set_password_reset_token(r->get_cell(8)); - user->set_locked(r->get_cell_bool(9)); - - users.push_back(user); - } - - return users; -} - Array UserManagerDB::_get_all_users() { Ref b = get_query_builder(); diff --git a/modules/users/managers/user_manager_db.h b/modules/users/managers/user_manager_db.h index 8f1596e47..d8629e498 100644 --- a/modules/users/managers/user_manager_db.h +++ b/modules/users/managers/user_manager_db.h @@ -70,7 +70,6 @@ public: bool _is_username_taken(const String &user_name); bool _is_email_taken(const String &email); - Vector> get_all_as_vector(); Array _get_all_users(); void create_table(); diff --git a/modules/users/managers/user_manager_file.cpp b/modules/users/managers/user_manager_file.cpp index fe270bc1a..d6c5ed274 100644 --- a/modules/users/managers/user_manager_file.cpp +++ b/modules/users/managers/user_manager_file.cpp @@ -152,10 +152,6 @@ bool UserManagerFile::_is_email_taken(const String &email) { return false; } -Vector> UserManagerFile::get_all_as_vector() { - return _users; -} - Array UserManagerFile::_get_all_users() { Array ret; diff --git a/modules/users/managers/user_manager_file.h b/modules/users/managers/user_manager_file.h index 2c7eee853..b3e3e6b3f 100644 --- a/modules/users/managers/user_manager_file.h +++ b/modules/users/managers/user_manager_file.h @@ -59,7 +59,6 @@ public: bool _is_username_taken(const String &user_name); bool _is_email_taken(const String &email); - Vector> get_all_as_vector(); Array _get_all_users(); UserManagerFile(); diff --git a/modules/users/managers/user_manager_static.cpp b/modules/users/managers/user_manager_static.cpp index b42bea66a..17272ac8a 100644 --- a/modules/users/managers/user_manager_static.cpp +++ b/modules/users/managers/user_manager_static.cpp @@ -105,10 +105,6 @@ bool UserManagerStatic::_is_email_taken(const String &email) { return false; } -Vector> UserManagerStatic::get_all_as_vector() { - return _users; -} - Array UserManagerStatic::_get_all_users() { Array ret; diff --git a/modules/users/managers/user_manager_static.h b/modules/users/managers/user_manager_static.h index 360aee218..c821d1839 100644 --- a/modules/users/managers/user_manager_static.h +++ b/modules/users/managers/user_manager_static.h @@ -56,7 +56,6 @@ public: bool _is_username_taken(const String &user_name); bool _is_email_taken(const String &email); - Vector> get_all_as_vector(); Array _get_all_users(); Vector get_users();