diff --git a/authorization.js b/authorization.js index eb8160b61128924cf88f3f0a8f7654139ebd00ae..d6ad847c3887a363ae1709317aef10626a2f1778 100644 --- a/authorization.js +++ b/authorization.js @@ -9,7 +9,20 @@ const { not, } = require('graphql-shield') -const { isAdmin, isAuthenticated } = require('./src/helpers') +const isAuthenticated = rule()(async (parent, args, ctx, info) => { + return !!ctx.user +}) + +const isAdmin = rule()( + async (parent, args, { user: userId, connectors: { User } }, info) => { + if (!userId) { + return false + } + + const user = await User.model.findById(userId) + return user.admin + }, +) module.exports = { rule, diff --git a/src/helpers.js b/src/helpers.js index f2eee5fc2901c97ce14037588d92b5e280abe1d6..03b69620e15f43ba28aaafe7a007b254716e7671 100644 --- a/src/helpers.js +++ b/src/helpers.js @@ -1,5 +1,4 @@ // const axios = require('axios') -const { rule } = require('graphql-shield') const path = require('path') const sharp = require('sharp') const fs = require('fs-extra') @@ -10,21 +9,6 @@ const fs = require('fs-extra') // const services = config.get('services') -const isAuthenticated = rule()(async (parent, args, ctx, info) => { - return !!ctx.user -}) - -const isAdmin = rule()( - async (parent, args, { user: userId, connectors: { User } }, info) => { - if (!userId) { - return false - } - - const user = await User.model.findById(userId) - return user.admin - }, -) - const convertFileStreamIntoBuffer = async fileStream => { return new Promise((resolve, reject) => { // Store file data chunks @@ -172,8 +156,6 @@ const writeFileFromStream = async (inputStream, filePath) => { // } module.exports = { - isAuthenticated, - isAdmin, convertFileStreamIntoBuffer, getFileExtension, getImageFileMetadata,