struct ClientRegistered : public HandshakeMessage
{
- inline ClientRegistered(quint32 coreFeatures, bool coreConfigured, const QVariantList &backendInfo, const QVariantList &authBackendInfo, bool sslSupported)
+ inline ClientRegistered(quint32 coreFeatures, bool coreConfigured, const QVariantList &backendInfo, bool sslSupported, const QVariantList &authenticatorInfo)
: coreFeatures(coreFeatures)
, coreConfigured(coreConfigured)
, backendInfo(backendInfo)
- , authBackendInfo(authBackendInfo)
+ , authenticatorInfo(authenticatorInfo)
, sslSupported(sslSupported)
{}
quint32 coreFeatures;
bool coreConfigured;
-
- // The authBackendInfo should be optional!
+
+ // The authenticatorInfo should be optional!
QVariantList backendInfo; // TODO: abstract this better
- QVariantList authBackendInfo;
-
+ QVariantList authenticatorInfo;
+
// this is only used by the LegacyProtocol in compat mode
bool sslSupported;
};
struct SetupData : public HandshakeMessage
{
- inline SetupData(const QString &adminUser, const QString &adminPassword, const QString &backend, const QString &authenticator, const QVariantMap &setupData, const QVariantMap &authSetupData)
- : adminUser(adminUser), adminPassword(adminPassword), backend(backend), authenticator(authenticator), setupData(setupData), authSetupData(authSetupData) {}
+ inline SetupData(const QString &adminUser, const QString &adminPassword, const QString &backend,
+ const QVariantMap &setupData, const QString &authenticator = QString(),
+ const QVariantMap &authSetupData = QVariantMap())
+ : adminUser(adminUser)
+ , adminPassword(adminPassword)
+ , backend(backend)
+ , setupData(setupData)
+ , authenticator(authenticator)
+ , authSetupData(authSetupData)
+ {}
QString adminUser;
QString adminPassword;
QString backend;
- QString authenticator;
QVariantMap setupData;
- QVariantMap authSetupData;
+ QString authenticator;
+ QVariantMap authSetupData;
};