use challengeId

Author: dankmeme01

src/stages.cpp

@@ -68,7 +68,7 @@ void stage2CommentCleanup(PendingRequest* req) {
 void stage3Start(PendingRequest* preq) {
     auto& argon = ArgonState::get();
 
-    auto task = argon::web::startStage3(preq->account, preq->challengeSolution);
+    auto task = argon::web::startStage3(preq->account, preq->challengeId, preq->challengeSolution);
 
     argon.pushStage3Request(preq, std::move(task));
 }

src/state.cpp

@@ -23,6 +23,7 @@ Task<void> sleepFor(auto duration) {
 struct Stage1ResponseData {
     std::string method;
     int id;
+    uint32_t challengeId;
     int challenge;
     std::string ident;
 };
@@ -206,12 +207,13 @@ void ArgonState::processStage1Response(PendingRequest* req, web::WebResponse* re
 
     auto data = std::move(datares).unwrap();
 
-    // store server ident
+    // store some values
     req->serverIdent = std::move(data.ident);
+    req->challengeId = data.challengeId;
+    req->stage2ChosenMethod = data.method;
 
     // start stage 2
     this->progress(req, req->retrying ? AuthProgress::RetryingSolve : AuthProgress::SolvingChallenge);
-    req->stage2ChosenMethod = data.method;
     argon::stage2Start(req, data.id, data.challenge);
 }
 
@@ -353,7 +355,7 @@ void ArgonState::waitAndRetryStage3(PendingRequest* req, int ms) {
     // Note to self: don't pass stuff in lambda captures here, it gets corrupted unlike args
     auto task = [](Duration duration, PendingRequest* req) -> web::WebTask {
         co_await sleepFor(duration);
-        co_return co_await argon::web::pollStage3(req->account, req->challengeSolution);
+        co_return co_await argon::web::pollStage3(req->account, req->challengeId, req->challengeSolution);
     }(duration, req);
 
     req->stage3Listener.setFilter(std::move(task));

src/state.hpp

@@ -20,6 +20,7 @@ struct PendingRequest {
     std::string serverIdent;
     std::string challengeSolution;
     std::string stage2ChosenMethod;
+    uint32_t challengeId = 0;
     int userCommentId;
     bool retrying = false;
     web::WebListener stage1Listener;

src/web.cpp

@@ -188,11 +188,12 @@ WebTask stage2CommentCleanup(const AccountData& account, int id, std::string_vie
     return {}; // TODO
 }
 
-WebTask startStage3(const AccountData& account, std::string_view solution) {
+WebTask startStage3(const AccountData& account, uint32_t challengeId, std::string_view solution) {
     auto& argon = ArgonState::get();
     std::string_view serverUrl = argon.getServerUrl();
 
     auto payload = matjson::makeObject({
+        {"challengeId", challengeId},
         {"accountId", account.accountId},
         {"solution", solution}
     });
@@ -206,11 +207,12 @@ WebTask startStage3(const AccountData& account, std::string_view solution) {
     return std::move(req);
 }
 
-WebTask pollStage3(const AccountData& account, std::string_view solution) {
+WebTask pollStage3(const AccountData& account, uint32_t challengeId, std::string_view solution) {
     auto& argon = ArgonState::get();
     std::string_view serverUrl = argon.getServerUrl();
 
     auto payload = matjson::makeObject({
+        {"challengeId", challengeId},
         {"accountId", account.accountId},
         {"solution", solution}
     });

src/web.hpp

@@ -22,6 +22,6 @@ namespace argon::web {
     WebTask stage2MessageCleanup(const AccountData& account, int id, std::string_view serverUrl);
     WebTask stage2CommentCleanup(const AccountData& account, int id, std::string_view serverUrl);
 
-    WebTask startStage3(const AccountData& account, std::string_view solution);
-    WebTask pollStage3(const AccountData& account, std::string_view solution);
+    WebTask startStage3(const AccountData& account, uint32_t challengeId, std::string_view solution);
+    WebTask pollStage3(const AccountData& account, uint32_t challengeId, std::string_view solution);
 }