diff --git a/backend/src/auth/auth.ts b/backend/src/graphql/directive/isAuthorized.ts similarity index 66% rename from backend/src/auth/auth.ts rename to backend/src/graphql/directive/isAuthorized.ts index 7be67764b..77fe56ba1 100644 --- a/backend/src/auth/auth.ts +++ b/backend/src/graphql/directive/isAuthorized.ts @@ -1,13 +1,16 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { AuthChecker } from 'type-graphql' -import decode from '../jwt/decode' -import { apiGet } from '../apis/HttpRequest' -import CONFIG from '../config' -import encode from '../jwt/encode' -/* eslint-disable-next-line @typescript-eslint/no-unused-vars */ -export const isAuthorized: AuthChecker = async ({ root, args, context, info }, roles) => { +import CONFIG from '../../config' +import { apiGet } from '../../apis/HttpRequest' + +import decode from '../../jwt/decode' +import encode from '../../jwt/encode' + +const isAuthorized: AuthChecker = async ( + { /* root, args, */ context /*, info */ } /*, roles */, +) => { if (context.token) { const decoded = decode(context.token) if (decoded.sessionId && decoded.sessionId !== 0) { @@ -22,3 +25,5 @@ export const isAuthorized: AuthChecker = async ({ root, args, context, info } throw new Error('401 Unauthorized') } + +export default isAuthorized diff --git a/backend/src/graphql/resolvers/index.ts b/backend/src/graphql/resolvers/index.ts deleted file mode 100644 index f42829645..000000000 --- a/backend/src/graphql/resolvers/index.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { UserResolver } from './UserResolver' -import { BalanceResolver } from './BalanceResolver' -import { GdtResolver } from './GdtResolver' -import { TransactionResolver } from './TransactionResolver' -import { KlicktippResolver } from './KlicktippResolver' -import { NonEmptyArray } from 'type-graphql' - -export { UserResolver, BalanceResolver, GdtResolver, TransactionResolver, KlicktippResolver } - -// eslint-disable-next-line @typescript-eslint/ban-types -const resolvers = (): NonEmptyArray => [ - UserResolver, - BalanceResolver, - GdtResolver, - TransactionResolver, - KlicktippResolver, -] - -export default resolvers diff --git a/backend/src/graphql/schema.ts b/backend/src/graphql/schema.ts index f18a3bea6..0a570ae82 100644 --- a/backend/src/graphql/schema.ts +++ b/backend/src/graphql/schema.ts @@ -1,12 +1,12 @@ import { GraphQLSchema } from 'graphql' import { buildSchema } from 'type-graphql' +import path from 'path' -import resolvers from './resolvers' -import { isAuthorized } from '../auth/auth' +import isAuthorized from './directive/isAuthorized' const schema = async (): Promise => { return buildSchema({ - resolvers: resolvers(), + resolvers: [path.join(__dirname, 'resolver', `*.{js,ts}`)], authChecker: isAuthorized, }) }