aboutsummaryrefslogtreecommitdiff
path: root/launcher/dialogs/MSALoginDialog.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2021-08-22 20:01:18 +0200
committerPetr Mrázek <peterix@gmail.com>2021-08-22 20:01:18 +0200
commiteae65da110bb957194b34e0f3573ce4e6e6ddc78 (patch)
tree425a9252338c3db5eac4a5018f594ab646f6cea6 /launcher/dialogs/MSALoginDialog.cpp
parent50b92c1af2d28ab59a9b70ce0b3dca62bf1a7583 (diff)
downloadPrismLauncher-eae65da110bb957194b34e0f3573ce4e6e6ddc78.tar.gz
PrismLauncher-eae65da110bb957194b34e0f3573ce4e6e6ddc78.tar.bz2
PrismLauncher-eae65da110bb957194b34e0f3573ce4e6e6ddc78.zip
GH-3392 Switch MS account login to use device flow instead
Device flow involves the user manually opening a web page and putting in a code. We no longer need to interact with the browser.
Diffstat (limited to 'launcher/dialogs/MSALoginDialog.cpp')
-rw-r--r--launcher/dialogs/MSALoginDialog.cpp34
1 files changed, 34 insertions, 0 deletions
diff --git a/launcher/dialogs/MSALoginDialog.cpp b/launcher/dialogs/MSALoginDialog.cpp
index 14a0e243..989a4c9f 100644
--- a/launcher/dialogs/MSALoginDialog.cpp
+++ b/launcher/dialogs/MSALoginDialog.cpp
@@ -41,6 +41,9 @@ int MSALoginDialog::exec() {
connect(m_loginTask.get(), &Task::succeeded, this, &MSALoginDialog::onTaskSucceeded);
connect(m_loginTask.get(), &Task::status, this, &MSALoginDialog::onTaskStatus);
connect(m_loginTask.get(), &Task::progress, this, &MSALoginDialog::onTaskProgress);
+ connect(m_loginTask.get(), &AccountTask::showVerificationUriAndCode, this, &MSALoginDialog::showVerificationUriAndCode);
+ connect(m_loginTask.get(), &AccountTask::hideVerificationUriAndCode, this, &MSALoginDialog::hideVerificationUriAndCode);
+ connect(&m_externalLoginTimer, &QTimer::timeout, this, &MSALoginDialog::externalLoginTick);
m_loginTask->start();
return QDialog::exec();
@@ -52,6 +55,37 @@ MSALoginDialog::~MSALoginDialog()
delete ui;
}
+void MSALoginDialog::externalLoginTick() {
+ m_externalLoginElapsed++;
+ ui->progressBar->setValue(m_externalLoginElapsed);
+ ui->progressBar->repaint();
+
+ if(m_externalLoginElapsed >= m_externalLoginTimeout) {
+ m_externalLoginTimer.stop();
+ }
+}
+
+
+void MSALoginDialog::showVerificationUriAndCode(const QUrl& uri, const QString& code, int expiresIn) {
+ m_externalLoginElapsed = 0;
+ m_externalLoginTimeout = expiresIn;
+
+ m_externalLoginTimer.setInterval(1000);
+ m_externalLoginTimer.setSingleShot(false);
+ m_externalLoginTimer.start();
+
+ ui->progressBar->setMaximum(expiresIn);
+ ui->progressBar->setValue(m_externalLoginElapsed);
+
+ 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));
+}
+
+void MSALoginDialog::hideVerificationUriAndCode() {
+ m_externalLoginTimer.stop();
+}
+
void MSALoginDialog::setUserInputsEnabled(bool enable)
{
ui->buttonBox->setEnabled(enable);