From 57a77551b0f9e0d3140577aadb0865479d84738b Mon Sep 17 00:00:00 2001 From: flmeyer Date: Mon, 8 May 2023 17:00:05 +0200 Subject: [PATCH] Enable support for GitHub Enterprise Server --- languageserver/src/client.ts | 5 +++-- languageserver/src/connection.ts | 2 +- languageserver/src/initializationOptions.ts | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/languageserver/src/client.ts b/languageserver/src/client.ts index de54554..ac0aa61 100644 --- a/languageserver/src/client.ts +++ b/languageserver/src/client.ts @@ -1,8 +1,9 @@ import {Octokit} from "@octokit/rest"; -export function getClient(token: string, userAgent?: string): Octokit { +export function getClient(token: string, userAgent?: string, apiUrl?: string): Octokit { return new Octokit({ auth: token, - userAgent: userAgent || `GitHub Actions Language Server` + userAgent: userAgent || `GitHub Actions Language Server`, + baseUrl: apiUrl }); } diff --git a/languageserver/src/connection.ts b/languageserver/src/connection.ts index 274923a..c5c5f5f 100644 --- a/languageserver/src/connection.ts +++ b/languageserver/src/connection.ts @@ -51,7 +51,7 @@ export function initConnection(connection: Connection) { const options = params.initializationOptions as InitializationOptions; if (options.sessionToken) { - client = getClient(options.sessionToken, options.userAgent); + client = getClient(options.sessionToken, options.userAgent, options.githubApiUrl); } if (options.repos) { diff --git a/languageserver/src/initializationOptions.ts b/languageserver/src/initializationOptions.ts index abc1547..00e23fc 100644 --- a/languageserver/src/initializationOptions.ts +++ b/languageserver/src/initializationOptions.ts @@ -23,6 +23,11 @@ export interface InitializationOptions { * Desired log level */ logLevel?: LogLevel; + + /** + * If a GitHub Enterprise Server should be used, the URL of the API endpoint, eg "https://ghe.my-company.com/api/v3" + */ + githubApiUrl?: string; } export interface RepositoryContext {