ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-18 15:18:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Big SSO update

Browse Source 
make things hopefully work
This commit is contained in:
Grant Limberg
2021-06-03 14:38:26 -07:00
parent 81fda3f5b8
commit 4f521baafd
7 changed files with 144 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controller/DB.cpp
View File

@ -49,6 +49,9 @@ void DB::initNetwork(nlohmann::json &network)
}};
}
if (!network.count("dns")) network["dns"] = nlohmann::json::array();
if (!network.count("ssoEnabled")) network["ssoEnabled"] = false;
if (!network.count("clientId")) network["clientId"] = "";
if (!network.count("authorizationEndpoint")) network["authorizationEndpoint"] = "";
network["objtype"] = "network";
}
@ -136,7 +139,6 @@ bool DB::get(const uint64_t networkId,nlohmann::json &network,const uint64_t mem
if (m == nw->members.end())
return false;
member = m->second;
updateMemberOnLoad(networkId, memberId, member);
}
return true;
}
@ -160,7 +162,6 @@ bool DB::get(const uint64_t networkId,nlohmann::json &network,const uint64_t mem
if (m == nw->members.end())
return false;
member = m->second;
updateMemberOnLoad(networkId, memberId, member);
}
return true;
}
@ -181,7 +182,6 @@ bool DB::get(const uint64_t networkId,nlohmann::json &network,std::vector<nlohma
network = nw->config;
for(auto m=nw->members.begin();m!=nw->members.end();++m) {
members.push_back(m->second);
updateMemberOnLoad(networkId, m->first, members.back());
}
}
return true;