Merge pull request #16 from ericsciple/users/ericsciple/m262ghes

Use @actions/github to invoke GraphQL for GHES compatibility

__tests__/version/graphql.mock.ts

@@ -3,18 +3,9 @@ import {
   RequestParameters
 } from '@octokit/graphql/dist-types/types'
 
-import * as Graphql from '@octokit/graphql'
+import * as Graphql from '../../src/version/graphql'
 import {GetVersionsQueryResponse} from '../../src/version'
 
-import SpyInstance = jest.SpyInstance
-
-export function mockGraphql(): SpyInstance<
-  Promise<GraphQlQueryResponseData>,
-  [string, (RequestParameters | undefined)?]
-> {
-  return jest.spyOn(Graphql, 'graphql')
-}
-
 export function getMockedOldestQueryResponse(
   numVersions: number
 ): GetVersionsQueryResponse {
@@ -49,8 +40,10 @@ export function getMockedOldestQueryResponse(
 
 export function mockOldestQueryResponse(
   numVersions: number
-): ReturnType<typeof mockGraphql> {
-  return mockGraphql().mockResolvedValue(
-    getMockedOldestQueryResponse(numVersions)
-  )
+) {
+  const response = new Promise((resolve) => {
+    resolve(getMockedOldestQueryResponse(numVersions))
+  }) as Promise<GraphQlQueryResponseData>
+  jest.spyOn(Graphql, 'graphql').mockImplementation(
+    (token: string, query: string, parameters: RequestParameters) => response)
 }

src/version/delete-version.ts

@@ -1,7 +1,7 @@
 import {from, Observable, merge, throwError, of} from 'rxjs'
-import {graphql} from '@octokit/graphql'
 import {catchError, map, tap} from 'rxjs/operators'
 import {GraphQlQueryResponse} from '@octokit/graphql/dist-types/types'
+import {graphql} from './graphql'
 
 export interface DeletePackageVersionMutationResponse {
   deletePackageVersion: {
@@ -21,10 +21,9 @@ export function deletePackageVersion(
   token: string
 ): Observable<boolean> {
   return from(
-    graphql(mutation, {
+    graphql(token, mutation, {
       packageVersionId,
       headers: {
-        authorization: `token ${token}`,
         Accept: 'application/vnd.github.package-deletes-preview+json'
       }
     }) as Promise<DeletePackageVersionMutationResponse>

src/version/get-versions.ts

@@ -1,7 +1,7 @@
-import {graphql} from '@octokit/graphql'
 import {GraphQlQueryResponse} from '@octokit/graphql/dist-types/types'
 import {Observable, from, throwError} from 'rxjs'
 import {catchError, map} from 'rxjs/operators'
+import {graphql} from './graphql'
 
 export interface VersionInfo {
   id: string
@@ -52,13 +52,12 @@ export function queryForOldestVersions(
   token: string
 ): Observable<GetVersionsQueryResponse> {
   return from(
-    graphql(query, {
+    graphql(token, query, {
       owner,
       repo,
       package: packageName,
       last: numVersions,
       headers: {
-        authorization: `token ${token}`,
         Accept: 'application/vnd.github.packages-preview+json'
       }
     }) as Promise<GetVersionsQueryResponse>

src/version/graphql.ts

@@ -0,0 +1,19 @@
+import {GitHub} from '@actions/github'
+import {GraphQlQueryResponseData} from '@octokit/graphql/dist-types/types'
+import {RequestParameters} from '@octokit/types/dist-types/RequestParameters'
+
+/**
+ * Sends a GraphQL query request based on endpoint options
+ *
+ * @param {string} token Auth token
+ * @param {string} query GraphQL query. Example: `'query { viewer { login } }'`.
+ * @param {object} parameters URL, query or body parameters, as well as `headers`, `mediaType.{format|previews}`, `request`, or `baseUrl`.
+ */
+export async function graphql(
+  token: string,
+  query: string,
+  parameters: RequestParameters
+): Promise<GraphQlQueryResponseData> {
+  const github = new GitHub(token)
+  return await github.graphql(query, parameters)
+}