From 83cba2dd82cbd3d4abcea7fcd6b328727e6bd762 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 2 Jun 2016 13:28:36 -0700 Subject: [PATCH] start on code to convert from settings version 1.2 to 1.3 --- domain-server/src/DomainGatekeeper.cpp | 2 -- .../src/DomainServerSettingsManager.cpp | 17 +++++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp index c80969c8b4..cc631abfb7 100644 --- a/domain-server/src/DomainGatekeeper.cpp +++ b/domain-server/src/DomainGatekeeper.cpp @@ -173,8 +173,6 @@ SharedNodePointer DomainGatekeeper::processAssignmentConnectRequest(const NodeCo } const QString MAXIMUM_USER_CAPACITY = "security.maximum_user_capacity"; -// const QString ALLOWED_EDITORS_SETTINGS_KEYPATH = "security.allowed_editors"; -// const QString EDITORS_ARE_REZZERS_KEYPATH = "security.editors_are_rezzers"; SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnectionData& nodeConnection, const QString& username, diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index df299734cf..aa1297c3de 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -101,6 +101,11 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList double oldVersion = appSettings.value(JSON_SETTINGS_VERSION_KEY, 0.0).toDouble(); if (oldVersion != _descriptionVersion) { + const QString ALLOWED_USERS_SETTINGS_KEYPATH = "security.allowed_users"; + const QString RESTRICTED_ACCESS_SETTINGS_KEYPATH = "security.restricted_access"; + const QString ALLOWED_EDITORS_SETTINGS_KEYPATH = "security.allowed_editors"; + const QString EDITORS_ARE_REZZERS_KEYPATH = "security.editors_are_rezzers"; + qDebug() << "Previous domain-server settings version was" << QString::number(oldVersion, 'g', 8) << "and the new version is" << QString::number(_descriptionVersion, 'g', 8) << "- checking if any re-mapping is required"; @@ -110,8 +115,6 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList // This was prior to the introduction of security.restricted_access // If the user has a list of allowed users then set their value for security.restricted_access to true - const QString ALLOWED_USERS_SETTINGS_KEYPATH = "security.allowed_users"; - const QString RESTRICTED_ACCESS_SETTINGS_KEYPATH = "security.restricted_access"; QVariant* allowedUsers = valueForKeyPath(_configMap.getMergedConfig(), ALLOWED_USERS_SETTINGS_KEYPATH); if (allowedUsers @@ -198,7 +201,17 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList if (oldVersion < 1.3) { // This was prior to the permissions-grid in the domain-server settings page + // bool isRestrictingAccess = valueOrDefaultValueForKeyPath(RESTRICTED_ACCESS_SETTINGS_KEYPATH).toBool(); + // const QVariant* allowedEditorsVariant = valueForKeyPath(getSettingsMap(), ALLOWED_EDITORS_SETTINGS_KEYPATH); + + // const QVariant* editorsAreRezzersVariant = valueForKeyPath(getSettingsMap(), EDITORS_ARE_REZZERS_KEYPATH); + // bool onlyEditorsAreRezzers = false; + // if (editorsAreRezzersVariant) { + // onlyEditorsAreRezzers = editorsAreRezzersVariant->toBool(); + // } + + // XXX } }