diff --git a/src/users/add_user.cpp b/src/users/add_user.cpp index dffa784..5fe818c 100644 --- a/src/users/add_user.cpp +++ b/src/users/add_user.cpp @@ -48,13 +48,7 @@ void add_user(const httplib::Request &request, httplib::Response &response) { } jwt::decoded_jwt decoded_token = jwt::decode(json_body["token"]); - std::string userid; - for (std::pair &e: decoded_token.get_payload_json()) { - if (e.first == "userId") { - userid = e.second.to_str(); - break; - } - } + std::string userid = decoded_token.get_payload_json()["userId"].to_str(); if (userid.empty()) { response.set_content(STRING403, JSON_TYPE); return; diff --git a/src/users/change_password.cpp b/src/users/change_password.cpp index 7418019..b14ca72 100644 --- a/src/users/change_password.cpp +++ b/src/users/change_password.cpp @@ -31,7 +31,7 @@ void change_password(const httplib::Request &request, httplib::Response &respons return; } if (json_body["new_password"] == nullptr) { - response.set_content(R"({"required":"[token] or if you superuser [token,userid]"})", + response.set_content(CHANGE_PASSWORD_REQUIRED_STRING, JSON_TYPE); return; } @@ -46,13 +46,7 @@ void change_password(const httplib::Request &request, httplib::Response &respons if (json_body["userid"] == nullptr) { old_password = json_body["old_password"]; } jwt::decoded_jwt decoded_token = jwt::decode(json_body["token"]); - std::string userid; - for (std::pair &e: decoded_token.get_payload_json()) { - if (e.first == "userId") { - userid = e.second.to_str(); - break; - } - } + std::string userid = decoded_token.get_payload_json()["userId"].to_str(); if (userid.empty()) { response.set_content(STRING403, JSON_TYPE); return; diff --git a/src/users/change_user.cpp b/src/users/change_user.cpp index ec6b665..3b80e85 100644 --- a/src/users/change_user.cpp +++ b/src/users/change_user.cpp @@ -35,13 +35,7 @@ void change_user(const httplib::Request &request, httplib::Response &response) { } jwt::decoded_jwt decoded_token = jwt::decode(json_body["token"]); - std::string userid; - for (std::pair &e: decoded_token.get_payload_json()) { - if (e.first == "userId") { - userid = e.second.to_str(); - break; - } - } + std::string userid = decoded_token.get_payload_json()["userId"].to_str(); if (userid.empty()) { response.set_content(STRING403, JSON_TYPE); return; diff --git a/src/users/delete_user.cpp b/src/users/delete_user.cpp index 4a74d16..35bfe7b 100644 --- a/src/users/delete_user.cpp +++ b/src/users/delete_user.cpp @@ -28,13 +28,7 @@ void delete_user(const httplib::Request &request, httplib::Response &response) { } jwt::decoded_jwt decoded_token = jwt::decode(json_body["token"]); - std::string userid; - for (std::pair &e: decoded_token.get_payload_json()) { - if (e.first == "userId") { - userid = e.second.to_str(); - break; - } - } + std::string userid = decoded_token.get_payload_json()["userId"].to_str(); if (userid.empty()) { response.set_content(STRING403, JSON_TYPE); return; diff --git a/src/users/get_all_users.cpp b/src/users/get_all_users.cpp index b20650e..ce8c761 100644 --- a/src/users/get_all_users.cpp +++ b/src/users/get_all_users.cpp @@ -23,13 +23,7 @@ void get_all_users(const httplib::Request &request, httplib::Response &response) return; } jwt::decoded_jwt decoded_token = jwt::decode(json_body["token"]); - std::string userid; - for (std::pair &e: decoded_token.get_payload_json()) { - if (e.first == "userId") { - userid = e.second.to_str(); - break; - } - } + std::string userid = decoded_token.get_payload_json()["userId"].to_str(); if (userid.empty()) { response.set_content(STRING403, JSON_TYPE); return; diff --git a/src/users/get_user.cpp b/src/users/get_user.cpp index b17ce99..eae0359 100644 --- a/src/users/get_user.cpp +++ b/src/users/get_user.cpp @@ -23,13 +23,7 @@ void get_user(const httplib::Request &request, httplib::Response &response) { return; } jwt::decoded_jwt decoded_token = jwt::decode(json_body["token"]); - std::string userid; - for (std::pair &e: decoded_token.get_payload_json()) { - if (e.first == "userId") { - userid = e.second.to_str(); - break; - } - } + std::string userid = decoded_token.get_payload_json()["userId"].to_str(); if (userid.empty()) { response.set_content(STRING403, JSON_TYPE); return;