From 8897f16d1dd2d0736d9d50a99f8395c1eb1f2ac0 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 7 Nov 2023 10:52:52 +0200
Subject: [PATCH 1/4] simplify microsoft login

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/ui/dialogs/MSALoginDialog.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/launcher/ui/dialogs/MSALoginDialog.cpp b/launcher/ui/dialogs/MSALoginDialog.cpp
index 74fff9fd3..5dba84858 100644
--- a/launcher/ui/dialogs/MSALoginDialog.cpp
+++ b/launcher/ui/dialogs/MSALoginDialog.cpp
@@ -105,8 +105,17 @@ void MSALoginDialog::showVerificationUriAndCode(const QUrl& uri, const QString&
 
     QString urlString = uri.toString();
     QString linkString = QString("<a href=\"%1\">%2</a>").arg(urlString, urlString);
-    ui->label->setText(
-        tr("<p>Please open up %1 in a browser and put in the code <b>%2</b> to proceed with login.</p>").arg(linkString, code));
+    if (urlString == "https://www.microsoft.com/link" && !code.isEmpty()) {
+        urlString += QString("?otc=%1").arg(code);
+        DesktopServices::openUrl(urlString);
+        ui->label->setText(
+            tr("<p>Please login in the opened browser. If no browser was opened please follow the following instructions:</p>"
+               "<p>Please open up %1 in a browser and put in the code <b>%2</b> to proceed with login.</p>")
+                .arg(linkString, code));
+    } else {
+        ui->label->setText(
+            tr("<p>Please open up %1 in a browser and put in the code <b>%2</b> to proceed with login.</p>").arg(linkString, code));
+    }
     ui->actionButton->setVisible(true);
     connect(ui->actionButton, &QPushButton::clicked, [=]() {
         DesktopServices::openUrl(uri);

From 54187a505f500231a55cbceba26d6dc605fe6b30 Mon Sep 17 00:00:00 2001
From: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Tue, 7 Nov 2023 20:39:12 +0200
Subject: [PATCH 2/4] Update launcher/ui/dialogs/MSALoginDialog.cpp

Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
---
 launcher/ui/dialogs/MSALoginDialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/launcher/ui/dialogs/MSALoginDialog.cpp b/launcher/ui/dialogs/MSALoginDialog.cpp
index 5dba84858..e36a574f3 100644
--- a/launcher/ui/dialogs/MSALoginDialog.cpp
+++ b/launcher/ui/dialogs/MSALoginDialog.cpp
@@ -109,8 +109,8 @@ void MSALoginDialog::showVerificationUriAndCode(const QUrl& uri, const QString&
         urlString += QString("?otc=%1").arg(code);
         DesktopServices::openUrl(urlString);
         ui->label->setText(
-            tr("<p>Please login in the opened browser. If no browser was opened please follow the following instructions:</p>"
-               "<p>Please open up %1 in a browser and put in the code <b>%2</b> to proceed with login.</p>")
+            tr("<p>Please login in the opened browser. If no browser was opened please open up %1 in "
+               "a browser and put in the code <b>%2</b> to proceed with login.</p>")
                 .arg(linkString, code));
     } else {
         ui->label->setText(

From 4dc9e658750e5b0cab23ff7492db20fce6bc49d3 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 7 Nov 2023 20:41:45 +0200
Subject: [PATCH 3/4] Formated the suggestion

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/ui/dialogs/MSALoginDialog.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/launcher/ui/dialogs/MSALoginDialog.cpp b/launcher/ui/dialogs/MSALoginDialog.cpp
index e36a574f3..adc1b9e74 100644
--- a/launcher/ui/dialogs/MSALoginDialog.cpp
+++ b/launcher/ui/dialogs/MSALoginDialog.cpp
@@ -108,10 +108,9 @@ void MSALoginDialog::showVerificationUriAndCode(const QUrl& uri, const QString&
     if (urlString == "https://www.microsoft.com/link" && !code.isEmpty()) {
         urlString += QString("?otc=%1").arg(code);
         DesktopServices::openUrl(urlString);
-        ui->label->setText(
-            tr("<p>Please login in the opened browser. If no browser was opened please open up %1 in "
-               "a browser and put in the code <b>%2</b> to proceed with login.</p>")
-                .arg(linkString, code));
+        ui->label->setText(tr("<p>Please login in the opened browser. If no browser was opened please open up %1 in "
+                              "a browser and put in the code <b>%2</b> to proceed with login.</p>")
+                               .arg(linkString, code));
     } else {
         ui->label->setText(
             tr("<p>Please open up %1 in a browser and put in the code <b>%2</b> to proceed with login.</p>").arg(linkString, code));

From 9d653f172a512e163e61dac2455e12fe1678dc7c Mon Sep 17 00:00:00 2001
From: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Wed, 8 Nov 2023 08:56:48 +0200
Subject: [PATCH 4/4] Update launcher/ui/dialogs/MSALoginDialog.cpp

Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
---
 launcher/ui/dialogs/MSALoginDialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/launcher/ui/dialogs/MSALoginDialog.cpp b/launcher/ui/dialogs/MSALoginDialog.cpp
index adc1b9e74..7df423412 100644
--- a/launcher/ui/dialogs/MSALoginDialog.cpp
+++ b/launcher/ui/dialogs/MSALoginDialog.cpp
@@ -108,7 +108,7 @@ void MSALoginDialog::showVerificationUriAndCode(const QUrl& uri, const QString&
     if (urlString == "https://www.microsoft.com/link" && !code.isEmpty()) {
         urlString += QString("?otc=%1").arg(code);
         DesktopServices::openUrl(urlString);
-        ui->label->setText(tr("<p>Please login in the opened browser. If no browser was opened please open up %1 in "
+        ui->label->setText(tr("<p>Please login in the opened browser. If no browser was opened, please open up %1 in "
                               "a browser and put in the code <b>%2</b> to proceed with login.</p>")
                                .arg(linkString, code));
     } else {