Cleaned up User, and added it ot the build.

modules/web/SCsub

@@ -48,6 +48,8 @@ sources = [
     "nodes/paged_article/paged_article.cpp",
     "nodes/paged_article/paged_articles.cpp",
     #"nodes/paged_article/paged_articles_md_index.cpp",
+
+    "nodes/users/user.cpp",
 ]
 
 if ARGUMENTS.get('custom_modules_shared', 'no') == 'yes':

modules/web/config.py

@@ -64,6 +64,8 @@ def get_doc_classes():
         "PagedArticle",
         "PagedArticles",
         "PagedArticlesMDIndex",
+
+        "User",
     ]
 
 

modules/web/nodes/users/user.cpp

@@ -1,107 +1,119 @@
 #include "user.h"
+#include "core/class_db.h"
 
-#include "rapidjson/document.h"
+String User::get_name_user_input() {
-#include "rapidjson/filewritestream.h"
+	return _name_user_input;
-#include "rapidjson/rapidjson.h"
+}
-#include "rapidjson/stringbuffer.h"
+void User::set_name_user_input(const String &val) {
-#include <rapidjson/writer.h>
+	_name_user_input = val;
-#include <tinydir/tinydir.h>
-#include <cstdio>
-
-#include "database/database_manager.h"
-#include "database/query_builder.h"
-#include "database/query_result.h"
-#include "database/table_builder.h"
-
-#include "web/html/form_validator.h"
-#include "web/html/html_builder.h"
-#include "web/http/cookie.h"
-#include "web/http/http_session.h"
-#include "web/http/request.h"
-#include "web/http/session_manager.h"
-#include "web/html/utils.h"
-
-String User::to_json(rapidjson::Document *into) {
-	rapidjson::Document *document;
-
-	if (into) {
-		document = into;
-	} else {
-		document = new rapidjson::Document();
-	}
-
-	document->SetObject();
-
-	document->AddMember("id", id, document->GetAllocator());
-
-	document->AddMember("name", rapidjson::Value(name_user_input.c_str(), document->GetAllocator()), document->GetAllocator());
-	document->AddMember("email", rapidjson::Value(email_user_input.c_str(), document->GetAllocator()), document->GetAllocator());
-	document->AddMember("rank", rank, 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("password_hash", rapidjson::Value(password_hash.c_str(), document->GetAllocator()), document->GetAllocator());
-	document->AddMember("banned", banned, document->GetAllocator());
-	document->AddMember("password_reset_token", rapidjson::Value(password_reset_token.c_str(), document->GetAllocator()), document->GetAllocator());
-	document->AddMember("locked", locked, document->GetAllocator());
-
-	if (into) {
-		return "";
-	}
-
-	rapidjson::StringBuffer buffer;
-	rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
-	document->Accept(writer);
-
-	String s = buffer.GetString();
-
-	delete document;
-
-	return s;
 }
 
-void User::from_json(const String &p_data) {
+String User::get_email_user_input() {
-
+	return _email_user_input;
-	rapidjson::Document data;
+}
-	data.Parse(p_data.c_str());
+void User::set_email_user_input(const String &val) {
-
+	_email_user_input = val;
-	rapidjson::Value uobj = data.GetObject();
-
-	id = uobj["id"].GetInt();
-	name_user_input = uobj["name"].GetString();
-	email_user_input = uobj["email"].GetString();
-	rank = uobj["rank"].GetInt();
-	pre_salt = uobj["pre_salt"].GetString();
-	post_salt = uobj["post_salt"].GetString();
-	password_hash = uobj["password_hash"].GetString();
-	banned = uobj["banned"].GetBool();
-
-	password_reset_token = uobj["password_reset_token"].GetString();
-	locked = uobj["locked"].GetBool();
 }
 
-int User::get_permissions(Request *request) {
+int User::get_rank() {
-	return PERMISSION_ALL;
+	return _rank;
+}
+void User::set_rank(const int &val) {
+	_rank = val;
 }
 
-bool User::has_permission(Request *request, const int permission) {
+String User::get_pre_salt() {
-	return true;
+	return _pre_salt;
+}
+void User::set_pre_salt(const String &val) {
+	_pre_salt = val;
 }
 
-int User::get_additional_permissions(Request *request) {
+String User::get_post_salt() {
-	return 0;
+	return _post_salt;
+}
+void User::set_post_salt(const String &val) {
+	_post_salt = val;
 }
 
-bool User::has_additional_permission(Request *request, const int permission) {
+String User::get_password_hash() {
-	return true;
+	return _password_hash;
+}
+void User::set_password_hash(const String &val) {
+	_password_hash = val;
 }
 
-User::User() :
+bool User::get_banned() {
-		Resource() {
+	return _banned;
+}
+void User::set_banned(const bool &val) {
+	_banned = val;
+}
 
-	rank = 0;
+String User::get_password_reset_token() {
-	banned = false;
+	return _password_reset_token;
-	locked = false;
+}
+void User::set_password_reset_token(const String &val) {
+	_password_reset_token = val;
+}
+
+bool User::get_locked() {
+	return _locked;
+}
+void User::set_locked(const bool &val) {
+	_locked = val;
+}
+
+User::User() {
+	_rank = 0;
+	_banned = false;
+	_locked = false;
 }
 
 User::~User() {
 }
+
+void User::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("get_name_user_input"), &User::get_name_user_input);
+	ClassDB::bind_method(D_METHOD("set_name_user_input", "val"), &User::set_name_user_input);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "name_user_input"), "set_name_user_input", "get_name_user_input");
+
+	ClassDB::bind_method(D_METHOD("get_email_user_input"), &User::get_email_user_input);
+	ClassDB::bind_method(D_METHOD("set_email_user_input", "val"), &User::set_email_user_input);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "email_user_input"), "set_email_user_input", "get_email_user_input");
+
+	ClassDB::bind_method(D_METHOD("get_rank"), &User::get_rank);
+	ClassDB::bind_method(D_METHOD("set_rank", "val"), &User::set_rank);
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "rank"), "set_rank", "get_rank");
+
+	ClassDB::bind_method(D_METHOD("get_pre_salt"), &User::get_pre_salt);
+	ClassDB::bind_method(D_METHOD("set_pre_salt", "val"), &User::set_pre_salt);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "pre_salt"), "set_pre_salt", "get_pre_salt");
+
+	ClassDB::bind_method(D_METHOD("get_post_salt"), &User::get_post_salt);
+	ClassDB::bind_method(D_METHOD("set_post_salt", "val"), &User::set_post_salt);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "post_salt"), "set_post_salt", "get_post_salt");
+
+	ClassDB::bind_method(D_METHOD("get_password_hash"), &User::get_password_hash);
+	ClassDB::bind_method(D_METHOD("set_password_hash", "val"), &User::set_password_hash);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "password_hash"), "set_password_hash", "get_password_hash");
+
+	ClassDB::bind_method(D_METHOD("get_banned"), &User::get_banned);
+	ClassDB::bind_method(D_METHOD("set_banned", "val"), &User::set_banned);
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "banned"), "set_banned", "get_banned");
+
+	ClassDB::bind_method(D_METHOD("get_password_reset_token"), &User::get_password_reset_token);
+	ClassDB::bind_method(D_METHOD("set_password_reset_token", "val"), &User::set_password_reset_token);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "password_reset_token"), "set_password_reset_token", "get_password_reset_token");
+
+	ClassDB::bind_method(D_METHOD("get_locked"), &User::get_locked);
+	ClassDB::bind_method(D_METHOD("set_locked", "val"), &User::set_locked);
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "locked"), "set_locked", "get_locked");
+
+	BIND_ENUM_CONSTANT(PERMISSION_CREATE);
+	BIND_ENUM_CONSTANT(PERMISSION_READ);
+	BIND_ENUM_CONSTANT(PERMISSION_UPDATE);
+	BIND_ENUM_CONSTANT(PERMISSION_DELETE);
+	BIND_ENUM_CONSTANT(PERMISSION_ALL);
+	BIND_ENUM_CONSTANT(PERMISSION_NONE);
+}

