Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

potential fix for release-3.4/#79 (#6789)

This commit is contained in:
Jan 2018-10-10 14:41:48 +02:00 committed by GitHub
parent 28a24b9bf4
commit 730f47eb0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arangod/Auth/UserManager.cpp
View File

@ -183,11 +183,13 @@ static void ConvertLegacyFormat(VPackSlice doc, VPackBuilder& result) {
doc = doc.resolveExternals();
}
VPackSlice authDataSlice = doc.get("authData");
VPackObjectBuilder b(&result, true);
result.add("user", doc.get("user"));
result.add("active", authDataSlice.get("active"));
VPackSlice extra = doc.get("userData");
result.add("extra", extra.isNone() ? VPackSlice::emptyObjectSlice() : extra);
{
VPackObjectBuilder b(&result, true);
result.add("user", doc.get("user"));
result.add("active", authDataSlice.get("active"));
VPackSlice extra = doc.get("userData");
result.add("extra", extra.isNone() ? VPackSlice::emptyObjectSlice() : extra);
}
}
// private, will acquire _userCacheLock in write-mode and release it.
@ -381,10 +383,12 @@ VPackBuilder auth::UserManager::allUsers() {
std::shared_ptr<VPackBuilder> users = QueryAllUsers(_queryRegistry);
VPackBuilder result;
VPackArrayBuilder a(&result);
if (users && !users->isEmpty()) {
for (VPackSlice const& doc : VPackArrayIterator(users->slice())) {
ConvertLegacyFormat(doc, result);
{
VPackArrayBuilder a(&result);
if (users && !users->isEmpty()) {
for (VPackSlice const& doc : VPackArrayIterator(users->slice())) {
ConvertLegacyFormat(doc, result);
}
}
}
return result;