fix: remove deps on custom.d

Signed-off-by: Matt Krick <[email protected]>
ParabolInc · Feb 12, 2025 · 967a32c · 967a32c
1 parent 63141ff
commit 967a32c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/packages/client/types/AuthToken.ts → packages/client/types/AuthToken.d.ts b/packages/client/types/AuthToken.ts → packages/client/types/AuthToken.d.ts
@@ -1,7 +1,7 @@
 export interface AuthToken {
   sub: string
   tms: string[]
-  rol?: 'su' | 'impersonate'
+  rol?: 'su' | 'impersonate' | null
   bet?: 1
   iat: number
   iss: string

diff --git a/packages/server/graphql/executeGraphQL.ts b/packages/server/graphql/executeGraphQL.ts
@@ -7,7 +7,7 @@
 import tracer from 'dd-trace'
 import {graphql} from 'graphql'
 import {FormattedExecutionResult} from 'graphql/execution/execute'
-import type {GQLRequest} from '../types/custom'
+import type {GQLRequest} from '../types/GQLRequest'
 import sendToSentry from '../utils/sendToSentry'
 import CompiledQueryCache from './CompiledQueryCache'
 import getDataLoader from './getDataLoader'

diff --git a/packages/server/types/GQLRequest.d.ts b/packages/server/types/GQLRequest.d.ts
@@ -0,0 +1,18 @@
+import type {AuthToken} from '../../client/types/AuthToken'
+
+export interface GQLRequest {
+  authToken: AuthToken
+  ip?: string
+  socketId?: string
+  variables?: {[key: string]: any}
+  docId?: string
+  query?: string
+  rootValue?: {[key: string]: any}
+  dataLoaderId?: string
+  // true if the query is on the private schema
+  isPrivate?: boolean
+  // true if the query is ad-hoc (e.g. GraphiQL, CLI)
+  isAdHoc?: boolean
+  // Datadog opentracing span of the calling server
+  carrier?: any
+}
diff --git a/packages/server/types/custom.d.ts b/packages/server/types/custom.d.ts
@@ -1,7 +1,6 @@
 import type {GraphQLSchema} from 'graphql'
 import type nestGitHubEndpoint from 'nest-graphql-endpoint/lib/nestGitHubEndpoint'
 import '../../client/types/reactHTML4'
-import type AuthToken from '../database/types/AuthToken'
 import type ScheduledJobMeetingStageTimeLimit from '../database/types/ScheduledJobMetingStageTimeLimit'
 import type ScheduledTeamLimitsJob from '../database/types/ScheduledTeamLimitsJob'
 export interface OAuth2Success {
@@ -23,23 +22,6 @@ export interface OAuth2Error {
   error_description?: string
   error_uri?: string
 }
-export interface GQLRequest {
-  authToken: AuthToken
-  ip?: string
-  socketId?: string
-  variables?: {[key: string]: any}
-  docId?: string
-  query?: string
-  rootValue?: {[key: string]: any}
-  dataLoaderId?: string
-  // true if the query is on the private schema
-  isPrivate?: boolean
-  // true if the query is ad-hoc (e.g. GraphiQL, CLI)
-  isAdHoc?: boolean
-  // Datadog opentracing span of the calling server
-  carrier?: any
-}
-
 export type ScheduledJobUnion = ScheduledJobMeetingStageTimeLimit | ScheduledTeamLimitsJob
 
 export type RootSchema = GraphQLSchema & {

diff --git a/packages/server/utils/PubSubPromise.ts b/packages/server/utils/PubSubPromise.ts
@@ -1,7 +1,7 @@
 import type {ExecutionResult} from 'graphql'
 import ms from 'ms'
 import GQLExecutorChannelId from '../../client/shared/gqlIds/GQLExecutorChannelId'
-import type {GQLRequest} from '../types/custom'
+import type {GQLRequest} from '../types/GQLRequest'
 import {Logger} from './Logger'
 import RedisInstance from './RedisInstance'
 import {getUserId} from './authorization'