From de100e81417c2839bdfb297675ffaf9f2ca84877 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 17 Jun 2016 13:29:42 -0700 Subject: [PATCH] after receiving a group's ID from api, save it --- .../src/DomainServerSettingsManager.cpp | 16 ++++++++-------- libraries/networking/src/NodePermissions.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index af0d5afab6..87803895a9 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -302,7 +302,7 @@ void DomainServerSettingsManager::packPermissions() { packPermissionsForMap("permissions", _agentPermissions, AGENT_PERMISSIONS_KEYPATH); // save settings for groups - packPermissionsForMap("permissions", _groupPermissions, AGENT_PERMISSIONS_KEYPATH); + packPermissionsForMap("permissions", _groupPermissions, GROUP_PERMISSIONS_KEYPATH); persistToFile(); _configMap.loadMasterAndUserConfig(_argumentList); @@ -898,22 +898,22 @@ void DomainServerSettingsManager::getGroupID(const QString& groupname) { void DomainServerSettingsManager::getGroupIDJSONCallback(QNetworkReply& requestReply) { QJsonObject jsonObject = QJsonDocument::fromJson(requestReply.readAll()).object(); - qDebug() << "GOT RESPONSE" << jsonObject["group_id"].toString(); - if (jsonObject["status"].toString() == "success") { QString groupName = jsonObject["group_name"].toString(); QUuid groupID = QUuid(jsonObject["group_id"].toString()); - if (!_groupPermissions.contains(groupName)) { + if (_groupPermissions.contains(groupName)) { + qDebug() << "ID for group:" << groupName << "is" << groupID; + _groupPermissions[groupName]->setGroupID(groupID); + packPermissions(); + } else { qDebug() << "DomainServerSettingsManager::getGroupIDJSONCallback got response for unknown group:" << groupName; } - - _groupPermissions[groupName]->setGroupID(groupID); } else { - // XXX what? + qDebug() << "getGroupID api call returned:" << QJsonDocument(jsonObject).toJson(QJsonDocument::Compact); } } void DomainServerSettingsManager::getGroupIDErrorCallback(QNetworkReply& requestReply) { - qDebug() << "ERROR" << requestReply.error(); + qDebug() << "getGroupID api call failed:" << requestReply.error(); } diff --git a/libraries/networking/src/NodePermissions.h b/libraries/networking/src/NodePermissions.h index a18ccdf97d..9c8f4ace44 100644 --- a/libraries/networking/src/NodePermissions.h +++ b/libraries/networking/src/NodePermissions.h @@ -33,7 +33,7 @@ public: void setUserName(QString userName) { _userName = userName; } QString getUserName() { return _userName; } - void setGroupID(QUuid groupID) { _groupID = groupID; } + void setGroupID(QUuid groupID) { _groupID = groupID; _groupIDSet = true; } QUuid getGroupID() { return _groupID; } bool isGroup() { return _groupIDSet; }