X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fauthenticator.h;h=ebea4c94eafaddfe64e78e1dbc49bb061b4b665e;hp=30f469e141fdf65db00ad545f2070fe4c7919b12;hb=5fc6f7e2d63b45770574260afd6ce535e9548d23;hpb=fdf6853d42bbd3279d5bc85df9006145382b0ea6

diff --git a/src/core/authenticator.h b/src/core/authenticator.h
index 30f469e1..ebea4c94 100644
--- a/src/core/authenticator.h
+++ b/src/core/authenticator.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,10 +18,13 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef AUTHENTICATOR_H
-#define AUTHENTICATOR_H
+#pragma once
 
-#include <QtCore>
+#include <QObject>
+#include <QProcessEnvironment>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
 
 #include "types.h"
 
@@ -30,13 +33,13 @@ class Authenticator : public QObject {
     Q_OBJECT
 
 public:
-    Authenticator(QObject *parent = 0);
-    virtual ~Authenticator() {};
+    using QObject::QObject;
+    ~Authenticator() override = default;
 
     enum State {
-        IsReady,        // ready to go
-        NeedsSetup,        // need basic setup (ask the user for input)
-        NotAvailable     // remove the authenticator backend from the list of avaliable authenticators.
+        IsReady,      // ready to go
+        NeedsSetup,   // need basic setup (ask the user for input)
+        NotAvailable  // remove the authenticator backend from the list of avaliable authenticators.
     };
 
 
@@ -50,6 +53,10 @@ public slots:
      */
     virtual bool isAvailable() const = 0;
 
+    //! Returns the identifier of the authenticator backend
+    /** \return A string that can be used by the client to identify the authenticator backend */
+    virtual QString backendId() const = 0;
+
     //! Returns the display name of the authenticator backend
     /** \return A string that can be used by the client to name the authenticator backend */
     virtual QString displayName() const = 0;
@@ -58,28 +65,34 @@ public slots:
     /** \return A string that can be displayed by the client to describe the authenticator */
     virtual QString description() const = 0;
 
-    //! Returns a list of properties required to use the authenticator backend
-    virtual QStringList setupKeys() const = 0;
+    //! Returns data required to configure the authenticator backend
+    /**
+     * A list of flattened triples for each field: {key, translated field name, default value}
+     * The default value's type determines the kind of input widget to be shown
+     * (int -> QSpinBox; QString -> QLineEdit)
+     * \return A list of triples defining the data to be shown in the configuration dialog
+     */
+    virtual QVariantList setupData() const = 0;
 
     //! Checks if the authenticator allows manual password changes from inside quassel.
     virtual bool canChangePassword() const = 0;
 
-    //! Returns a map where the keys are are properties to use the authenticator backend
-    /*  the values are QVariants with default values */
-    virtual QVariantMap setupDefaults() const = 0;
-
     //! Setup the authenticator provider.
     /** This prepares the authenticator provider (e.g. create tables, etc.) for use within Quassel.
      *  \param settings   Hostname, port, username, password, ...
      *  \return True if and only if the authenticator provider was initialized successfully.
      */
-    virtual bool setup(const QVariantMap &settings = QVariantMap()) = 0;
+    virtual bool setup(const QVariantMap &settings = QVariantMap(),
+                       const QProcessEnvironment &environment = {},
+                       bool loadFromEnvironment = false) = 0;
 
     //! Initialize the authenticator provider
     /** \param settings   Hostname, port, username, password, ...
      *  \return the State the authenticator backend is now in (see authenticator::State)
      */
-    virtual State init(const QVariantMap &settings = QVariantMap()) = 0;
+    virtual State init(const QVariantMap &settings = QVariantMap(),
+                       const QProcessEnvironment &environment = {},
+                       bool loadFromEnvironment = false) = 0;
 
     //! Validate a username with a given password.
     /** \param user     The username to validate
@@ -87,9 +100,4 @@ public slots:
      *  \return A valid UserId if the password matches the username; 0 else
      */
     virtual UserId validateUser(const QString &user, const QString &password) = 0;
-
-private:
-
 };
-
-#endif