Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 11:58:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

after receiving a group's ID from api, save it

Browse source
This commit is contained in:
Seth Alves 2016-06-17 13:29:42 -07:00
parent 0dde906354
commit de100e8141
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -302,7 +302,7 @@ void DomainServerSettingsManager::packPermissions() {
packPermissionsForMap("permissions", _agentPermissions, AGENT_PERMISSIONS_KEYPATH); packPermissionsForMap("permissions", _agentPermissions, AGENT_PERMISSIONS_KEYPATH);
// save settings for groups // save settings for groups
packPermissionsForMap("permissions", _groupPermissions, AGENT_PERMISSIONS_KEYPATH); packPermissionsForMap("permissions", _groupPermissions, GROUP_PERMISSIONS_KEYPATH);
persistToFile(); persistToFile();
_configMap.loadMasterAndUserConfig(_argumentList); _configMap.loadMasterAndUserConfig(_argumentList);
@ -898,22 +898,22 @@ void DomainServerSettingsManager::getGroupID(const QString& groupname) {
void DomainServerSettingsManager::getGroupIDJSONCallback(QNetworkReply& requestReply) { void DomainServerSettingsManager::getGroupIDJSONCallback(QNetworkReply& requestReply) {
QJsonObject jsonObject = QJsonDocument::fromJson(requestReply.readAll()).object(); QJsonObject jsonObject = QJsonDocument::fromJson(requestReply.readAll()).object();
qDebug() << "GOT RESPONSE" << jsonObject["group_id"].toString();
if (jsonObject["status"].toString() == "success") { if (jsonObject["status"].toString() == "success") {
QString groupName = jsonObject["group_name"].toString(); QString groupName = jsonObject["group_name"].toString();
QUuid groupID = QUuid(jsonObject["group_id"].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; qDebug() << "DomainServerSettingsManager::getGroupIDJSONCallback got response for unknown group:" << groupName;
} }
_groupPermissions[groupName]->setGroupID(groupID);
} else { } else {
// XXX what? qDebug() << "getGroupID api call returned:" << QJsonDocument(jsonObject).toJson(QJsonDocument::Compact);
} }
} }
void DomainServerSettingsManager::getGroupIDErrorCallback(QNetworkReply& requestReply) { void DomainServerSettingsManager::getGroupIDErrorCallback(QNetworkReply& requestReply) {
qDebug() << "ERROR" << requestReply.error(); qDebug() << "getGroupID api call failed:" << requestReply.error();
} }

2
libraries/networking/src/NodePermissions.h
View file

@ -33,7 +33,7 @@ public:
void setUserName(QString userName) { _userName = userName; } void setUserName(QString userName) { _userName = userName; }
QString getUserName() { return _userName; } QString getUserName() { return _userName; }
void setGroupID(QUuid groupID) { _groupID = groupID; } void setGroupID(QUuid groupID) { _groupID = groupID; _groupIDSet = true; }
QUuid getGroupID() { return _groupID; } QUuid getGroupID() { return _groupID; }
bool isGroup() { return _groupIDSet; } bool isGroup() { return _groupIDSet; }