feat: drop generic envelop auth plugin

packages/services/api/src/modules/auth/providers/auth-manager.ts

@@ -1,5 +1,4 @@
-import { CONTEXT, Inject, Injectable, Scope } from 'graphql-modules';
-import type { RegistryContext } from '../../../context';
+import { Injectable, Scope } from 'graphql-modules';
 import type { User } from '../../../shared/entities';
 import { AccessError } from '../../../shared/errors';
 import type { Listify, MapToArray } from '../../../shared/helpers';
@@ -45,19 +44,15 @@ export interface TargetAccessSelector {
  global: true,
 })
 export class AuthManager {
- private session: Session;
-
  constructor(
- @Inject(CONTEXT) context: RegistryContext,
  private organizationAccess: OrganizationAccess,
  private projectAccess: ProjectAccess,
  private targetAccess: TargetAccess,
  private userManager: UserManager,
  private tokenStorage: TokenStorage,
  private storage: Storage,
- ) {
- this.session = context.session;
- }
+ private session: Session,
+ ) {}
 
  async ensureTargetAccess(
  selector: Listify<TargetAccessSelector, 'target'>,

packages/services/server/package.json

@@ -10,7 +10,6 @@
  },
  "devDependencies": {
  "@envelop/core": "5.0.2",
- "@envelop/generic-auth": "7.0.0",
  "@envelop/graphql-jit": "8.0.3",
  "@envelop/graphql-modules": "6.0.0",
  "@envelop/opentelemetry": "6.3.1",

packages/services/server/src/graphql-handler.ts

@@ -9,10 +9,15 @@ import {
  type DefinitionNode,
  type OperationDefinitionNode,
 } from 'graphql';
-import { createYoga, Plugin, useErrorHandler, useExecutionCancellation } from 'graphql-yoga';
+import {
+ createYoga,
+ Plugin,
+ useErrorHandler,
+ useExecutionCancellation,
+ useExtendContext,
+} from 'graphql-yoga';
 import hyperid from 'hyperid';
 import { isGraphQLError } from '@envelop/core';
-import { useGenericAuth } from '@envelop/generic-auth';
 import { useGraphQlJit } from '@envelop/graphql-jit';
 import { useGraphQLModules } from '@envelop/graphql-modules';
 import { useOpenTelemetry } from '@envelop/opentelemetry';
@@ -157,13 +162,9 @@ export const graphqlHandler = (options: GraphQLHandlerOptions): RouteHandlerMeth
  }
  }
  }),
- useGenericAuth({
- mode: 'resolve-only',
- contextFieldName: 'session',
- async resolveUserFn(ctx: Context) {
- return options.authN.authenticate(ctx);
- },
- }),
+ useExtendContext(async context => ({
+ session: await options.authN.authenticate(context),
+ })),
  useHive({
  debug: true,
  enabled: !!options.hiveConfig,