From c5b8ff181e428785e521af7cf6f0c1f3651fead0 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 19 Feb 2014 14:14:17 -0800 Subject: [PATCH] indicate that both username or email can be passed for login --- interface/src/Menu.cpp | 10 +++++----- libraries/shared/src/AccountManager.cpp | 4 ++-- libraries/shared/src/AccountManager.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 77eb13761e..6180481935 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -750,9 +750,9 @@ void Menu::loginForCurrentDomain() { QFormLayout* form = new QFormLayout(); layout->addLayout(form, 1); - QLineEdit* usernameLineEdit = new QLineEdit(); - usernameLineEdit->setMinimumWidth(QLINE_MINIMUM_WIDTH); - form->addRow("Username:", usernameLineEdit); + QLineEdit* loginLineEdit = new QLineEdit(); + loginLineEdit->setMinimumWidth(QLINE_MINIMUM_WIDTH); + form->addRow("Login:", loginLineEdit); QLineEdit* passwordLineEdit = new QLineEdit(); passwordLineEdit->setMinimumWidth(QLINE_MINIMUM_WIDTH); @@ -766,9 +766,9 @@ void Menu::loginForCurrentDomain() { int dialogReturn = loginDialog.exec(); - if (dialogReturn == QDialog::Accepted && !usernameLineEdit->text().isEmpty() && !passwordLineEdit->text().isEmpty()) { + if (dialogReturn == QDialog::Accepted && !loginLineEdit->text().isEmpty() && !passwordLineEdit->text().isEmpty()) { // attempt to get an access token given this username and password - AccountManager::getInstance().requestAccessToken(usernameLineEdit->text(), passwordLineEdit->text()); + AccountManager::getInstance().requestAccessToken(loginLineEdit->text(), passwordLineEdit->text()); } sendFakeEnterEvent(); diff --git a/libraries/shared/src/AccountManager.cpp b/libraries/shared/src/AccountManager.cpp index 9d6e64d66a..215fc3a77b 100644 --- a/libraries/shared/src/AccountManager.cpp +++ b/libraries/shared/src/AccountManager.cpp @@ -96,7 +96,7 @@ bool AccountManager::checkAndSignalForAccessToken() { return hasToken; } -void AccountManager::requestAccessToken(const QString& username, const QString& password) { +void AccountManager::requestAccessToken(const QString& login, const QString& password) { if (_networkAccessManager) { QNetworkRequest request; @@ -105,7 +105,7 @@ void AccountManager::requestAccessToken(const QString& username, const QString& QByteArray postData; postData.append("grant_type=password&"); - postData.append("username=" + username + "&"); + postData.append("username=" + login + "&"); postData.append("password=" + password); request.setUrl(grantURL); diff --git a/libraries/shared/src/AccountManager.h b/libraries/shared/src/AccountManager.h index 9353dc2739..72ec969436 100644 --- a/libraries/shared/src/AccountManager.h +++ b/libraries/shared/src/AccountManager.h @@ -31,7 +31,7 @@ public: bool hasValidAccessToken(); bool checkAndSignalForAccessToken(); - void requestAccessToken(const QString& username, const QString& password); + void requestAccessToken(const QString& login, const QString& password); const QString& getUsername() const { return _username; } void setUsername(const QString& username) { _username = username; }