3 files changed, 16 insertions, 8 deletions

diff --git a/launcher/ui/pages/global/APIPage.cpp b/launcher/ui/pages/global/APIPage.cpp
index b889e6f7..e3d30475 100644
--- a/launcher/ui/pages/global/APIPage.cpp
+++ b/launcher/ui/pages/global/APIPage.cpp
@@ -40,8 +40,10 @@
 
 #include <QMessageBox>
 #include <QFileDialog>
+#include <QRegularExpression>
 #include <QStandardPaths>
 #include <QTabBar>
+#include <QValidator>
 #include <QVariant>
 
 #include "settings/SettingsObject.h"
@@ -63,6 +65,10 @@ APIPage::APIPage(QWidget *parent) :
     };
 
     static QRegularExpression validUrlRegExp("https?://.+");
+    static QRegularExpression validMSAClientID(QRegularExpression::anchoredPattern(
+                "[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"));
+    static QRegularExpression validFlameKey(QRegularExpression::anchoredPattern(
+                "\\$2[ayb]\\$.{56}"));
 
     ui->setupUi(this);
 
@@ -75,6 +81,8 @@ APIPage::APIPage(QWidget *parent) :
     // This function needs to be called even when the ComboBox's index is still in its default state.
     updateBaseURLPlaceholder(ui->pasteTypeComboBox->currentIndex());
     ui->baseURLEntry->setValidator(new QRegularExpressionValidator(validUrlRegExp, ui->baseURLEntry));
+    ui->msaClientID->setValidator(new QRegularExpressionValidator(validMSAClientID, ui->msaClientID));
+    ui->flameKey->setValidator(new QRegularExpressionValidator(validFlameKey, ui->flameKey));
 
     ui->metaURL->setPlaceholderText(BuildConfig.META_URL);
     ui->userAgentLineEdit->setPlaceholderText(BuildConfig.USER_AGENT);
@@ -137,8 +145,8 @@ void APIPage::loadSettings()
     ui->msaClientID->setText(msaClientID);
     QString metaURL = s->get("MetaURLOverride").toString();
     ui->metaURL->setText(metaURL);
-    QString curseKey = s->get("CFKeyOverride").toString();
-    ui->curseKey->setText(curseKey);
+    QString flameKey = s->get("FlameKeyOverride").toString();
+    ui->flameKey->setText(flameKey);
     QString customUserAgent = s->get("UserAgentOverride").toString();
     ui->userAgentLineEdit->setText(customUserAgent);
 }
@@ -167,8 +175,8 @@ void APIPage::applySettings()
     }
 
     s->set("MetaURLOverride", metaURL);
-    QString curseKey = ui->curseKey->text();
-    s->set("CFKeyOverride", curseKey);
+    QString flameKey = ui->flameKey->text();
+    s->set("FlameKeyOverride", flameKey);
     s->set("UserAgentOverride", ui->userAgentLineEdit->text());
 }
 
diff --git a/launcher/ui/pages/global/APIPage.ui b/launcher/ui/pages/global/APIPage.ui
index 5327771c..1ae788c7 100644
--- a/launcher/ui/pages/global/APIPage.ui
+++ b/launcher/ui/pages/global/APIPage.ui
@@ -196,7 +196,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_curse">
+        <widget class="QGroupBox" name="groupBox_flame">
          <property name="enabled">
           <bool>true</bool>
          </property>
@@ -214,7 +214,7 @@
           <item row="2" column="0">
            <widget class="QLabel" name="label_7">
             <property name="text">
-             <string>Enter a custom API Key for CurseForge here. </string>
+             <string>Enter a custom API Key for CurseForge here.</string>
             </property>
             <property name="textFormat">
              <enum>Qt::RichText</enum>
@@ -228,7 +228,7 @@
            </widget>
           </item>
           <item row="1" column="0">
-           <widget class="QLineEdit" name="curseKey">
+           <widget class="QLineEdit" name="flameKey">
             <property name="enabled">
              <bool>true</bool>
             </property>
diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
index a608771e..fcc43add 100644
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@@ -96,7 +96,7 @@ AccountListPage::AccountListPage(QWidget *parent)
     updateButtonStates();
 
     // Xbox authentication won't work without a client identifier, so disable the button if it is missing
-    if (APPLICATION->getMSAClientID().isEmpty()) {
+    if (~APPLICATION->currentCapabilities() & Application::SupportsMSA) {
         ui->actionAddMicrosoft->setVisible(false);
         ui->actionAddMicrosoft->setToolTip(tr("No Microsoft Authentication client ID was set."));
     }