@ttoss/graphql-api-server 0.3.8 → 0.5.0

package/dist/esm/index.js

@@ -3,19 +3,14 @@
 // src/index.ts
 import { buildSchema } from "@ttoss/graphql-api";
 import { CognitoJwtVerifier } from "aws-jwt-verify";
-import { getGraphQLParameters, processRequest, renderGraphiQL, sendResult, shouldRenderGraphiQL } from "graphql-helix";
+import { createYoga } from "graphql-yoga";
 import Koa from "koa";
-import Router from "@koa/router";
-import bodyParser from "koa-bodyparser";
-import cors from "@koa/cors";
 var createServer = ({
-  graphiql = false,
   authenticationType,
   userPoolConfig,
   ...buildSchemaInput
 }) => {
-  const server = new Koa();
-  const router = new Router();
+  const app = new Koa();
   const jwtVerifier = (() => {
     if (authenticationType === "AMAZON_COGNITO_USER_POOLS") {
       if (!userPoolConfig) {
@@ -28,50 +23,42 @@ var createServer = ({
     }
     return null;
   })();
-  router.all("/graphql", async ctx => {
+  app.use(async ctx => {
     const request = {
       body: ctx.request.body,
       headers: ctx.headers,
       method: ctx.method,
       query: ctx.request.query
     };
-    try {
-      if (authenticationType === "AMAZON_COGNITO_USER_POOLS" && jwtVerifier) {
-        const token = request.headers.authorization?.replace("Bearer ", "");
-        const identity = await jwtVerifier.verify(token || "");
-        ctx.identity = identity;
+    if (request.method !== "GET" && request.headers.referer !== "http://localhost:4000/graphql") {
+      try {
+        if (authenticationType === "AMAZON_COGNITO_USER_POOLS" && jwtVerifier) {
+          const token = request.headers.authorization?.replace("Bearer ", "");
+          const identity = await jwtVerifier.verify(token || "");
+          ctx.identity = identity;
+        }
+      } catch {
+        ctx.status = 401;
+        ctx.body = "Unauthorized";
+        return;
       }
-    } catch {
-      ctx.status = 401;
-      ctx.body = "Unauthorized";
-      return;
     }
-    if (shouldRenderGraphiQL(request)) {
-      if (graphiql) {
-        ctx.body = renderGraphiQL({});
-      }
-      return;
-    }
-    const {
-      operationName,
-      query,
-      variables
-    } = getGraphQLParameters(request);
-    const result = await processRequest({
-      operationName,
-      query,
-      variables,
-      request,
+    const operationName = request.body;
+    const query = request.headers;
+    const variables = request.method;
+    const yoga = createYoga({
       schema: buildSchema(buildSchemaInput),
-      contextFactory: () => {
-        return {
-          identity: ctx.identity
-        };
-      }
+      logging: false
     });
-    sendResult(result, ctx.res);
+    const response = await yoga.handleNodeRequest(ctx.req, ctx);
+    ctx.status = response.status;
+    for (const [key, value] of response.headers.entries()) {
+      if (ctx.status != 401) {
+        ctx.append(key, value);
+      }
+    }
+    ctx.body = response.body;
   });
-  server.use(cors()).use(bodyParser()).use(router.routes()).use(router.allowedMethods());
-  return server;
+  return app;
 };
-export { Router, createServer };
+export { createServer };

package/dist/index.d.mts

@@ -1,6 +1,5 @@
 import { BuildSchemaInput } from '@ttoss/graphql-api';
 import Koa from 'koa';
-export { default as Router } from '@koa/router';
 
 type AuthenticationType = 'AMAZON_COGNITO_USER_POOLS';
 type CreateServerInput = {
@@ -12,6 +11,6 @@ type CreateServerInput = {
         clientId: string;
     };
 } & BuildSchemaInput;
-declare const createServer: ({ graphiql, authenticationType, userPoolConfig, ...buildSchemaInput }: CreateServerInput) => Koa;
+declare const createServer: ({ authenticationType, userPoolConfig, ...buildSchemaInput }: CreateServerInput) => Koa;
 
 export { type AuthenticationType, type CreateServerInput, createServer };

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import { BuildSchemaInput } from '@ttoss/graphql-api';
 import Koa from 'koa';
-export { default as Router } from '@koa/router';
 
 type AuthenticationType = 'AMAZON_COGNITO_USER_POOLS';
 type CreateServerInput = {
@@ -12,6 +11,6 @@ type CreateServerInput = {
         clientId: string;
     };
 } & BuildSchemaInput;
-declare const createServer: ({ graphiql, authenticationType, userPoolConfig, ...buildSchemaInput }: CreateServerInput) => Koa;
+declare const createServer: ({ authenticationType, userPoolConfig, ...buildSchemaInput }: CreateServerInput) => Koa;
 
 export { type AuthenticationType, type CreateServerInput, createServer };

package/dist/index.js

@@ -38,25 +38,19 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  Router: () => import_router.default,
   createServer: () => createServer
 });
 module.exports = __toCommonJS(src_exports);
 var import_graphql_api = require("@ttoss/graphql-api");
 var import_aws_jwt_verify = require("aws-jwt-verify");
-var import_graphql_helix = require("graphql-helix");
+var import_graphql_yoga = require("graphql-yoga");
 var import_koa = __toESM(require("koa"));
-var import_router = __toESM(require("@koa/router"));
-var import_koa_bodyparser = __toESM(require("koa-bodyparser"));
-var import_cors = __toESM(require("@koa/cors"));
 var createServer = ({
-  graphiql = false,
   authenticationType,
   userPoolConfig,
   ...buildSchemaInput
 }) => {
-  const server = new import_koa.default();
-  const router = new import_router.default();
+  const app = new import_koa.default();
   const jwtVerifier = (() => {
     if (authenticationType === "AMAZON_COGNITO_USER_POOLS") {
       if (!userPoolConfig) {
@@ -69,54 +63,45 @@ var createServer = ({
     }
     return null;
   })();
-  router.all("/graphql", async ctx => {
+  app.use(async ctx => {
     const request = {
       body: ctx.request.body,
       headers: ctx.headers,
       method: ctx.method,
       query: ctx.request.query
     };
-    try {
-      if (authenticationType === "AMAZON_COGNITO_USER_POOLS" && jwtVerifier) {
-        const token = request.headers.authorization?.replace("Bearer ", "");
-        const identity = await jwtVerifier.verify(token || "");
-        ctx.identity = identity;
+    if (request.method !== "GET" && request.headers.referer !== "http://localhost:4000/graphql") {
+      try {
+        if (authenticationType === "AMAZON_COGNITO_USER_POOLS" && jwtVerifier) {
+          const token = request.headers.authorization?.replace("Bearer ", "");
+          const identity = await jwtVerifier.verify(token || "");
+          ctx.identity = identity;
+        }
+      } catch {
+        ctx.status = 401;
+        ctx.body = "Unauthorized";
+        return;
       }
-    } catch {
-      ctx.status = 401;
-      ctx.body = "Unauthorized";
-      return;
     }
-    if ((0, import_graphql_helix.shouldRenderGraphiQL)(request)) {
-      if (graphiql) {
-        ctx.body = (0, import_graphql_helix.renderGraphiQL)({});
-      }
-      return;
-    }
-    const {
-      operationName,
-      query,
-      variables
-    } = (0, import_graphql_helix.getGraphQLParameters)(request);
-    const result = await (0, import_graphql_helix.processRequest)({
-      operationName,
-      query,
-      variables,
-      request,
+    const operationName = request.body;
+    const query = request.headers;
+    const variables = request.method;
+    const yoga = (0, import_graphql_yoga.createYoga)({
       schema: (0, import_graphql_api.buildSchema)(buildSchemaInput),
-      contextFactory: () => {
-        return {
-          identity: ctx.identity
-        };
-      }
+      logging: false
     });
-    (0, import_graphql_helix.sendResult)(result, ctx.res);
+    const response = await yoga.handleNodeRequest(ctx.req, ctx);
+    ctx.status = response.status;
+    for (const [key, value] of response.headers.entries()) {
+      if (ctx.status != 401) {
+        ctx.append(key, value);
+      }
+    }
+    ctx.body = response.body;
   });
-  server.use((0, import_cors.default)()).use((0, import_koa_bodyparser.default)()).use(router.routes()).use(router.allowedMethods());
-  return server;
+  return app;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Router,
   createServer
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ttoss/graphql-api-server",
-  "version": "0.3.8",
+  "version": "0.5.0",
   "description": "GraphQL API Server",
   "author": "ttoss",
   "contributors": [
@@ -22,8 +22,10 @@
   "dependencies": {
     "@koa/cors": "^4.0.0",
     "@koa/router": "^12.0.1",
+    "@types/supertest": "^6.0.2",
     "aws-jwt-verify": "^4.0.0",
     "graphql-helix": "^1.13.0",
+    "graphql-yoga": "^5.0.2",
     "koa": "^2.14.2",
     "koa-bodyparser": "^4.4.1"
   },
@@ -38,6 +40,7 @@
     "@types/koa-bodyparser": "^4.3.12",
     "graphql": "^16.8.1",
     "jest": "^29.7.0",
+    "supertest": "^6.3.3",
     "tsup": "^8.0.1",
     "@ttoss/config": "^1.31.4",
     "@ttoss/graphql-api": "^0.5.0"
@@ -53,6 +56,6 @@
   },
   "scripts": {
     "build": "tsup",
-    "test": "echo jest"
+    "test": "jest"
   }
 }

package/src/index.ts

@@ -1,18 +1,7 @@
-import { type BuildSchemaInput, buildSchema } from '@ttoss/graphql-api';
+import { BuildSchemaInput, buildSchema } from '@ttoss/graphql-api';
 import { CognitoJwtVerifier } from 'aws-jwt-verify';
-import {
-  getGraphQLParameters,
-  processRequest,
-  renderGraphiQL,
-  sendResult,
-  shouldRenderGraphiQL,
-} from 'graphql-helix';
+import { createYoga } from 'graphql-yoga';
 import Koa from 'koa';
-import Router from '@koa/router';
-import bodyParser from 'koa-bodyparser';
-import cors from '@koa/cors';
-
-export { Router };
 
 export type AuthenticationType = 'AMAZON_COGNITO_USER_POOLS';
 
@@ -27,19 +16,12 @@ export type CreateServerInput = {
 } & BuildSchemaInput;
 
 export const createServer = ({
-  graphiql = false,
   authenticationType,
   userPoolConfig,
   ...buildSchemaInput
 }: CreateServerInput): Koa => {
-  const server = new Koa();
-
-  const router = new Router();
+  const app = new Koa();
 
-  /**
-   * Create the verifier outside your route handlers,
-   * so the cache is persisted and can be shared amongst them.
-   */
   const jwtVerifier = (() => {
     if (authenticationType === 'AMAZON_COGNITO_USER_POOLS') {
       if (!userPoolConfig) {
@@ -47,7 +29,6 @@ export const createServer = ({
           'userPoolConfig is required when using AMAZON_COGNITO_USER_POOLS authenticationType'
         );
       }
-
       return CognitoJwtVerifier.create({
         tokenUse: 'access',
         ...userPoolConfig,
@@ -57,7 +38,7 @@ export const createServer = ({
     return null;
   })();
 
-  router.all('/graphql', async (ctx) => {
+  app.use(async (ctx) => {
     const request = {
       body: ctx.request.body,
       headers: ctx.headers,
@@ -65,49 +46,51 @@ export const createServer = ({
       query: ctx.request.query,
     };
 
-    try {
-      if (authenticationType === 'AMAZON_COGNITO_USER_POOLS' && jwtVerifier) {
-        const token = request.headers.authorization?.replace('Bearer ', '');
-        const identity = await jwtVerifier.verify(token || '');
-        ctx.identity = identity;
+    if (
+      request.method !== 'GET' &&
+      request.headers.referer !== 'http://localhost:4000/graphql'
+    ) {
+      try {
+        if (authenticationType === 'AMAZON_COGNITO_USER_POOLS' && jwtVerifier) {
+          const token = request.headers.authorization?.replace('Bearer ', '');
+          const identity = await jwtVerifier.verify(token || '');
+
+          ctx.identity = identity;
+        }
+      } catch {
+        ctx.status = 401;
+        ctx.body = 'Unauthorized';
+        return;
       }
-    } catch {
-      ctx.status = 401;
-      ctx.body = 'Unauthorized';
-      return;
-    }
-
-    if (shouldRenderGraphiQL(request)) {
-      if (graphiql) {
-        ctx.body = renderGraphiQL({});
-      }
-
-      return;
     }
 
-    const { operationName, query, variables } = getGraphQLParameters(request);
+    //console.log(ctx.identity);
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const operationName = request.body;
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const query = request.headers;
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const variables = request.method;
 
-    const result = await processRequest({
-      operationName,
-      query,
-      variables,
-      request,
+    const yoga = createYoga<Koa.ParameterizedContext>({
       schema: buildSchema(buildSchemaInput),
-      contextFactory: () => {
-        return {
-          identity: ctx.identity,
-        };
-      },
+      logging: false,
     });
 
-    sendResult(result, ctx.res);
-  });
+    const response = await yoga.handleNodeRequest(ctx.req, ctx);
+
+    // Set status code
+    ctx.status = response.status;
+
+    // Set headers
+    for (const [key, value] of response.headers.entries()) {
+      if (ctx.status != 401) {
+        ctx.append(key, value);
+      }
+    }
 
-  server
-    .use(cors())
-    .use(bodyParser())
-    .use(router.routes())
-    .use(router.allowedMethods());
+    ctx.body = response.body;
+  });
 
-  return server;
+  return app;
 };

package/src/indexGraphqlHelix.ts

@@ -0,0 +1,113 @@
+import { type BuildSchemaInput, buildSchema } from '@ttoss/graphql-api';
+import { CognitoJwtVerifier } from 'aws-jwt-verify';
+import {
+  getGraphQLParameters,
+  processRequest,
+  renderGraphiQL,
+  sendResult,
+  shouldRenderGraphiQL,
+} from 'graphql-helix';
+import Koa from 'koa';
+import Router from '@koa/router';
+import bodyParser from 'koa-bodyparser';
+import cors from '@koa/cors';
+
+export { Router };
+
+export type AuthenticationType = 'AMAZON_COGNITO_USER_POOLS';
+
+export type CreateServerInput = {
+  graphiql?: boolean;
+  authenticationType?: AuthenticationType;
+  userPoolConfig?: {
+    userPoolId: string;
+    tokenUse?: 'access' | 'id';
+    clientId: string;
+  };
+} & BuildSchemaInput;
+
+export const createServerNew = ({
+  graphiql = false,
+  authenticationType,
+  userPoolConfig,
+  ...buildSchemaInput
+}: CreateServerInput): Koa => {
+  const server = new Koa();
+
+  const router = new Router();
+
+  /**
+   * Create the verifier outside your route handlers,
+   * so the cache is persisted and can be shared amongst them.
+   */
+  const jwtVerifier = (() => {
+    if (authenticationType === 'AMAZON_COGNITO_USER_POOLS') {
+      if (!userPoolConfig) {
+        throw new Error(
+          'userPoolConfig is required when using AMAZON_COGNITO_USER_POOLS authenticationType'
+        );
+      }
+
+      return CognitoJwtVerifier.create({
+        tokenUse: 'access',
+        ...userPoolConfig,
+      });
+    }
+
+    return null;
+  })();
+
+  router.all('/graphql', async (ctx) => {
+    const request = {
+      body: ctx.request.body,
+      headers: ctx.headers,
+      method: ctx.method,
+      query: ctx.request.query,
+    };
+
+    try {
+      if (authenticationType === 'AMAZON_COGNITO_USER_POOLS' && jwtVerifier) {
+        const token = request.headers.authorization?.replace('Bearer ', '');
+        const identity = await jwtVerifier.verify(token || '');
+        ctx.identity = identity;
+      }
+    } catch {
+      ctx.status = 401;
+      ctx.body = 'Unauthorized';
+      return;
+    }
+
+    if (shouldRenderGraphiQL(request)) {
+      if (graphiql) {
+        ctx.body = renderGraphiQL({});
+      }
+
+      return;
+    }
+
+    const { operationName, query, variables } = getGraphQLParameters(request);
+
+    const result = await processRequest({
+      operationName,
+      query,
+      variables,
+      request,
+      schema: buildSchema(buildSchemaInput),
+      contextFactory: () => {
+        return {
+          identity: ctx.identity,
+        };
+      },
+    });
+
+    sendResult(result, ctx.res);
+  });
+
+  server
+    .use(cors())
+    .use(bodyParser())
+    .use(router.routes())
+    .use(router.allowedMethods());
+
+  return server;
+};