modules/web/nodes/users/user.h

@@ -1,17 +1,12 @@
 #ifndef USER_H
 #define USER_H
 
-#include "core/string.h"
+#include "core/ustring.h"
 
 #include "core/resource.h"
-#include "rapidjson/document.h"
-#include <mutex>
-
-class Request;
-class FormValidator;
 
 class User : public Resource {
-	RCPP_OBJECT(User, Resource);
+	GDCLASS(User, Resource);
 
 public:
 	enum Permissions {
@@ -24,26 +19,50 @@ public:
 		PERMISSION_NONE = 0
 	};
 
-	String name_user_input;
+	String get_name_user_input();
-	String email_user_input;
+	void set_name_user_input(const String &val);
-	int rank;
-	String pre_salt;
-	String post_salt;
-	String password_hash;
-	bool banned;
-	String password_reset_token;
-	bool locked;
 
-	String to_json(rapidjson::Document *into = nullptr);
+	String get_email_user_input();
-	void from_json(const String &data);
+	void set_email_user_input(const String &val);
 
-	virtual int get_permissions(Request *request);
+	int get_rank();
-	virtual bool has_permission(Request *request, const int permission);
+	void set_rank(const int &val);
-	virtual int get_additional_permissions(Request *request);
+
-	virtual bool has_additional_permission(Request *request, const int permission);
+	String get_pre_salt();
+	void set_pre_salt(const String &val);
+
+	String get_post_salt();
+	void set_post_salt(const String &val);
+
+	String get_password_hash();
+	void set_password_hash(const String &val);
+
+	bool get_banned();
+	void set_banned(const bool &val);
+
+	String get_password_reset_token();
+	void set_password_reset_token(const String &val);
+
+	bool get_locked();
+	void set_locked(const bool &val);
 
 	User();
 	~User();
+
+protected:
+	static void _bind_methods();
+
+	String _name_user_input;
+	String _email_user_input;
+	int _rank;
+	String _pre_salt;
+	String _post_salt;
+	String _password_hash;
+	bool _banned;
+	String _password_reset_token;
+	bool _locked;
 };
 
+VARIANT_ENUM_CAST(User::Permissions);
+
 #endif

modules/web/register_types.cpp

@@ -57,6 +57,8 @@ SOFTWARE.
 #include "nodes/paged_article/paged_articles.h"
 //#include "nodes/paged_article/paged_articles_md_index.h"
 
+#include "nodes/users/user.h"
+
 void register_web_types() {
 	ClassDB::register_class<_HTMLBuilder>();
 	ClassDB::register_class<_HTMLTag>();
@@ -109,6 +111,8 @@ void register_web_types() {
 	ClassDB::register_class<PagedArticle>();
 	ClassDB::register_class<PagedArticles>();
 	//ClassDB::register_class<PagedArticlesMDIndex>();
+
+	ClassDB::register_class<User>();
 }
 
 void unregister_web_types() {