From 0854e83ce48cb30b28bd05986970e506c1106e4e Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 12 Feb 2022 20:20:51 +0100
Subject: feat: implement MSA client id override

Closes #11
---
 launcher/ui/pages/global/AccountListPage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launcher/ui/pages/global/AccountListPage.cpp')

diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
index 396d320f..ea310acd 100644
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@@ -73,7 +73,7 @@ AccountListPage::AccountListPage(QWidget *parent)
     updateButtonStates();
 
     // Xbox authentication won't work without a client identifier, so disable the button if it is missing
-    ui->actionAddMicrosoft->setVisible(BuildConfig.MSA_CLIENT_ID.size() != 0);
+    ui->actionAddMicrosoft->setVisible(!APPLICATION->getMSAClientID().isEmpty());
 }
 
 AccountListPage::~AccountListPage()
-- 
cgit 


From 159d868b77e6962632e925caf80a347122203d27 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 12 Feb 2022 20:30:42 +0100
Subject: fix(ui): explain why 'Add Microsoft' might be disabled

---
 launcher/ui/pages/global/AccountListPage.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'launcher/ui/pages/global/AccountListPage.cpp')

diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
index ea310acd..740697a4 100644
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@@ -73,7 +73,10 @@ AccountListPage::AccountListPage(QWidget *parent)
     updateButtonStates();
 
     // Xbox authentication won't work without a client identifier, so disable the button if it is missing
-    ui->actionAddMicrosoft->setVisible(!APPLICATION->getMSAClientID().isEmpty());
+    if (APPLICATION->getMSAClientID().isEmpty()) {
+        ui->actionAddMicrosoft->setVisible(false);
+        ui->actionAddMicrosoft->setToolTip(tr("No Microsoft Secured Account client ID was set."));
+    }
 }
 
 AccountListPage::~AccountListPage()
-- 
cgit 


From a309f4e72143b28865d5a8b94dcf913d3a95773f Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 12 Feb 2022 21:09:25 +0100
Subject: fix: MSA = Microsoft Authentication

---
 launcher/ui/pages/global/APIPage.ui          | 6 +++---
 launcher/ui/pages/global/AccountListPage.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'launcher/ui/pages/global/AccountListPage.cpp')

diff --git a/launcher/ui/pages/global/APIPage.ui b/launcher/ui/pages/global/APIPage.ui
index 38bbc525..28c53b79 100644
--- a/launcher/ui/pages/global/APIPage.ui
+++ b/launcher/ui/pages/global/APIPage.ui
@@ -103,7 +103,7 @@
        <item>
         <widget class="QGroupBox" name="groupBox_msa">
          <property name="title">
-          <string>Microsoft Secured Account</string>
+          <string>Microsoft Authentication</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_4">
           <item>
@@ -116,7 +116,7 @@
           <item>
            <widget class="QLabel" name="label_3">
             <property name="text">
-             <string>Note: you probably don't need to set this if logging in via Microsoft Secured Account already works.</string>
+             <string>Note: you probably don't need to set this if logging in via Microsoft Authentication already works.</string>
             </property>
             <property name="textFormat">
              <enum>Qt::RichText</enum>
@@ -136,7 +136,7 @@
           <item>
            <widget class="QLabel" name="label_4">
             <property name="text">
-             <string>Enter a custom client ID for Microsoft Secured Account here. </string>
+             <string>Enter a custom client ID for Microsoft Authentication here. </string>
             </property>
             <property name="textFormat">
              <enum>Qt::RichText</enum>
diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
index 740697a4..eb1ee8d3 100644
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@@ -75,7 +75,7 @@ AccountListPage::AccountListPage(QWidget *parent)
     // Xbox authentication won't work without a client identifier, so disable the button if it is missing
     if (APPLICATION->getMSAClientID().isEmpty()) {
         ui->actionAddMicrosoft->setVisible(false);
-        ui->actionAddMicrosoft->setToolTip(tr("No Microsoft Secured Account client ID was set."));
+        ui->actionAddMicrosoft->setToolTip(tr("No Microsoft Authentication client ID was set."));
     }
 }
 
-- 
cgit