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(); doc = doc.resolveExternals();
} }
VPackSlice authDataSlice = doc.get("authData"); VPackSlice authDataSlice = doc.get("authData");
VPackObjectBuilder b(&result, true); {
result.add("user", doc.get("user")); VPackObjectBuilder b(&result, true);
result.add("active", authDataSlice.get("active")); result.add("user", doc.get("user"));
VPackSlice extra = doc.get("userData"); result.add("active", authDataSlice.get("active"));
result.add("extra", extra.isNone() ? VPackSlice::emptyObjectSlice() : extra); VPackSlice extra = doc.get("userData");
result.add("extra", extra.isNone() ? VPackSlice::emptyObjectSlice() : extra);
}
} }
// private, will acquire _userCacheLock in write-mode and release it. // 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); std::shared_ptr<VPackBuilder> users = QueryAllUsers(_queryRegistry);
VPackBuilder result; VPackBuilder result;
VPackArrayBuilder a(&result); {
if (users && !users->isEmpty()) { VPackArrayBuilder a(&result);
for (VPackSlice const& doc : VPackArrayIterator(users->slice())) { if (users && !users->isEmpty()) {
ConvertLegacyFormat(doc, result); for (VPackSlice const& doc : VPackArrayIterator(users->slice())) {
ConvertLegacyFormat(doc, result);
}
} }
} }
return result; return result;