diff --git a/src/server.spec.ts b/src/server.spec.ts index 3c05507..fa7c4f8 100644 --- a/src/server.spec.ts +++ b/src/server.spec.ts @@ -3,7 +3,7 @@ import { GraphQLClient, rawRequest } from "graphql-request" import fetch from "node-fetch" import { createConnection } from "typeorm" import { createServer } from "./server" -import { gqlToString } from "./server/schema" +import { gqlToStr } from "./server/schema" import { testingConnectionOptions } from "./server/testing" import { verifiedRefreshTokenPayload } from "./server/userResolver/auth" import { User } from "./server/userResolver/User" @@ -14,13 +14,10 @@ describe("server should", () => { const halfADay = (60 * 60 * 24) / 2 const fifteenDays = 60 * 60 * 24 * 15 - const createUserResponse = await rawRequest( - gqlUri, - gqlToString(createUserMutation) - ) + const createUserResponse = await rawRequest(gqlUri, gqlToStr(createUserMutation)) const userId = createUserResponse.data.createUser.id - const accessTokenReponse = await rawRequest(gqlUri, gqlToString(accessTokenQuery)) + const accessTokenReponse = await rawRequest(gqlUri, gqlToStr(accessTokenQuery)) const accessToken: string = accessTokenReponse.data.accessToken const headers: Headers = accessTokenReponse.headers const cookieHeader = headers.get("set-cookie") as string @@ -35,7 +32,7 @@ describe("server should", () => { Authorization: "Bearer " + accessToken, }, }) - const meResponse = await client.rawRequest(gqlToString(meQuery)) + const meResponse = await client.rawRequest(gqlToStr(meQuery)) const refreshTokenResponse = await fetch(refreshTokenUri, { method: "POST", diff --git a/src/server/UserResolver.spec.ts b/src/server/UserResolver.spec.ts index a0cc629..1da7d53 100644 --- a/src/server/UserResolver.spec.ts +++ b/src/server/UserResolver.spec.ts @@ -25,24 +25,6 @@ describe("resolver of user", () => { ) }) - describe("users query should", () => { - it( - "return emails of registered users", - runInRollbackTransaction(async () => { - await User.create({ - email: "users-query@user-resolver.com", - }).save() - - const response = await callSchema(usersQuery) - - expect(response.errors).toBeUndefined() - expect(response.data).toMatchObject({ - users: [{ email: "users-query@user-resolver.com" }], - }) - }) - ) - }) - describe("accessToken query should", () => { it( "return error for bad password or not-existent user", @@ -134,13 +116,6 @@ const createUserMutation = gql` } } ` -const usersQuery = gql` - query { - users { - email - } - } -` const accessTokenQuery = gql` query { accessToken(email: "access-token@user-resolver.com", password: "password") diff --git a/src/server/UserResolver.ts b/src/server/UserResolver.ts index 7859f81..6b858d2 100644 --- a/src/server/UserResolver.ts +++ b/src/server/UserResolver.ts @@ -1,14 +1,13 @@ import "reflect-metadata" import { Arg, Authorized, Ctx, Mutation, Query } from "type-graphql" -import { comparePasswords, Context, accessTokenWithRefreshCookie } from "./userResolver/auth" +import { + accessTokenWithRefreshCookie, + comparePasswords, + Context, +} from "./userResolver/auth" import { User } from "./userResolver/User" export class UserResolver { - @Query(() => [User]) - async users() { - return await User.find() - } - @Query(() => String) async accessToken( @Arg("email") email: string, diff --git a/src/server/schema.ts b/src/server/schema.ts index b58ed6e..04c748e 100644 --- a/src/server/schema.ts +++ b/src/server/schema.ts @@ -13,7 +13,7 @@ export const callSchema = async (document: DocumentNode, context?: Context) => { return graphql({ schema, - source: gqlToString(document), + source: gqlToStr(document), contextValue: context, }) } @@ -24,4 +24,4 @@ export const createSchema = () => authChecker: customAuthChecker, }) -export const gqlToString = (document: DocumentNode) => document.loc!.source.body as string +export const gqlToStr = (document: DocumentNode) => document.loc!.source.body as string