X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=66fc50b01759a06e67fc9bec8f59388ada5be79c;hb=4b0caf61565c8791efba283bbcaf73530b9feafc;hp=7811b1194fd780a32b4e5a63f6cef447af583e07;hpb=fdf6853d42bbd3279d5bc85df9006145382b0ea6;p=quassel.git

diff --git a/src/core/core.h b/src/core/core.h
index 7811b119..66fc50b0 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -95,7 +95,7 @@ public:
     static inline UserId addUser(const QString &userName, const QString &password, const QString &authenticator = "Database") {
         return instance()->_storage->addUser(userName, password, authenticator);
     }
-    
+
     //! Does a comparison test against the authenticator in the database and the authenticator currently in use for a UserID.
     /**
      * \param userid The user's ID (note: not login name).
@@ -556,7 +556,7 @@ public:
         return (backend->displayName() == "SQLite") ? true : false;
     }
 
-    static QString setup(const QString &adminUser, const QString &adminPassword, const QString &backend, const QVariantMap &setupData, const QString &authBackend, const QVariantMap &authSetupMap);
+    static QString setup(const QString &adminUser, const QString &adminPassword, const QString &backend, const QVariantMap &setupData, const QString &authenticator, const QVariantMap &authSetupMap);
 
     static inline QTimer &syncTimer() { return instance()->_storageSyncTimer; }
 
@@ -570,7 +570,7 @@ public slots:
      */
     void syncStorage();
     void setupInternalClientSession(InternalPeer *clientConnection);
-    QString setupCore(const QString &adminUser, const QString &adminPassword, const QString &backend, const QVariantMap &setupData, const QString &authBackend, const QVariantMap &authSetupMap);
+    QString setupCore(const QString &adminUser, const QString &adminPassword, const QString &backend, const QVariantMap &setupData, const QString &authenticator, const QVariantMap &authSetupMap);
 
 signals:
     //! Sent when a BufferInfo is updated in storage.
@@ -612,16 +612,21 @@ private:
     void unregisterStorageBackends();
     void unregisterStorageBackend(Storage *);
 
-    void registerAuthenticatorBackends();
-    bool registerAuthenticatorBackend(Authenticator *);
-    void unregisterAuthenticatorBackends();
-    void unregisterAuthenticatorBackend(Authenticator *);
+    void registerAuthenticators();
+    bool registerAuthenticator(Authenticator *);
+    void unregisterAuthenticators();
+    void unregisterAuthenticator(Authenticator *);
 
     bool selectBackend(const QString &backend);
+    bool selectAuthenticator(const QString &backend);
     bool createUser();
+
     bool saveBackendSettings(const QString &backend, const QVariantMap &settings);
-    void saveAuthBackendSettings(const QString &backend, const QVariantMap &settings);
+    void saveAuthenticatorSettings(const QString &backend, const QVariantMap &settings);
+
     QVariantMap promptForSettings(const Storage *storage);
+    QVariantMap promptForSettings(const Authenticator *authenticator);
+    QVariantMap promptForSettings(QStringList keys, QVariantMap defaults);
 
 private:
     QSet<CoreAuthHandler *> _connectingClients;
@@ -641,7 +646,7 @@ private:
     OidentdConfigGenerator *_oidentdConfigGenerator;
 
     QHash<QString, Storage *> _storageBackends;
-    QHash<QString, Authenticator *> _authenticatorBackends;
+    QHash<QString, Authenticator *> _authenticators;
 
     QDateTime _startTime;