Use PolyMC's CurseForge workaround (#47)
* Curseforge workarounds This should allow people to use Curseforge without having to manually paste a working key into the settings or change the user agent. Signed-off-by: Lenny McLennington <lenny@sneed.church> * chore: update cf api key api url Sascha says the domain name we're using is not gonna be renewed, so I'm switching it to a domain controlled by me instead so that this won't be a problem in the future. Signed-off-by: Lenny McLennington <lenny@sneed.church> * feat: add ability to disable cf api key fetching by setting the cf api key api url to a blank string Signed-off-by: Lenny McLennington <lenny@sneed.church> * don't ask before fetching key * change polymc mention to pollymc Signed-off-by: Lenny McLennington <lenny@sneed.church> Co-authored-by: Lenny McLennington <lenny@sneed.church>
This commit is contained in:
@@ -117,11 +117,13 @@ void Download::executeTask()
|
||||
return;
|
||||
}
|
||||
|
||||
request.setHeader(QNetworkRequest::UserAgentHeader, APPLICATION->getUserAgent().toUtf8());
|
||||
if (APPLICATION->capabilities() & Application::SupportsFlame
|
||||
&& request.url().host().contains("api.curseforge.com")) {
|
||||
request.setRawHeader("x-api-key", APPLICATION->getFlameAPIKey().toUtf8());
|
||||
};
|
||||
}
|
||||
else {
|
||||
request.setHeader(QNetworkRequest::UserAgentHeader, APPLICATION->getUserAgent().toUtf8());
|
||||
}
|
||||
|
||||
QNetworkReply* rep = m_network->get(request);
|
||||
|
||||
|
81
launcher/net/FetchFlameAPIKey.cpp
Normal file
81
launcher/net/FetchFlameAPIKey.cpp
Normal file
@@ -0,0 +1,81 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
/*
|
||||
* PolyMC - Minecraft Launcher
|
||||
* Copyright (C) 2022 Lenny McLennington <lenny@sneed.church>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "FetchFlameAPIKey.h"
|
||||
#include "Application.h"
|
||||
#include <BuildConfig.h>
|
||||
#include <Json.h>
|
||||
|
||||
#include <ui/dialogs/ProgressDialog.h>
|
||||
#include <ui/dialogs/CustomMessageBox.h>
|
||||
|
||||
FetchFlameAPIKey::FetchFlameAPIKey(QObject *parent)
|
||||
: Task{parent}
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void FetchFlameAPIKey::executeTask()
|
||||
{
|
||||
QNetworkRequest req(BuildConfig.FLAME_API_KEY_API_URL);
|
||||
m_reply.reset(APPLICATION->network()->get(req));
|
||||
connect(m_reply.get(), &QNetworkReply::downloadProgress, this, &Task::setProgress);
|
||||
connect(m_reply.get(), &QNetworkReply::finished, this, &FetchFlameAPIKey::downloadFinished);
|
||||
connect(m_reply.get(),
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
|
||||
&QNetworkReply::errorOccurred,
|
||||
#else
|
||||
qOverload<QNetworkReply::NetworkError>(&QNetworkReply::error),
|
||||
#endif
|
||||
this,
|
||||
[this] (QNetworkReply::NetworkError error) {
|
||||
qCritical() << "Network error: " << error;
|
||||
emitFailed(m_reply->errorString());
|
||||
});
|
||||
|
||||
setStatus(tr("Fetching Curseforge core API key"));
|
||||
}
|
||||
|
||||
void FetchFlameAPIKey::downloadFinished()
|
||||
{
|
||||
auto res = m_reply->readAll();
|
||||
auto doc = QJsonDocument::fromJson(res);
|
||||
|
||||
qDebug() << doc;
|
||||
|
||||
try {
|
||||
auto obj = Json::requireObject(doc);
|
||||
|
||||
auto success = Json::requireBoolean(obj, "ok");
|
||||
|
||||
if (success)
|
||||
{
|
||||
m_result = Json::requireString(obj, "token");
|
||||
emitSucceeded();
|
||||
}
|
||||
else
|
||||
{
|
||||
emitFailed("The API returned an output indicating failure.");
|
||||
}
|
||||
}
|
||||
catch (Json::JsonException&)
|
||||
{
|
||||
qCritical() << "Output: " << res;
|
||||
emitFailed("The API returned an unexpected JSON output.");
|
||||
}
|
||||
}
|
44
launcher/net/FetchFlameAPIKey.h
Normal file
44
launcher/net/FetchFlameAPIKey.h
Normal file
@@ -0,0 +1,44 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
/*
|
||||
* PolyMC - Minecraft Launcher
|
||||
* Copyright (C) 2022 Lenny McLennington <lenny@sneed.church>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef FETCHFLAMEAPIKEY_H
|
||||
#define FETCHFLAMEAPIKEY_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QNetworkReply>
|
||||
#include <tasks/Task.h>
|
||||
|
||||
class FetchFlameAPIKey : public Task
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit FetchFlameAPIKey(QObject *parent = nullptr);
|
||||
|
||||
QString m_result;
|
||||
|
||||
public slots:
|
||||
void downloadFinished();
|
||||
|
||||
protected:
|
||||
virtual void executeTask();
|
||||
|
||||
|
||||
std::shared_ptr<QNetworkReply> m_reply;
|
||||
};
|
||||
|
||||
#endif // FETCHFLAMEAPIKEY_H
|
@@ -215,11 +215,13 @@ namespace Net {
|
||||
return;
|
||||
}
|
||||
|
||||
request.setHeader(QNetworkRequest::UserAgentHeader, APPLICATION->getUserAgent().toUtf8());
|
||||
if (APPLICATION->capabilities() & Application::SupportsFlame
|
||||
&& request.url().host().contains("api.curseforge.com")) {
|
||||
request.setRawHeader("x-api-key", APPLICATION->getFlameAPIKey().toUtf8());
|
||||
}
|
||||
else {
|
||||
request.setHeader(QNetworkRequest::UserAgentHeader, APPLICATION->getUserAgent().toUtf8());
|
||||
}
|
||||
//TODO other types of post requests ?
|
||||
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
|
||||
QNetworkReply* rep = m_network->post(request, m_post_data);
|
||||
|
Reference in New Issue
Block a user