feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Mercurial: Handle HTTP authentication, auth dialog

Browse Source 
Make it possible to pull and push into online repositories with http
authorization.
Changes:
* Separated dialogs for entering username and password are merge
together
* Do not show dialog for local repos
* Prohibit passwords for ssh scheme

Task-number: QTCREATORBUG-5104
Change-Id: I22fe3d778bb43d25ccd3ee423f98b22dd2019c24
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Nikita Baryshnikov
2013-06-10 00:57:54 +03:00
committed by Tobias Hunger
parent 8ba09eabca
commit bc29c67183
6 changed files with 237 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/mercurial/srcdestdialog.cpp
View File

@@ -27,11 +27,11 @@
**
****************************************************************************/
#include "authenticationdialog.h"
#include "mercurialplugin.h"
#include "srcdestdialog.h"
#include "ui_srcdestdialog.h"
#include "mercurialplugin.h"
#include <QInputDialog>
#include <QSettings>
#include <QUrl>
@@ -67,18 +67,21 @@ QString SrcDestDialog::getRepositoryString() const
{
if (m_ui->defaultButton->isChecked()) {
QUrl repoUrl(getRepoUrl());
if (m_ui->promptForCredentials && (repoUrl.userName().isEmpty() || repoUrl.password().isEmpty())) {
if (repoUrl.userName().isEmpty()) {
QString user = QInputDialog::getText(0, tr("Enter user name"), tr("User name:"));
if (user.isEmpty())
return repoUrl.toString();
if (m_ui->promptForCredentials->isChecked() && !repoUrl.scheme().isEmpty() && repoUrl.scheme() != QLatin1String("file")) {
QScopedPointer<AuthenticationDialog> authDialog(new AuthenticationDialog(repoUrl.userName(), repoUrl.password()));
authDialog->setPasswordEnabled(repoUrl.scheme() != QLatin1String("ssh"));
if (authDialog->exec()== 0)
return repoUrl.toString();
QString user = authDialog->getUserName();
if (user.isEmpty())
return repoUrl.toString();
if (user != repoUrl.userName())
repoUrl.setUserName(user);
}
if (repoUrl.password().isEmpty()) {
QString password = QInputDialog::getText(0, tr("Enter password"), tr("Password:"), QLineEdit::Password);
if (!password.isEmpty())
repoUrl.setPassword(password);
}
QString pass = authDialog->getPassword();
if (!pass.isEmpty() && pass != repoUrl.password())
repoUrl.setPassword(pass);
}
return repoUrl.toString();
}