Refactor login code

Users can now get around reCATPCHA without the downloader being built with GUI enabled by using their browser to login
Sude- · Mar 12, 2023 · c26e28a · c26e28a
1 parent 9e5e833
commit c26e28a
Show file tree

Hide file tree

Showing 3 changed files with 241 additions and 190 deletions.
diff --git a/include/website.h b/include/website.h
@@ -33,6 +33,12 @@ class Website
         bool IsLoggedInComplex(const std::string& email);
         std::map<std::string, std::string> getTagsFromJson(const Json::Value& json);
         int retries;
+        std::string LoginGetAuthCode(const std::string& email, const std::string& password);
+        std::string LoginGetAuthCodeCurl(const std::string& login_form_html, const std::string& email, const std::string& password);
+        std::string LoginGetAuthCodeBrowser(const std::string& auth_url);
+        #ifdef USE_QT_GUI_LOGIN
+        std::string LoginGetAuthCodeGUI(const std::string& email, const std::string& password);
+        #endif
 };
 
 #endif // WEBSITE_H
diff --git a/src/downloader.cpp b/src/downloader.cpp
@@ -316,31 +316,31 @@ int Downloader::login()
                 if (!boost::filesystem::remove(Globals::globalConfig.curlConf.sCookiePath))
                     std::cerr << "Failed to delete " << Globals::globalConfig.curlConf.sCookiePath << std::endl;
 
-            int iWebsiteLoginResult = gogWebsite->Login(email, password);
-            if (iWebsiteLoginResult < 1)
-            {
-                std::cerr << "HTTP: Login failed" << std::endl;
-                return 0;
-            }
-            else
-            {
-                std::cerr << "HTTP: Login successful" << std::endl;
-            }
+            int iLoginResult = gogWebsite->Login(email, password);
 
-            if (iWebsiteLoginResult < 2)
+            if (iLoginResult < 1)
             {
                 std::cerr << "Galaxy: Login failed" << std::endl;
                 return 0;
             }
             else
             {
                 std::cerr << "Galaxy: Login successful" << std::endl;
-
                 if (!Globals::galaxyConf.getJSON().empty())
                 {
                     this->saveGalaxyJSON();
                 }
             }
+
+            if (gogWebsite->IsLoggedIn())
+            {
+                std::cerr << "HTTP: Login successful" << std::endl;
+            }
+            else
+            {
+                std::cerr << "HTTP: Login failed" << std::endl;
+                return 0;
+            }
         }
     }
     return 1;