From 7989cfabc473dc19593c1a12a2b19a27faf62438 Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 21 Jul 2022 17:43:35 +0200 Subject: [PATCH] Removed the user parameter from the User's hash methods. --- modules/users/users/user.cpp | 53 ++++++++++++++++-------------------- modules/users/users/user.h | 12 ++++---- 2 files changed, 29 insertions(+), 36 deletions(-) diff --git a/modules/users/users/user.cpp b/modules/users/users/user.cpp index 9bfae55c1..3d5c46b26 100644 --- a/modules/users/users/user.cpp +++ b/modules/users/users/user.cpp @@ -64,35 +64,28 @@ void User::set_locked(const bool &val) { _locked = val; } -bool User::check_password(const Ref &user, const String &p_password) { - return call("_check_password", user, p_password); +bool User::check_password(const String &p_password) { + return call("_check_password", p_password); } -void User::create_password(const Ref &user, const String &p_password) { - call("_create_password", user, p_password); +void User::create_password(const String &p_password) { + call("_create_password", p_password); } -String User::hash_password(const Ref &user, const String &p_password) { - return call("_hash_password", user, p_password); +String User::hash_password(const String &p_password) { + return call("_hash_password", p_password); } -bool User::_check_password(const Ref &user, const String &p_password) { - return hash_password(user, p_password) == user->get_password_hash(); +bool User::_check_password(const String &p_password) { + return hash_password(p_password) == get_password_hash(); } -void User::_create_password(Ref user, const String &p_password) { - if (!user.is_valid()) { - printf("Error UserManager::create_password !user.is_valid()!\n"); - return; - } - +void User::_create_password(const String &p_password) { // todo improve a bit - user->set_pre_salt(hash_password(user, user->get_name_user_input() + user->get_email_user_input())); - user->set_post_salt(hash_password(user, user->get_email_user_input() + user->get_name_user_input())); + set_pre_salt(hash_password(get_name_user_input() + get_email_user_input())); + set_post_salt(hash_password(get_email_user_input() + get_name_user_input())); - user->set_password_hash(hash_password(user, p_password)); + set_password_hash(hash_password(p_password)); } -String User::_hash_password(const Ref &user, const String &p_password) { - ERR_FAIL_COND_V(!user.is_valid(), ""); - - String p = user->get_pre_salt() + p_password + user->get_post_salt(); +String User::_hash_password(const String &p_password) { + String p = get_pre_salt() + p_password + get_post_salt(); return p.sha256_text(); } @@ -142,17 +135,17 @@ void User::_bind_methods() { ClassDB::bind_method(D_METHOD("set_locked", "val"), &User::set_locked); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "locked"), "set_locked", "get_locked"); - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "ret"), "_check_password", PropertyInfo(Variant::OBJECT, "user", PROPERTY_HINT_RESOURCE_TYPE, "User"), PropertyInfo(Variant::STRING, "password"))); - BIND_VMETHOD(MethodInfo("_create_password", PropertyInfo(Variant::OBJECT, "user", PROPERTY_HINT_RESOURCE_TYPE, "User"), PropertyInfo(Variant::STRING, "password"))); - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::STRING, "ret"), "_hash_password", PropertyInfo(Variant::OBJECT, "user", PROPERTY_HINT_RESOURCE_TYPE, "User"), PropertyInfo(Variant::STRING, "password"))); + BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "ret"), "_check_password", PropertyInfo(Variant::STRING, "password"))); + BIND_VMETHOD(MethodInfo("_create_password", PropertyInfo(Variant::STRING, "password"))); + BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::STRING, "ret"), "_hash_password", PropertyInfo(Variant::STRING, "password"))); - ClassDB::bind_method(D_METHOD("check_password", "user", "password"), &User::check_password); - ClassDB::bind_method(D_METHOD("create_password", "user", "password"), &User::create_password); - ClassDB::bind_method(D_METHOD("hash_password", "user", "password"), &User::hash_password); + ClassDB::bind_method(D_METHOD("check_password", "password"), &User::check_password); + ClassDB::bind_method(D_METHOD("create_password", "password"), &User::create_password); + ClassDB::bind_method(D_METHOD("hash_password", "password"), &User::hash_password); - ClassDB::bind_method(D_METHOD("_check_password", "user", "password"), &User::_check_password); - ClassDB::bind_method(D_METHOD("_create_password", "user", "password"), &User::_create_password); - ClassDB::bind_method(D_METHOD("_hash_password", "user", "password"), &User::_hash_password); + ClassDB::bind_method(D_METHOD("_check_password", "password"), &User::_check_password); + ClassDB::bind_method(D_METHOD("_create_password", "password"), &User::_create_password); + ClassDB::bind_method(D_METHOD("_hash_password", "password"), &User::_hash_password); BIND_ENUM_CONSTANT(PERMISSION_CREATE); BIND_ENUM_CONSTANT(PERMISSION_READ); diff --git a/modules/users/users/user.h b/modules/users/users/user.h index 5407a4ec0..514e591a3 100644 --- a/modules/users/users/user.h +++ b/modules/users/users/user.h @@ -48,13 +48,13 @@ public: bool get_locked() const; void set_locked(const bool &val); - bool check_password(const Ref &user, const String &p_password); - void create_password(const Ref &user, const String &p_password); - String hash_password(const Ref &user, const String &p_password); + bool check_password(const String &p_password); + void create_password(const String &p_password); + String hash_password(const String &p_password); - virtual bool _check_password(const Ref &user, const String &p_password); - virtual void _create_password(Ref user, const String &p_password); - virtual String _hash_password(const Ref &user, const String &p_password); + virtual bool _check_password(const String &p_password); + virtual void _create_password(const String &p_password); + virtual String _hash_password(const String &p_password); User(); ~User();