aboutsummaryrefslogtreecommitdiff
path: root/launcher/net/Upload.cpp
diff options
context:
space:
mode:
authorTheKodeToad <TheKodeToad@proton.me>2023-03-18 14:02:05 +0000
committerGitHub <noreply@github.com>2023-03-18 14:02:05 +0000
commit1893871a99d26955e411b0b5dba4d2fe4368d96e (patch)
tree998873a40d3da6622854b3fb84d973f7b29d70a3 /launcher/net/Upload.cpp
parent8837f06e4e97ed966662b52db206facd7f91a489 (diff)
parent45b0367d14f38d40af5cc8603f7daab05d83af5f (diff)
downloadPrismLauncher-1893871a99d26955e411b0b5dba4d2fe4368d96e.tar.gz
PrismLauncher-1893871a99d26955e411b0b5dba4d2fe4368d96e.tar.bz2
PrismLauncher-1893871a99d26955e411b0b5dba4d2fe4368d96e.zip
Merge branch 'PrismLauncher:develop' into mrpack-export
Diffstat (limited to 'launcher/net/Upload.cpp')
-rw-r--r--launcher/net/Upload.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/launcher/net/Upload.cpp b/launcher/net/Upload.cpp
index 79b6af8d..ccf43c2d 100644
--- a/launcher/net/Upload.cpp
+++ b/launcher/net/Upload.cpp
@@ -1,8 +1,9 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
- * PolyMC - Minecraft Launcher
+ * Prism Launcher - Minecraft Launcher
* Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ * Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
*
* 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
@@ -216,10 +217,16 @@ namespace Net {
}
request.setHeader(QNetworkRequest::UserAgentHeader, APPLICATION->getUserAgent().toUtf8());
- if (APPLICATION->capabilities() & Application::SupportsFlame
- && request.url().host().contains("api.curseforge.com")) {
+ // TODO remove duplication
+ if (APPLICATION->capabilities() & Application::SupportsFlame && request.url().host() == QUrl(BuildConfig.FLAME_BASE_URL).host()) {
request.setRawHeader("x-api-key", APPLICATION->getFlameAPIKey().toUtf8());
+ } else if (request.url().host() == QUrl(BuildConfig.MODRINTH_PROD_URL).host() ||
+ request.url().host() == QUrl(BuildConfig.MODRINTH_STAGING_URL).host()) {
+ QString token = APPLICATION->getModrinthAPIToken();
+ if (!token.isNull())
+ request.setRawHeader("Authorization", token.toUtf8());
}
+
//TODO other types of post requests ?
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QNetworkReply* rep = m_network->post(request, m_post_data);