Always just defer call to the active UserManager or error in UserDB.

- Having an optional separate User list in UserDB when there is no
UserManager can lead to subtle bugs, so it got removed.
- It also had other limitations, like it was not possible to setup Users
properly, which could also lead to subtle bugs.

modules/users/singleton/user_db.cpp

@@ -35,149 +35,49 @@
 #include "../users/user.h"
 
 Ref<User> UserDB::get_user(const int id) {
-	if (_user_manager) {
+	ERR_FAIL_COND_V(!_user_manager, Ref<User>());
+
 	return _user_manager->get_user(id);
 }
-
-	ERR_FAIL_INDEX_V(id, _users.size(), Ref<User>());
-
-	_lock.read_lock();
-	Ref<User> u = _users[id];
-	_lock.read_unlock();
-
-	return u;
-}
 Ref<User> UserDB::get_user_name(const String &user_name) {
-	if (_user_manager) {
+	ERR_FAIL_COND_V(!_user_manager, Ref<User>());
+
 	return _user_manager->get_user_name(user_name);
 }
-
-	_lock.read_lock();
-
-	for (int i = 0; i < _users.size(); ++i) {
-		Ref<User> u = _users[i];
-
-		if (u.is_valid()) {
-			if (u->get_user_name() == user_name) {
-				_lock.read_unlock();
-				return u;
-			}
-		}
-	}
-
-	_lock.read_unlock();
-
-	return Ref<User>();
-}
 Ref<User> UserDB::get_user_email(const String &user_email) {
-	if (_user_manager) {
+	ERR_FAIL_COND_V(!_user_manager, Ref<User>());
+
 	return _user_manager->get_user_email(user_email);
 }
-
-	_lock.read_lock();
-
-	for (int i = 0; i < _users.size(); ++i) {
-		Ref<User> u = _users[i];
-
-		if (u.is_valid()) {
-			if (u->get_email() == user_email) {
-				_lock.read_unlock();
-				return u;
-			}
-		}
-	}
-
-	_lock.read_unlock();
-
-	return Ref<User>();
-}
 void UserDB::save_user(const Ref<User> &user) {
-	if (_user_manager) {
+	ERR_FAIL_COND(!_user_manager);
+
 	_user_manager->save_user(user);
 }
-}
 
 Ref<User> UserDB::create_user() {
-	if (_user_manager) {
+	ERR_FAIL_COND_V(!_user_manager, Ref<User>());
+
 	return _user_manager->create_user();
 }
 
-	Ref<User> user;
-	user.instance();
-
-	_lock.write_lock();
-	user->set_user_id(_users.size());
-	_users.push_back(user);
-	_lock.write_unlock();
-
-	return user;
-}
-
 bool UserDB::is_username_taken(const String &user_name) {
-	if (_user_manager) {
+	ERR_FAIL_COND_V(!_user_manager, false);
+
 	return _user_manager->is_username_taken(user_name);
 }
-
-	_lock.read_lock();
-
-	for (int i = 0; i < _users.size(); ++i) {
-		Ref<User> u = _users[i];
-
-		if (u.is_valid()) {
-			if (u->get_user_name() == user_name) {
-				_lock.read_unlock();
-				return true;
-			}
-		}
-	}
-
-	_lock.read_unlock();
-
-	return false;
-}
 bool UserDB::is_email_taken(const String &email) {
-	if (_user_manager) {
+	ERR_FAIL_COND_V(!_user_manager, false);
+
 	return _user_manager->is_email_taken(email);
 }
 
-	_lock.read_lock();
-
-	for (int i = 0; i < _users.size(); ++i) {
-		Ref<User> u = _users[i];
-
-		if (u.is_valid()) {
-			if (u->get_email() == email) {
-				_lock.read_unlock();
-				return true;
-			}
-		}
-	}
-
-	_lock.read_unlock();
-
-	return false;
-}
-
 Array UserDB::get_all_users() {
-	if (_user_manager) {
+	ERR_FAIL_COND_V(!_user_manager, Array());
+
 	return _user_manager->get_all_users();
 }
 
-	Array ret;
-
-	_lock.read_lock();
-
-	ret.resize(_users.size());
-
-	for (int i = 0; i < _users.size(); ++i) {
-		ret[i] = Variant(_users[i].get_ref_ptr());
-	}
-
-	_lock.read_unlock();
-
-	return ret;
-}
-
 UserManager *UserDB::get_user_manager() {
 	return _user_manager;
 }

modules/users/singleton/user_db.h

@@ -86,7 +86,6 @@ protected:
 
 	static UserDB *_self;
 
-	Vector<Ref<User>> _users;
 	RWLock _lock;
 };