From 94c8abed81bc4ad9b08bff1ff49ac7206ba700c9 Mon Sep 17 00:00:00 2001 From: sidreyas Date: Sun, 22 Nov 2026 13:56:20 +0530 Subject: [PATCH] fix(github): read watched PRs without organization scopes A token with only repo/gist/workflow could not read pull request detail or review threads: GitHub refuses any query that selects Team fields or an Organization reactor's login without read:org, even when no team is requested. Team details are now behind an @include flag. A read that GitHub answers only with INSUFFICIENT_SCOPES is retried once without them, and the fallback is remembered per credential and host for ten minutes. The Reactions fragment no longer selects Organization login. Supersedes #32366. Co-Authored-By: Claude Opus 5.5 --- .../src/server/GitHubPullRequestApi.test.ts | 75 +++++++++++++++++++ .../src/server/GitHubPullRequestApi.ts | 51 +++++++++++-- .../src/server/gitHubPullRequestJson.ts | 7 +- .../src/server/issues.graphql.ts | 15 +--- .../src/server/pullRequestReads.graphql | 5 +- .../src/server/pullRequestReads.graphql.ts | 38 +++++++--- .../src/server/pullRequestReviews.graphql | 15 ++-- .../src/server/pullRequestReviews.graphql.ts | 31 +++----- 8 files changed, 180 insertions(+), 57 deletions(-) diff --git a/packages/source-control-github/src/server/GitHubPullRequestApi.test.ts b/packages/source-control-github/src/server/GitHubPullRequestApi.test.ts index c3cc15097dfd5..6a5a0b55fd076 100644 --- a/packages/source-control-github/src/server/GitHubPullRequestApi.test.ts +++ b/packages/source-control-github/src/server/GitHubPullRequestApi.test.ts @@ -4081,6 +4081,81 @@ layer("GitHubPullRequestApi.layer", (it) => { }), ); + it.effect("reads PR truth when the credential cannot select Team fields", () => + Effect.gen(function* () { + mockedExecute.mockImplementation((call) => { + if (call.kind !== "graphql") return Effect.die("Unexpected REST request"); + return Effect.succeed( + output( + encodeJson( + call.variables?.["teamDetails"] === false + ? coreResponse({ + reviewDecision: "CHANGES_REQUESTED", + commits: { + nodes: [ + { + commit: { + statusCheckRollup: { + contexts: { + nodes: [checkRun({ name: "test", conclusion: "FAILURE" })], + pageInfo: lastPage, + }, + }, + }, + }, + ], + }, + reviewRequests: { + nodes: [ + { + requestedReviewer: { __typename: "User", login: "reviewer", name: null }, + }, + { requestedReviewer: { __typename: "Team" } }, + ], + }, + }) + : { + errors: [ + { + type: "INSUFFICIENT_SCOPES", + locations: [{ line: 1, column: 217 }], + message: + "Your token has not been granted the required scopes to execute this query. The 'slug' field requires one of the following scopes: ['read:org', 'read:discussion'], but your token has only been granted the: ['gist', 'repo', 'workflow'] scopes.", + }, + ], + }, + ), + ), + ); + }); + const cli = yield* GitHubPullRequestApi.GitHubPullRequestApi; + const input = { ...pullRequestInput, host: "github-team-scope.test" }; + const detail = yield* cli.getPullRequestDetail(input); + expect(detail.reviewDecision).toBe("changes-requested"); + expect(detail.reviewRequestLogins).toEqual(["reviewer"]); + expect(detail.hasTeamReviewRequest).toBe(true); + expect(detail.checksState).toBe("failing"); + expect(mockedExecute).toHaveBeenCalledTimes(2); + yield* cli.getPullRequestDetail(input); + expect(mockedExecute).toHaveBeenCalledTimes(3); + mockedExecute.mockReturnValue(Effect.succeed(output(reviewThreadsPage([], null)))); + yield* cli.listReviewThreadComments(input); + expect(variablesOf("ReviewThreads").at(-1)).toMatchObject({ teamDetails: false }); + mockedExecute.mockReturnValue( + Effect.succeed(output(encodeJson({ errors: [refusedReviewer] }))), + ); + const callsBeforeRefusal = mockedExecute.mock.calls.length; + const failure = yield* Effect.flip(cli.getPullRequestDetail(input)); + expect(failure).toMatchObject({ + _tag: "GitHubApiResponseError", + status: 200, + githubErrors: [`${refusedReviewer.message} (at ${refusedReviewer.path.join(".")})`], + githubErrorTypes: [refusedReviewer.type], + }); + expect(mockedExecute).toHaveBeenCalledTimes(callsBeforeRefusal + 2); + }), + ); + it.effect.each([false, true])( "continues after the core check page without reading it twice (reviewer refusal: %s)", (refused) => diff --git a/packages/source-control-github/src/server/GitHubPullRequestApi.ts b/packages/source-control-github/src/server/GitHubPullRequestApi.ts index 0f6b76dd5040c..44d1ba1d806b9 100644 --- a/packages/source-control-github/src/server/GitHubPullRequestApi.ts +++ b/packages/source-control-github/src/server/GitHubPullRequestApi.ts @@ -344,6 +344,15 @@ const isGitHubServerError = (error: unknown): boolean => const isMissingPullRef = ({ path, type }: GraphQLClientError.GraphQLError): boolean => type === "NOT_FOUND" && path?.join(".") === "repository.pullRequest.baseRef.compare"; +// Team fields need `read:org` or `read:discussion`; GitHub refuses the whole query without them, +// even when no team is requested. +const isInsufficientScopesOnly = (error: unknown): boolean => + isGraphQlClientError(error) && + error.reason._tag === "ResponseError" && + error.reason.status === 200 && + error.reason.errors.length > 0 && + error.reason.errors.every(({ type }) => type === "INSUFFICIENT_SCOPES"); + const isRefusedRequestedReviewersOnly = (error: unknown): boolean => isGraphQlClientError(error) && error.reason._tag === "ResponseError" && @@ -1594,19 +1603,40 @@ export const make = Effect.gen(function* () { timeToLive: "10 minutes", lookup: (_key: string) => Effect.void, }); + // Without `read:org` every pull request of a host refuses Team details, so this refusal is kept + // per credential and host. A token that gains the scope reads teams again once it expires. + const refusedTeamDetails = yield* Cache.make({ + capacity: 512, + timeToLive: "10 minutes", + lookup: (_key: string) => Effect.void, + }); const readRequestedReviewers = Effect.fn("GitHubPullRequestApi.readRequestedReviewers")( function* ( input: { readonly host: string; readonly repository: string; readonly number: number }, wanted: number, - read: (requestedReviewers: number) => Effect.Effect, + read: (requestedReviewers: number, teamDetails: boolean) => Effect.Effect, ) { const host = normalizeHost(input.host); const { fingerprint } = yield* api.credential(host); const key = `${fingerprint}\0${host}\0${input.repository.toLowerCase()}\0${input.number}`; - if (yield* Cache.has(refusedReviewers, key)) return yield* read(0); - return yield* read(wanted).pipe( + const teamKey = `${fingerprint}\0${host}`; + const withTeamDetails = Effect.fn("GitHubPullRequestApi.readTeamDetails")(function* ( + requestedReviewers: number, + ) { + if (yield* Cache.has(refusedTeamDetails, teamKey)) + return yield* read(requestedReviewers, false); + return yield* read(requestedReviewers, true).pipe( + Effect.catchIf(isInsufficientScopesOnly, () => + read(requestedReviewers, false).pipe( + Effect.tap(() => Cache.set(refusedTeamDetails, teamKey, undefined)), + ), + ), + ); + }); + if (yield* Cache.has(refusedReviewers, key)) return yield* withTeamDetails(0); + return yield* withTeamDetails(wanted).pipe( Effect.catchIf(isRefusedRequestedReviewersOnly, () => - Cache.set(refusedReviewers, key, undefined).pipe(Effect.andThen(read(0))), + Cache.set(refusedReviewers, key, undefined).pipe(Effect.andThen(withTeamDetails(0))), ), ); }, @@ -1615,7 +1645,7 @@ export const make = Effect.gen(function* () { const getPullRequestDetail: GitHubPullRequestApi["Service"]["getPullRequestDetail"] = (input) => { const { owner, name } = parseRepositorySelector(input.repository); const operation = "getPullRequestDetail"; - const read = (requestedReviewers: number) => + const read = (requestedReviewers: number, teamDetails: boolean) => client .PullRequestCore({ owner, @@ -1625,6 +1655,7 @@ export const make = Effect.gen(function* () { required: asksRequired(input.host), requestedReviewers, mergeQueue: input.host.toLowerCase() === "github.com", + teamDetails, }) .pipe(toleratingMissingPullRef(decodePullRequestCore)); return SourceControlRateLimit.Interactive.pipe( @@ -2438,8 +2469,14 @@ export const make = Effect.gen(function* () { const first: GitHubReviewThreadPage = yield* readRequestedReviewers( input, 50, - (requestedReviewers) => - client.ReviewThreads({ owner, name, number: input.number, requestedReviewers }), + (requestedReviewers, teamDetails) => + client.ReviewThreads({ + owner, + name, + number: input.number, + requestedReviewers, + teamDetails, + }), ).pipe(graphql(target), Effect.map(toReviewThreadPage), Effect.flatMap(found(target))); const entries: GitHubReviewThreadEntry[] = [...first.threads]; const avatarsByLogin = new Map(first.avatarsByLogin); diff --git a/packages/source-control-github/src/server/gitHubPullRequestJson.ts b/packages/source-control-github/src/server/gitHubPullRequestJson.ts index 7fbe86839d495..43fd2bd7894f2 100644 --- a/packages/source-control-github/src/server/gitHubPullRequestJson.ts +++ b/packages/source-control-github/src/server/gitHubPullRequestJson.ts @@ -121,6 +121,7 @@ interface LabelFields { } interface ReviewRequestFields { + readonly __typename?: string | undefined; readonly login?: string | null | undefined; readonly slug?: string | null | undefined; readonly name?: string | null | undefined; @@ -571,8 +572,9 @@ function toReviewRequestLogins( function hasTeamReviewRequest(raw: ReadonlyArray | undefined): boolean { return (raw ?? []).some( (request) => - trimmed(request.login) === null && - (trimmed(request.slug) !== null || trimmed(request.name) !== null), + request.__typename === "Team" || + (trimmed(request.login) === null && + (trimmed(request.slug) !== null || trimmed(request.name) !== null)), ); } @@ -1074,6 +1076,7 @@ export function toPullRequestCore(result: PullRequestCore.Result): GitHubPullReq : [ { login: "login" in requestedReviewer ? requestedReviewer.login : null, + __typename: requestedReviewer.__typename, slug: "slug" in requestedReviewer ? requestedReviewer.slug : null, name: "teamName" in requestedReviewer diff --git a/packages/source-control-github/src/server/issues.graphql.ts b/packages/source-control-github/src/server/issues.graphql.ts index 9d059396d26a0..895d6dd424a98 100644 --- a/packages/source-control-github/src/server/issues.graphql.ts +++ b/packages/source-control-github/src/server/issues.graphql.ts @@ -211,14 +211,6 @@ export const Bot = Schema.Struct({ }) export interface Bot extends Schema.Struct.Type {} -/** An account on GitHub, with one or more owners, that has repositories, members and teams. */ -export const Organization = Schema.Struct({ - __typename: Schema.Literal("Organization"), - /** The organization's login name. */ - login: Schema.String -}) -export interface Organization extends Schema.Struct.Type {} - /** A placeholder user for attribution of imported data on GitHub. */ export const Mannequin = Schema.Struct({ __typename: Schema.Literal("Mannequin"), @@ -229,7 +221,7 @@ export interface Mannequin extends Schema.Struct.Type { /** Types that can be assigned to reactions. */ export const ReactorOther = Schema.Struct({ - __typename: GraphQL.otherTypename()(["User", "Bot", "Organization", "Mannequin"]) + __typename: GraphQL.otherTypename()(["User", "Bot", "Mannequin"]) }) export interface ReactorOther extends Schema.Struct.Type {} @@ -241,7 +233,6 @@ export const ReactorConnection = Schema.Struct({ nodes: Schema.NullOr(Schema.Array(Schema.NullOr(Schema.Union([ ReactorsNodesUser, Bot, - Organization, Mannequin, ReactorOther ])))) @@ -588,7 +579,7 @@ export const IssueDetail = GraphQL.query("IssueDetail", { ], fragments: [ { name: "IssueRow", body: ["on Issue{number title url state stateReason createdAt updatedAt closedAt author{__typename login avatarUrl...on User{name}}}"] }, - { name: "Reactions", body: ["on Reactable{__typename reactionGroups{content viewerHasReacted reactors(first:10){totalCount nodes{__typename...on User{login}...on Bot{login}...on Organization{login}...on Mannequin{login}}}}}"] } + { name: "Reactions", body: ["on Reactable{__typename reactionGroups{content viewerHasReacted reactors(first:10){totalCount nodes{__typename...on User{login}...on Bot{login}...on Mannequin{login}}}}}"] } ] }, variables: { @@ -645,7 +636,7 @@ export const IssueComments = GraphQL.query("IssueComments", { { name: "repository", body: ["(owner:$", "owner", " name:$", "name", "){issue(number:$", "number", "){comments(last:100 before:$", "cursor", "){pageInfo{hasPreviousPage startCursor}nodes{id author{__typename login avatarUrl}body createdAt url...Reactions}}}}"] } ], fragments: [ - { name: "Reactions", body: ["on Reactable{__typename reactionGroups{content viewerHasReacted reactors(first:10){totalCount nodes{__typename...on User{login}...on Bot{login}...on Organization{login}...on Mannequin{login}}}}}"] } + { name: "Reactions", body: ["on Reactable{__typename reactionGroups{content viewerHasReacted reactors(first:10){totalCount nodes{__typename...on User{login}...on Bot{login}...on Mannequin{login}}}}}"] } ] }, variables: { diff --git a/packages/source-control-github/src/server/pullRequestReads.graphql b/packages/source-control-github/src/server/pullRequestReads.graphql index 2799b67525a27..44ea9adb1709f 100644 --- a/packages/source-control-github/src/server/pullRequestReads.graphql +++ b/packages/source-control-github/src/server/pullRequestReads.graphql @@ -60,6 +60,7 @@ query PullRequestCore( $required: Boolean! $requestedReviewers: Int! $mergeQueue: Boolean! + $teamDetails: Boolean! ) { repository(owner: $owner, name: $name) { mergeCommitAllowed @@ -154,7 +155,9 @@ query PullRequestCore( } # A team's name and avatar are nullable differently from a person's, so they travel # under their own aliases. `combinedSlug` is the `org/slug` a reviewer row shows. - ... on Team { + # Every Team field needs `read:org` or `read:discussion`, even when no team is + # requested, so a credential without them reads with `teamDetails` off. + ... on Team @include(if: $teamDetails) { slug combinedSlug teamName: name diff --git a/packages/source-control-github/src/server/pullRequestReads.graphql.ts b/packages/source-control-github/src/server/pullRequestReads.graphql.ts index ab5e211a4dec2..a87db6abfe121 100644 --- a/packages/source-control-github/src/server/pullRequestReads.graphql.ts +++ b/packages/source-control-github/src/server/pullRequestReads.graphql.ts @@ -344,18 +344,18 @@ export const RequestedReviewerBot = Schema.Struct({ export interface RequestedReviewerBot extends Schema.Struct.Type {} /** A team of users in an organization. */ -export const Team = Schema.Struct({ +export const PullRequestCoreRepositoryPullRequestReviewRequestsNodesRequestedReviewerTeam = Schema.Struct({ __typename: Schema.Literal("Team"), /** The slug corresponding to the team. */ - slug: Schema.String, + slug: Schema.optionalKey(Schema.String), /** The slug corresponding to the organization and team. */ - combinedSlug: Schema.String, + combinedSlug: Schema.optionalKey(Schema.String), /** The name of the team. */ - teamName: Schema.String, + teamName: Schema.optionalKey(Schema.String), /** A URL pointing to the team's avatar. */ - teamAvatarUrl: Schema.NullOr(Shared.URI) + teamAvatarUrl: Schema.optionalKey(Schema.NullOr(Shared.URI)) }) -export interface Team extends Schema.Struct.Type {} +export interface PullRequestCoreRepositoryPullRequestReviewRequestsNodesRequestedReviewerTeam extends Schema.Struct.Type {} /** Types that can be requested reviewers. */ export const RequestedReviewerOther = Schema.Struct({ @@ -369,7 +369,7 @@ export const PullRequestCoreRepositoryPullRequestReviewRequestsNodesReviewReques requestedReviewer: Schema.NullOr(Schema.Union([ RequestedReviewerUser, RequestedReviewerBot, - Team, + PullRequestCoreRepositoryPullRequestReviewRequestsNodesRequestedReviewerTeam, RequestedReviewerOther ])) }) @@ -559,10 +559,11 @@ export const PullRequestCore = GraphQL.query("PullRequestCore", { { name: "headRef", body: "String!" }, { name: "required", body: "Boolean!" }, { name: "requestedReviewers", body: "Int!" }, - { name: "mergeQueue", body: "Boolean!" } + { name: "mergeQueue", body: "Boolean!" }, + { name: "teamDetails", body: "Boolean!" } ], selections: [ - { name: "repository", body: ["(owner:$", "owner", " name:$", "name", "){mergeCommitAllowed squashMergeAllowed rebaseMergeAllowed autoMergeAllowed viewerPermission pullRequest(number:$", "number", "){number title url body state isDraft mergeable mergeStateStatus reviewDecision additions deletions changedFiles createdAt updatedAt mergedAt mergeCommit{oid}mergedBy{__typename login avatarUrl...on User{name}}closedAt headRefName baseRefName headRefOid isCrossRepository maintainerCanModify headRepositoryOwner{__typename login}headRepository{nameWithOwner viewerPermission}headRef{id}author{__typename login avatarUrl...on User{id name}}autoMergeRequest{mergeMethod}mergeQueueRemovals:timelineItems(last:1 itemTypes:[REMOVED_FROM_MERGE_QUEUE_EVENT])@include(if:$", "mergeQueue", "){nodes{__typename...on RemovedFromMergeQueueEvent{id createdAt reason}}}viewerCanUpdate viewerDidAuthor viewerCanUpdateBranch baseRef{compare(headRef:$", "headRef", "){behindBy}}reviewRequests(first:$", "requestedReviewers", "){nodes{requestedReviewer{__typename...on User{login name}...on Bot{login}...on Team{slug combinedSlug teamName:name teamAvatarUrl:avatarUrl}}}}labels(first:100){nodes{name color description}}commits(last:1){nodes{commit{statusCheckRollup{contexts(first:100){nodes{__typename...", "CheckContext", "}pageInfo{hasNextPage endCursor}}}}}}}}"] } + { name: "repository", body: ["(owner:$", "owner", " name:$", "name", "){mergeCommitAllowed squashMergeAllowed rebaseMergeAllowed autoMergeAllowed viewerPermission pullRequest(number:$", "number", "){number title url body state isDraft mergeable mergeStateStatus reviewDecision additions deletions changedFiles createdAt updatedAt mergedAt mergeCommit{oid}mergedBy{__typename login avatarUrl...on User{name}}closedAt headRefName baseRefName headRefOid isCrossRepository maintainerCanModify headRepositoryOwner{__typename login}headRepository{nameWithOwner viewerPermission}headRef{id}author{__typename login avatarUrl...on User{id name}}autoMergeRequest{mergeMethod}mergeQueueRemovals:timelineItems(last:1 itemTypes:[REMOVED_FROM_MERGE_QUEUE_EVENT])@include(if:$", "mergeQueue", "){nodes{__typename...on RemovedFromMergeQueueEvent{id createdAt reason}}}viewerCanUpdate viewerDidAuthor viewerCanUpdateBranch baseRef{compare(headRef:$", "headRef", "){behindBy}}reviewRequests(first:$", "requestedReviewers", "){nodes{requestedReviewer{__typename...on User{login name}...on Bot{login}...on Team@include(if:$", "teamDetails", "){slug combinedSlug teamName:name teamAvatarUrl:avatarUrl}}}}labels(first:100){nodes{name color description}}commits(last:1){nodes{commit{statusCheckRollup{contexts(first:100){nodes{__typename...", "CheckContext", "}pageInfo{hasNextPage endCursor}}}}}}}}"] } ], fragments: [ { name: "CheckContext", body: ["on StatusCheckRollupContext{__typename...on StatusContext{context state targetUrl createdAt description isRequired(pullRequestNumber:$", "number", ")@include(if:$", "required", ")}...on CheckRun{name status conclusion startedAt completedAt detailsUrl isRequired(pullRequestNumber:$", "number", ")@include(if:$", "required", ")checkSuite{workflowRun{workflow{name}}}}}"] } @@ -575,7 +576,8 @@ export const PullRequestCore = GraphQL.query("PullRequestCore", { headRef: Schema.String, required: Schema.Boolean, requestedReviewers: Shared.Int, - mergeQueue: Schema.Boolean + mergeQueue: Schema.Boolean, + teamDetails: Schema.Boolean }, result: Schema.Struct({ /** Lookup a given repository by the owner and repository name. */ @@ -1208,12 +1210,26 @@ export const Actor = Schema.Struct({ }) export interface Actor extends Schema.Struct.Type {} +/** A team of users in an organization. */ +export const ReviewerCandidatesRepositoryPullRequestReviewRequestsNodesRequestedReviewerTeam = Schema.Struct({ + __typename: Schema.Literal("Team"), + /** The slug corresponding to the team. */ + slug: Schema.String, + /** The slug corresponding to the organization and team. */ + combinedSlug: Schema.String, + /** The name of the team. */ + teamName: Schema.String, + /** A URL pointing to the team's avatar. */ + teamAvatarUrl: Schema.NullOr(Shared.URI) +}) +export interface ReviewerCandidatesRepositoryPullRequestReviewRequestsNodesRequestedReviewerTeam extends Schema.Struct.Type {} + /** A request for a user to review a pull request. */ export const ReviewerCandidatesRepositoryPullRequestReviewRequestsNodesReviewRequest = Schema.Struct({ /** The reviewer that is requested. */ requestedReviewer: Schema.NullOr(Schema.Union([ MergedByUser, - Team, + ReviewerCandidatesRepositoryPullRequestReviewRequestsNodesRequestedReviewerTeam, NodesBot, RequestedReviewerOther ])) diff --git a/packages/source-control-github/src/server/pullRequestReviews.graphql b/packages/source-control-github/src/server/pullRequestReviews.graphql index d497615c24693..6d94a4ee663f1 100644 --- a/packages/source-control-github/src/server/pullRequestReviews.graphql +++ b/packages/source-control-github/src/server/pullRequestReviews.graphql @@ -15,9 +15,8 @@ fragment Reactions on Reactable { ... on Bot { login } - ... on Organization { - login - } + # No `... on Organization`: its `login` needs `read:org`, and GitHub refuses the whole + # query for a token without it. An organization reactor still counts in `totalCount`. ... on Mannequin { login } @@ -88,7 +87,13 @@ fragment ReviewThreadPage on PullRequestReviewThreadConnection { # # `viewerCanUpdate` and `viewerDidAuthor` belong to the pull request this query is already # standing on, so what the reader may do with it arrives with the conversation. -query ReviewThreads($owner: String!, $name: String!, $number: Int!, $requestedReviewers: Int!) { +query ReviewThreads( + $owner: String! + $name: String! + $number: Int! + $requestedReviewers: Int! + $teamDetails: Boolean! +) { viewer { login } @@ -145,7 +150,7 @@ query ReviewThreads($owner: String!, $name: String!, $number: Int!, $requestedRe login avatarUrl } - ... on Team { + ... on Team @include(if: $teamDetails) { combinedSlug teamName: name teamAvatarUrl: avatarUrl diff --git a/packages/source-control-github/src/server/pullRequestReviews.graphql.ts b/packages/source-control-github/src/server/pullRequestReviews.graphql.ts index bce1451b8c296..266da7c0bc50e 100644 --- a/packages/source-control-github/src/server/pullRequestReviews.graphql.ts +++ b/packages/source-control-github/src/server/pullRequestReviews.graphql.ts @@ -19,14 +19,6 @@ export const NodesBot = Schema.Struct({ }) export interface NodesBot extends Schema.Struct.Type {} -/** An account on GitHub, with one or more owners, that has repositories, members and teams. */ -export const Organization = Schema.Struct({ - __typename: Schema.Literal("Organization"), - /** The organization's login name. */ - login: Schema.String -}) -export interface Organization extends Schema.Struct.Type {} - /** A placeholder user for attribution of imported data on GitHub. */ export const Mannequin = Schema.Struct({ __typename: Schema.Literal("Mannequin"), @@ -37,7 +29,7 @@ export interface Mannequin extends Schema.Struct.Type { /** Types that can be assigned to reactions. */ export const ReactorOther = Schema.Struct({ - __typename: GraphQL.otherTypename()(["User", "Bot", "Organization", "Mannequin"]) + __typename: GraphQL.otherTypename()(["User", "Bot", "Mannequin"]) }) export interface ReactorOther extends Schema.Struct.Type {} @@ -49,7 +41,6 @@ export const ReactorConnection = Schema.Struct({ nodes: Schema.NullOr(Schema.Array(Schema.NullOr(Schema.Union([ NodesUser, NodesBot, - Organization, Mannequin, ReactorOther ])))) @@ -250,11 +241,11 @@ export interface RequestedReviewerBot extends Schema.Struct.Type {} @@ -425,15 +416,16 @@ export const ReviewThreads = GraphQL.query("ReviewThreads", { { name: "owner", body: "String!" }, { name: "name", body: "String!" }, { name: "number", body: "Int!" }, - { name: "requestedReviewers", body: "Int!" } + { name: "requestedReviewers", body: "Int!" }, + { name: "teamDetails", body: "Boolean!" } ], selections: [ { name: "viewer", body: ["{login}"] }, - { name: "repository", body: ["(owner:$", "owner", " name:$", "name", "){pullRequest(number:$", "number", "){reviewThreads(first:100){...ReviewThreadPage}viewerCanUpdate viewerDidAuthor author{__typename login avatarUrl}...Reactions comments(first:100){nodes{id lastEditedAt author{__typename login avatarUrl}...Reactions}}reviews(first:100){nodes{id lastEditedAt author{__typename login avatarUrl}...Reactions}}reviewRequests(first:$", "requestedReviewers", "){nodes{requestedReviewer{__typename...on User{login name avatarUrl}...on Bot{login avatarUrl}...on Team{combinedSlug teamName:name teamAvatarUrl:avatarUrl}}}}latestReviews(first:50){nodes{state isMinimized author{__typename login avatarUrl}}}reviewDismissals:timelineItems(itemTypes:[REVIEW_DISMISSED_EVENT]first:100){pageInfo{hasNextPage endCursor}nodes{__typename...on ReviewDismissedEvent{dismissalMessage review{id}}}}commits(last:100){nodes{commit{oid messageHeadline committedDate authors(first:3){nodes{name avatarUrl user{login}}}}}}}}"] } + { name: "repository", body: ["(owner:$", "owner", " name:$", "name", "){pullRequest(number:$", "number", "){reviewThreads(first:100){...ReviewThreadPage}viewerCanUpdate viewerDidAuthor author{__typename login avatarUrl}...Reactions comments(first:100){nodes{id lastEditedAt author{__typename login avatarUrl}...Reactions}}reviews(first:100){nodes{id lastEditedAt author{__typename login avatarUrl}...Reactions}}reviewRequests(first:$", "requestedReviewers", "){nodes{requestedReviewer{__typename...on User{login name avatarUrl}...on Bot{login avatarUrl}...on Team@include(if:$", "teamDetails", "){combinedSlug teamName:name teamAvatarUrl:avatarUrl}}}}latestReviews(first:50){nodes{state isMinimized author{__typename login avatarUrl}}}reviewDismissals:timelineItems(itemTypes:[REVIEW_DISMISSED_EVENT]first:100){pageInfo{hasNextPage endCursor}nodes{__typename...on ReviewDismissedEvent{dismissalMessage review{id}}}}commits(last:100){nodes{commit{oid messageHeadline committedDate authors(first:3){nodes{name avatarUrl user{login}}}}}}}}"] } ], fragments: [ { name: "ReviewThreadPage", body: ["on PullRequestReviewThreadConnection{totalCount pageInfo{hasNextPage endCursor}nodes{id isResolved isOutdated path line diffSide comments(first:10){totalCount pageInfo{hasNextPage endCursor}nodes{...ThreadComment}}}}"] }, - { name: "Reactions", body: ["on Reactable{__typename reactionGroups{content viewerHasReacted reactors(first:10){totalCount nodes{__typename...on User{login}...on Bot{login}...on Organization{login}...on Mannequin{login}}}}}"] }, + { name: "Reactions", body: ["on Reactable{__typename reactionGroups{content viewerHasReacted reactors(first:10){totalCount nodes{__typename...on User{login}...on Bot{login}...on Mannequin{login}}}}}"] }, { name: "ThreadComment", body: ["on PullRequestReviewComment{id author{__typename login avatarUrl}body createdAt lastEditedAt url isMinimized pullRequestReview{url}...Reactions}"] } ] }, @@ -441,7 +433,8 @@ export const ReviewThreads = GraphQL.query("ReviewThreads", { owner: Schema.String, name: Schema.String, number: Shared.Int, - requestedReviewers: Shared.Int + requestedReviewers: Shared.Int, + teamDetails: Schema.Boolean }, result: Schema.Struct({ /** The currently authenticated user. */ @@ -485,7 +478,7 @@ export const ReviewThreadPages = GraphQL.query("ReviewThreadPages", { fragments: [ { name: "ReviewThreadPage", body: ["on PullRequestReviewThreadConnection{totalCount pageInfo{hasNextPage endCursor}nodes{id isResolved isOutdated path line diffSide comments(first:10){totalCount pageInfo{hasNextPage endCursor}nodes{...ThreadComment}}}}"] }, { name: "ThreadComment", body: ["on PullRequestReviewComment{id author{__typename login avatarUrl}body createdAt lastEditedAt url isMinimized pullRequestReview{url}...Reactions}"] }, - { name: "Reactions", body: ["on Reactable{__typename reactionGroups{content viewerHasReacted reactors(first:10){totalCount nodes{__typename...on User{login}...on Bot{login}...on Organization{login}...on Mannequin{login}}}}}"] } + { name: "Reactions", body: ["on Reactable{__typename reactionGroups{content viewerHasReacted reactors(first:10){totalCount nodes{__typename...on User{login}...on Bot{login}...on Mannequin{login}}}}}"] } ] }, variables: { @@ -562,7 +555,7 @@ export const ReviewThreadComments = GraphQL.query("ReviewThreadComments", { ], fragments: [ { name: "ThreadComment", body: ["on PullRequestReviewComment{id author{__typename login avatarUrl}body createdAt lastEditedAt url isMinimized pullRequestReview{url}...Reactions}"] }, - { name: "Reactions", body: ["on Reactable{__typename reactionGroups{content viewerHasReacted reactors(first:10){totalCount nodes{__typename...on User{login}...on Bot{login}...on Organization{login}...on Mannequin{login}}}}}"] } + { name: "Reactions", body: ["on Reactable{__typename reactionGroups{content viewerHasReacted reactors(first:10){totalCount nodes{__typename...on User{login}...on Bot{login}...on Mannequin{login}}}}}"] } ] }, variables: {