liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: objection 2 changes

Browse Source
This commit is contained in:
NGPixel
2020-01-24 19:20:53 -05:00
parent e7b5457354
commit 988ba3f616
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/models/users.js
View File

@@ -331,7 +331,7 @@ module.exports = class User extends Model {
static async refreshToken(user) {
if (_.isSafeInteger(user)) {
user = await WIKI.models.users.query().findById(user).eager('groups').modifyEager('groups', builder => {
user = await WIKI.models.users.query().findById(user).withGraphFetched('groups').modifyGraph('groups', builder => {
builder.select('groups.id', 'permissions')
})
if (!user) {
@@ -339,7 +339,7 @@ module.exports = class User extends Model {
throw new WIKI.Error.AuthGenericError()
}
} else if (_.isNil(user.groups)) {
await user.$relatedQuery('groups').select('groups.id', 'permissions')
user.groups = await user.$relatedQuery('groups').select('groups.id', 'permissions')
}
return {