This commit changes the settings key to something making slightly
more sense in the context of authentication.
// Not entirely sure what is 'legacy' about the above, but it seems to be the way things work!
QVariantMap authSettings = cs.authSettings().toMap();
// Not entirely sure what is 'legacy' about the above, but it seems to be the way things work!
QVariantMap authSettings = cs.authSettings().toMap();
- initAuthenticator(authSettings.value("Authenticator").toString(), authSettings.value("ConnectionProperties").toMap());
+ initAuthenticator(authSettings.value("Authenticator").toString(), authSettings.value("AuthProperties").toMap());
if (Quassel::isOptionSet("select-backend") || Quassel::isOptionSet("select-authenticator")) {
if (Quassel::isOptionSet("select-backend")) {
if (Quassel::isOptionSet("select-backend") || Quassel::isOptionSet("select-authenticator")) {
if (Quassel::isOptionSet("select-backend")) {
{
QVariantMap dbsettings;
dbsettings["Authenticator"] = backend;
{
QVariantMap dbsettings;
dbsettings["Authenticator"] = backend;
- dbsettings["ConnectionProperties"] = settings;
+ dbsettings["AuthProperties"] = settings;
CoreSettings().setAuthSettings(dbsettings);
}
CoreSettings().setAuthSettings(dbsettings);
}
-void LdapAuthenticator::setConnectionProperties(const QVariantMap &properties)
+void LdapAuthenticator::setAuthProperties(const QVariantMap &properties)
{
_hostName = properties["Hostname"].toString();
_port = properties["Port"].toInt();
{
_hostName = properties["Hostname"].toString();
_port = properties["Port"].toInt();
bool LdapAuthenticator::setup(const QVariantMap &settings)
{
bool LdapAuthenticator::setup(const QVariantMap &settings)
{
- setConnectionProperties(settings);
+ setAuthProperties(settings);
bool status = ldapConnect();
return status;
}
bool status = ldapConnect();
return status;
}
Authenticator::State LdapAuthenticator::init(const QVariantMap &settings)
{
Authenticator::State LdapAuthenticator::init(const QVariantMap &settings)
{
- setConnectionProperties(settings);
+ setAuthProperties(settings);
bool status = ldapConnect();
if (!status) {
bool status = ldapConnect();
if (!status) {
UserId validateUser(const QString &user, const QString &password);
protected:
UserId validateUser(const QString &user, const QString &password);
protected:
- virtual void setConnectionProperties(const QVariantMap &properties);
+ virtual void setAuthProperties(const QVariantMap &properties);
bool ldapConnect();
void ldapDisconnect();
bool ldapAuth(const QString &username, const QString &password);
bool ldapConnect();
void ldapDisconnect();
bool ldapAuth(const QString &username, const QString &password);
-QVariantMap AuthenticationSelectionPage::connectionProperties() const
+QVariantMap AuthenticationSelectionPage::authProperties() const
{
QString backend = ui.backendList->itemData(ui.backendList->currentIndex()).toString();
{
QString backend = ui.backendList->itemData(ui.backendList->currentIndex()).toString();
// Fill in sync info about the authentication layer.
AuthenticationSelectionPage *authPage = qobject_cast<AuthenticationSelectionPage *>(wizard()->page(CoreConfigWizard::AuthenticationSelectionPage));
QString authenticator = authPage->selectedBackend();
// Fill in sync info about the authentication layer.
AuthenticationSelectionPage *authPage = qobject_cast<AuthenticationSelectionPage *>(wizard()->page(CoreConfigWizard::AuthenticationSelectionPage));
QString authenticator = authPage->selectedBackend();
- QVariantMap authProperties = authPage->connectionProperties();
+ QVariantMap authProperties = authPage->authProperties();
Q_ASSERT(!authenticator.isEmpty());
ui.authenticator->setText(authenticator);
Q_ASSERT(!authenticator.isEmpty());
ui.authenticator->setText(authenticator);
AuthenticationSelectionPage(const QHash<QString, QVariant> &backends, QWidget *parent = 0);
int nextId() const;
QString selectedBackend() const;
AuthenticationSelectionPage(const QHash<QString, QVariant> &backends, QWidget *parent = 0);
int nextId() const;
QString selectedBackend() const;
- QVariantMap connectionProperties() const;
+ QVariantMap authProperties() const;
private slots:
void on_backendList_currentIndexChanged();
private slots:
void on_backendList_currentIndexChanged();