From df041144c5bf68b056d13af686adf8e9ab0e2c64 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Sun, 17 Dec 2023 13:05:37 -0500
Subject: [PATCH] Move setupSsl to Utility namespace

---
 launcher/include/launchercore.h  |  1 -
 launcher/include/utility.h       |  1 +
 launcher/src/launchercore.cpp    | 11 +----------
 launcher/src/squareenixlogin.cpp |  2 +-
 launcher/src/utility.cpp         | 10 ++++++++++
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/launcher/include/launchercore.h b/launcher/include/launchercore.h
index 03dd768..75f3f25 100755
--- a/launcher/include/launchercore.h
+++ b/launcher/include/launchercore.h
@@ -99,7 +99,6 @@ public:
 
     // Networking misc.
     void buildRequest(const Profile &settings, QNetworkRequest &request);
-    void setSSL(QNetworkRequest &request);
     void setupIgnoreSSL(QNetworkReply *reply);
 
     [[nodiscard]] bool isLoadingFinished() const;
diff --git a/launcher/include/utility.h b/launcher/include/utility.h
index eeaca31..185cbc6 100644
--- a/launcher/include/utility.h
+++ b/launcher/include/utility.h
@@ -12,4 +12,5 @@ QDir stateDirectory();
 QString toWindowsPath(const QDir &dir);
 void printRequest(const QString &type, const QNetworkRequest &request);
 void createPathIfNeeded(const QDir &dir);
+void setSSL(QNetworkRequest &request);
 }
\ No newline at end of file
diff --git a/launcher/src/launchercore.cpp b/launcher/src/launchercore.cpp
index d251053..e05d48a 100755
--- a/launcher/src/launchercore.cpp
+++ b/launcher/src/launchercore.cpp
@@ -170,7 +170,7 @@ void LauncherCore::setAutoLoginProfile(Profile *profile)
 
 void LauncherCore::buildRequest(const Profile &settings, QNetworkRequest &request)
 {
-    setSSL(request);
+    Utility::setSSL(request);
 
     if (settings.account()->license() == Account::GameLicense::macOS) {
         request.setHeader(QNetworkRequest::UserAgentHeader, QByteArrayLiteral("macSQEXAuthor/2.0.0(MacOSX; ja-jp)"));
@@ -186,15 +186,6 @@ void LauncherCore::buildRequest(const Profile &settings, QNetworkRequest &reques
     request.setRawHeader(QByteArrayLiteral("Accept-Language"), QByteArrayLiteral("en-us"));
 }
 
-void LauncherCore::setSSL(QNetworkRequest &request)
-{
-    QSslConfiguration config;
-    config.setProtocol(QSsl::AnyProtocol);
-    config.setPeerVerifyMode(QSslSocket::VerifyNone);
-
-    request.setSslConfiguration(config);
-}
-
 void LauncherCore::setupIgnoreSSL(QNetworkReply *reply)
 {
     Q_ASSERT(reply != nullptr);
diff --git a/launcher/src/squareenixlogin.cpp b/launcher/src/squareenixlogin.cpp
index 75b4391..a94ce7a 100644
--- a/launcher/src/squareenixlogin.cpp
+++ b/launcher/src/squareenixlogin.cpp
@@ -271,7 +271,7 @@ QCoro::Task<bool> SquareEnixLogin::registerSession()
     url.setPath(QStringLiteral("/http/win32/ffxivneo_release_game/%1/%2").arg(m_info->profile->baseGameVersion(), m_SID));
 
     auto request = QNetworkRequest(url);
-    m_launcher.setSSL(request);
+    Utility::setSSL(request);
     request.setRawHeader(QByteArrayLiteral("X-Hash-Check"), QByteArrayLiteral("enabled"));
     request.setRawHeader(QByteArrayLiteral("User-Agent"), QByteArrayLiteral("FFXIV PATCH CLIENT"));
     request.setHeader(QNetworkRequest::ContentTypeHeader, QByteArrayLiteral("application/x-www-form-urlencoded"));
diff --git a/launcher/src/utility.cpp b/launcher/src/utility.cpp
index 63211ee..7078e72 100644
--- a/launcher/src/utility.cpp
+++ b/launcher/src/utility.cpp
@@ -4,6 +4,7 @@
 #include "utility.h"
 #include "astra_http_log.h"
 
+#include <QSslConfiguration>
 #include <QStandardPaths>
 
 using namespace Qt::StringLiterals;
@@ -35,4 +36,13 @@ void Utility::createPathIfNeeded(const QDir &dir)
     if (!QDir().exists(dir.absolutePath())) {
         QDir().mkpath(dir.absolutePath());
     }
+}
+
+void Utility::setSSL(QNetworkRequest &request)
+{
+    QSslConfiguration config;
+    config.setProtocol(QSsl::AnyProtocol);
+    config.setPeerVerifyMode(QSslSocket::VerifyNone);
+
+    request.setSslConfiguration(config);
 }
\ No newline at end of file