refactor and review
This commit is contained in:
1 parent
721e616207
commit
29df9728e2
16 files changed
+351
-174
No files matched your search
+55
-37
@@ -1,41 +1,51 @@
|
||||
#include "users.hpp"
|
||||
#include "../colors.h"
|
||||
#include "../includes.hpp"
|
||||
#include "../auth/auth.hpp"
|
||||
#include <jwt-cpp/jwt.h>
|
||||
|
||||
// function for change user data
|
||||
void change_user(const httplib::Request& request, httplib::Response& response) {
|
||||
void change_user(const httplib::Request &request, httplib::Response &response) {
|
||||
std::cout << GREEN << request.path << RESET << " " << request.method << std::endl;
|
||||
response.set_header("Access-Control-Allow-Origin", "*");
|
||||
if (request.body == "") {response.set_content(
|
||||
"{\"required\":\"[token] or if you superuser [token,userid]\",\"optional\":\"[username,password,is_superuser,group]\"}",
|
||||
"application/json"
|
||||
);return;}
|
||||
nlohmann::json json_body = nlohmann::json::parse(request.body);
|
||||
|
||||
if (json_body["token"] == nullptr) {response.set_content(
|
||||
"{\"required\":\"[token] or if you superuser [token,userid]\",\"optional\":\"[username,password,is_superuser,group]\"}",
|
||||
"application/json"
|
||||
);return;}
|
||||
if ((json_body["userid"] == nullptr) && (json_body["old_password"] == nullptr)) {
|
||||
response.set_content("{\"required\":\"[token] or if you superuser [token,userid]\",\"optional\":\"[username,password,is_superuser,group]\"}", "application/json");
|
||||
if (request.body.empty()) {
|
||||
response.set_content(
|
||||
CHANGE_USER_REQUIRED_STRING,
|
||||
JSON_TYPE);
|
||||
return;
|
||||
}
|
||||
// if (json_body["new_password"] == nullptr) {response.set_content("{\"required\":\"[token] or if you superuser [token,userid]\"}", "application/json");return;}
|
||||
if (!verify_auth(json_body["token"])) {response.set_content("{\"status\":\"403\"}", "application/json");return;}
|
||||
nlohmann::json json_body = nlohmann::json::parse(request.body);
|
||||
|
||||
// std::string old_password = "";
|
||||
// const std::string new_password = json_body["new_password"];
|
||||
|
||||
// if (json_body["userid"] == nullptr) {old_password = json_body["old_password"];}
|
||||
if (json_body["token"] == nullptr) {
|
||||
response.set_content(
|
||||
CHANGE_USER_REQUIRED_STRING,
|
||||
JSON_TYPE
|
||||
);
|
||||
return;
|
||||
}
|
||||
if ((json_body["userid"] == nullptr) && (json_body["old_password"] == nullptr)) {
|
||||
response.set_content(
|
||||
CHANGE_USER_REQUIRED_STRING,
|
||||
JSON_TYPE);
|
||||
return;
|
||||
}
|
||||
if (!verify_auth(json_body["token"])) {
|
||||
response.set_content(STRING403, JSON_TYPE);
|
||||
return;
|
||||
}
|
||||
|
||||
jwt::decoded_jwt<jwt::traits::kazuho_picojson> decoded_token = jwt::decode(json_body["token"]);
|
||||
std::string userid = "";
|
||||
for (auto& e : decoded_token.get_payload_json()) {
|
||||
std::string userid;
|
||||
for (std::pair<const std::string, picojson::value> &e: decoded_token.get_payload_json()) {
|
||||
if (e.first == "userId") {
|
||||
userid = e.second.to_str();
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (userid == "") {response.set_content("{\"status\":\"403\"}", "application/json");return;}
|
||||
if (userid.empty()) {
|
||||
response.set_content(STRING403, JSON_TYPE);
|
||||
return;
|
||||
}
|
||||
|
||||
std::ifstream usersfile("users.json");
|
||||
nlohmann::json all_users = nlohmann::json::parse(usersfile);
|
||||
@@ -45,40 +55,48 @@ void change_user(const httplib::Request& request, httplib::Response& response) {
|
||||
if (json_body["userid"] != nullptr) {
|
||||
changeusruserid = json_body["userid"];
|
||||
nlohmann::json response_user_data = nullptr;
|
||||
for (nlohmann::json& user : all_users) {
|
||||
for (nlohmann::json &user: all_users) {
|
||||
if (user["id"] == userid) {
|
||||
response_user_data = user;
|
||||
}
|
||||
}
|
||||
if (response_user_data == nullptr) {response.set_content("{\"status\":\"403\"}", "application/json");return;}
|
||||
if (response_user_data["is_superuser"] != "1") {response.set_content("{\"status\":\"403\"}", "application/json");return;}
|
||||
if (response_user_data == nullptr) {
|
||||
response.set_content(STRING403, JSON_TYPE);
|
||||
return;
|
||||
}
|
||||
if (response_user_data["is_superuser"] != "1") {
|
||||
response.set_content(STRING403, JSON_TYPE);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
bool found = false;
|
||||
if (json_body["userid"] != nullptr) {
|
||||
for (int i = 0; i < all_users.size(); i++) {
|
||||
if ((all_users[i]["id"] == changeusruserid)) {
|
||||
if (json_body["username"] != nullptr) {all_users[i]["username"] = json_body["username"];}
|
||||
if (json_body["password"] != nullptr) {all_users[i]["password"] = json_body["password"];}
|
||||
if (json_body["group"] != nullptr) {all_users[i]["group"] = json_body["group"];}
|
||||
if (json_body["is_superuser"] != nullptr) {all_users[i]["is_superuser"] = json_body["is_superuser"];}
|
||||
for (nlohmann::basic_json<> &all_user: all_users) {
|
||||
if ((all_user["id"] == changeusruserid)) {
|
||||
if (json_body["username"] != nullptr) { all_user["username"] = json_body["username"]; }
|
||||
if (json_body["password"] != nullptr) { all_user["password"] = json_body["password"]; }
|
||||
if (json_body["group"] != nullptr) { all_user["group"] = json_body["group"]; }
|
||||
if (json_body["is_superuser"] != nullptr) { all_user["is_superuser"] = json_body["is_superuser"]; }
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (int i = 0; i < all_users.size(); i++) {
|
||||
if ((all_users[i]["id"] == changeusruserid)) {
|
||||
if (json_body["username"] != nullptr) {all_users[i]["username"] = json_body["username"];}
|
||||
for (nlohmann::basic_json<> &all_user: all_users) {
|
||||
if ((all_user["id"] == changeusruserid)) {
|
||||
if (json_body["username"] != nullptr) { all_user["username"] = json_body["username"]; }
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!found) {response.set_content("{\"status\":\"can't find this user\"}", "application/json");return;}
|
||||
if (!found) {
|
||||
response.set_content(R"({"status":"can't find this user"})", JSON_TYPE);
|
||||
return;
|
||||
}
|
||||
std::ofstream usersfilew("users.json");
|
||||
usersfilew << all_users.dump(4);
|
||||
usersfilew.close();
|
||||
response.set_content("{\"status\":\"ok\"}", "application/json");
|
||||
response.set_content(R"({"status":"ok"})", JSON_TYPE);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user