X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=9971278ca45c3fd5e1611c63f2c388c8f4921e90;hp=ff226a8fdd5434e4959bc295c84f3b0409552153;hb=e0f5fdf1fe6131d403fcaeaa0952e1042590e3e1;hpb=931e5280abc6738f94ac052af2a7e31e82487cf1

diff --git a/src/core/core.h b/src/core/core.h
index ff226a8f..9971278c 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -84,15 +84,26 @@ public:
     static inline UserId authenticateUser(const QString &userName, const QString &password) {
         return instance()->_authenticator->validateUser(userName, password);
     }
-    
+
     //! Add a new user, exposed so auth providers can call this without being the storage.
     /**
      * \param userName The user's login name
      * \param password The user's uncrypted password
+     * \param authenticator The name of the auth provider service used to log the user in, defaults to "Database".
      * \return The user's ID if valid; 0 otherwise
      */
-    static inline UserId addUser(const QString &userName, const QString &password) {
-        return instance()->_storage->addUser(userName, password);
+    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).
+     * \param authenticator The name of the auth provider service used to log the user in, defaults to "Database".
+     * \return True if the userid was configured with the passed authenticator, false otherwise.
+     */
+    static inline bool checkAuthProvider(const UserId userid, const QString &authenticator) {
+        return instance()->_storage->getUserAuthenticator(userid) == authenticator;
     }
 
     //! Change a user's password
@@ -103,6 +114,13 @@ public:
      */
     static bool changeUserPassword(UserId userId, const QString &password);
 
+    //! Check if we can change a user password.
+    /**
+     * \param userID     The user's ID
+     * \return true, if we can change their password, false otherwise
+     */
+    static bool canChangeUserPassword(UserId userId);
+
     //! Store a user setting persistently
     /**
      * \param userId       The users Id
@@ -572,7 +590,7 @@ private slots:
 
     bool initStorage(const QString &backend, const QVariantMap &settings, bool setup = false);
     bool initAuthenticator(const QString &backend, const QVariantMap &settings, bool setup = false);
-    
+
     void socketError(QAbstractSocket::SocketError err, const QString &errorString);
     void setupClientSession(RemotePeer *, UserId);
 
@@ -593,12 +611,12 @@ private:
     bool registerStorageBackend(Storage *);
     void unregisterStorageBackends();
     void unregisterStorageBackend(Storage *);
-    
+
     void registerAuthenticatorBackends();
     bool registerAuthenticatorBackend(Authenticator *);
     void unregisterAuthenticatorBackends();
     void unregisterAuthenticatorBackend(Authenticator *);
-    
+
     bool selectBackend(const QString &backend);
     bool createUser();
     bool saveBackendSettings(const QString &backend, const QVariantMap &settings);