fix(sofa): request in the context (#3381)

* Test

* chore(dependencies): updated changesets for modified dependencies

* Fix alphas

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: ardatan

.changeset/@graphql-yoga_plugin-sofa-3381-dependencies.md

@@ -0,0 +1,6 @@
+---
+'@graphql-yoga/plugin-sofa': patch
+---
+dependencies updates:
+  - Added dependency [`@graphql-tools/utils@^10.3.2`
+    ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.3.2) (to `dependencies`)

.changeset/slow-planes-battle.md

@@ -0,0 +1,5 @@
+---
+'@graphql-yoga/plugin-sofa': patch
+---
+
+Do not manipulate the server context to have \`request\` in the context

.github/workflows/pr.yml

@@ -7,6 +7,9 @@ on:
 
 jobs:
   alpha:
+    permissions:
+      contents: read
+      id-token: write
     uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@main
     if: ${{ github.event.pull_request.title != 'Upcoming Release Changes' }}
     with:

packages/plugins/sofa/package.json

@@ -47,6 +47,7 @@
     "graphql-yoga": "workspace:^"
   },
   "dependencies": {
+    "@graphql-tools/utils": "^10.3.2",
     "sofa-api": "^0.18.0"
   },
   "devDependencies": {

packages/plugins/sofa/src/index.ts

@@ -1,6 +1,7 @@
 import { ExecutionArgs, ExecutionResult, SubscriptionArgs } from 'graphql';
 import { Plugin, YogaInitialContext, YogaServerInstance } from 'graphql-yoga';
 import { useSofa as createSofaHandler } from 'sofa-api';
+import { isPromise } from '@graphql-tools/utils';
 import { SofaHandler } from './types.js';
 
 type SofaHandlerConfig = Parameters<typeof createSofaHandler>[0];
@@ -22,7 +23,6 @@ export function useSofa(config: SofaPluginConfig): Plugin {
     ReturnType<YogaServerInstance<Record<string, unknown>, Record<string, unknown>>['getEnveloped']>
   >();
 
-  const requestByContext = new WeakMap<YogaInitialContext, Request>();
   return {
     onYogaInit({ yoga }) {
       getEnveloped = yoga.getEnveloped;
@@ -31,12 +31,17 @@ export function useSofa(config: SofaPluginConfig): Plugin {
       sofaHandler = createSofaHandler({
         ...config,
         schema: onSchemaChangeEventPayload.schema,
-        async context(serverContext: YogaInitialContext) {
+        context(serverContext: YogaInitialContext) {
           const enveloped = getEnveloped(serverContext);
-          const request = requestByContext.get(serverContext);
-          const contextValue = await enveloped.contextFactory({ request });
-          envelopedByContext.set(contextValue as YogaInitialContext, enveloped);
-          return contextValue;
+          const contextValue$ = enveloped.contextFactory(serverContext);
+          if (isPromise(contextValue$)) {
+            return contextValue$.then(contextValue => {
+              envelopedByContext.set(contextValue, enveloped);
+              return contextValue;
+            });
+          }
+          envelopedByContext.set(contextValue$, enveloped);
+          return contextValue$;
         },
         execute(
           ...args:
@@ -111,8 +116,7 @@ export function useSofa(config: SofaPluginConfig): Plugin {
       });
     },
     async onRequest({ request, serverContext, endResponse }) {
-      requestByContext.set(serverContext as YogaInitialContext, request);
-      const response = await sofaHandler.handle(request, serverContext as Record<string, unknown>);
+      const response = await sofaHandler(request, serverContext as Record<string, unknown>);
       if (response != null && response.status !== 404) {
         endResponse(response);
       }

packages/plugins/sofa/tests/sofa.test.ts

@@ -0,0 +1,34 @@
+import { createSchema, createYoga } from 'graphql-yoga';
+import { useSofa } from '@graphql-yoga/plugin-sofa';
+
+describe('SOFA Plugin', () => {
+  it('has the request in the context', async () => {
+    const yoga = createYoga<{ _: string }>({
+      schema: createSchema({
+        typeDefs: /* GraphQL */ `
+          type Query {
+            hello: String!
+          }
+        `,
+        resolvers: {
+          Query: {
+            hello(_root, _args, context) {
+              return `Hello, ${context.request.headers.get('user-agent')}`;
+            },
+          },
+        },
+      }),
+      plugins: [
+        useSofa({
+          basePath: '/api',
+        }),
+      ],
+    });
+    const res = await yoga.fetch('/api/hello', {
+      headers: {
+        'user-agent': 'test',
+      },
+    });
+    await expect(res.text()).resolves.toEqual('"Hello, test"');
+  });
+});