Merge branch 'developo' into develop

This commit is contained in:
Zoey
2023-03-18 11:30:42 +01:00
46 changed files with 410 additions and 307 deletions

View File

@@ -55,8 +55,8 @@ module.exports = function (token_string) {
.where('id', token_data.attrs.id)
.andWhere('is_deleted', 0)
.andWhere('is_disabled', 0)
.allowEager('[permissions]')
.eager('[permissions]')
.allowGraph('[permissions]')
.withGraphFetched('[permissions]')
.first()
.then((user) => {
if (user) {