From 1c4829f70f4642571b001eff4f2ad7e102894e2f Mon Sep 17 00:00:00 2001 From: Regev Brody Date: Sat, 4 Jul 2020 00:49:54 +0300 Subject: [PATCH] fix: tags filtered by access (#2100) --- server/graph/resolvers/page.js | 43 +++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/server/graph/resolvers/page.js b/server/graph/resolvers/page.js index b9db3793..3589d7e2 100644 --- a/server/graph/resolvers/page.js +++ b/server/graph/resolvers/page.js @@ -171,26 +171,51 @@ module.exports = { * FETCH TAGS */ async tags (obj, args, context, info) { - return WIKI.models.tags.query().orderBy('tag', 'asc') + const pages = await WIKI.models.pages.query().column([ + 'path', + { locale: 'localeCode' }, + ]) + .withGraphJoined('tags') + const allTags = _.filter(pages, r => { + return WIKI.auth.checkAccess(context.req.user, ['read:pages'], { + path: r.path, + locale: r.locale + }) + }) + .flatMap(r => r.tags) + return _.orderBy(_.uniqBy(allTags, 'id'), ['tag'], ['asc']) }, /** * SEARCH TAGS */ async searchTags (obj, args, context, info) { const query = _.trim(args.query) - const results = await WIKI.models.tags.query() - .column('tag') - .where(builder => { - builder.andWhere(builderSub => { + const pages = await WIKI.models.pages.query().column([ + 'path', + { locale: 'localeCode' }, + ]) + .withGraphJoined('tags') + .modifyGraph('tags', builder => { + builder.select('tag') + }) + .modify(queryBuilder => { + queryBuilder.andWhere(builderSub => { if (WIKI.config.db.type === 'postgres') { - builderSub.where('tag', 'ILIKE', `%${query}%`) + builderSub.where('tags.tag', 'ILIKE', `%${query}%`) } else { - builderSub.where('tag', 'LIKE', `%${query}%`) + builderSub.where('tags.tag', 'LIKE', `%${query}%`) } }) }) - .limit(5) - return results.map(r => r.tag) + const allTags = _.filter(pages, r => { + return WIKI.auth.checkAccess(context.req.user, ['read:pages'], { + path: r.path, + locale: r.locale + }) + }) + .flatMap(r => r.tags) + .map(t => t.tag) + return _.uniq(allTags).slice(0, 5) }, /** * FETCH PAGE TREE