fix lint, implement suggestions

Author: flmeyer

src/api/api.ts

@@ -8,6 +8,6 @@ export function getClient(token: string): Octokit {
   return new Octokit({
     auth: token,
     userAgent: userAgent,
-    baseUrl: `${getGitHubApiUri()}`
+    baseUrl: getGitHubApiUri()
   });
 }

src/auth/auth.ts

@@ -1,5 +1,5 @@
 import * as vscode from "vscode";
-import {isUseEnterprise} from "../configuration/configuration";
+import {useEnterprise} from "../configuration/configuration";
 
 const AUTH_PROVIDER_ID = "github";
 const AUTH_PROVIDER_ID_ENTERPRISE = "github-enterprise";
@@ -69,7 +69,7 @@ async function getSessionInternal(
     typeof createOrForceMessage === "string"
       ? {forceNewSession: {detail: createOrForceMessage}}
       : {createIfNone: createOrForceMessage};
-  const authProviderId = isUseEnterprise() ? AUTH_PROVIDER_ID_ENTERPRISE : AUTH_PROVIDER_ID;
+  const authProviderId = useEnterprise() ? AUTH_PROVIDER_ID_ENTERPRISE : AUTH_PROVIDER_ID;
   return await vscode.authentication.getSession(authProviderId, getScopes(), options);
 }
 

src/configuration/configuration.ts

@@ -7,17 +7,17 @@ const DEFAULT_GITHUB_API = "https://api.github.com";
 
 export function initConfiguration(context: vscode.ExtensionContext) {
   context.subscriptions.push(
-    vscode.workspace.onDidChangeConfiguration(e => {
+    vscode.workspace.onDidChangeConfiguration(async e => {
       if (e.affectsConfiguration(getSettingsKey("workflows.pinned"))) {
         pinnedWorkflowsChangeHandlers.forEach(h => h());
       } else if (
         e.affectsConfiguration(getSettingsKey("use-enterprise")) ||
-        (isUseEnterprise() &&
+        (useEnterprise() &&
           (e.affectsConfiguration("github-enterprise.uri") || e.affectsConfiguration(getSettingsKey("remote-name"))))
       ) {
-        updateLanguageServerApiUrl(context);
+        await updateLanguageServerApiUrl(context);
         resetGitHubContext();
-        vscode.commands.executeCommand("github-actions.explorer.refresh");
+        await vscode.commands.executeCommand("github-actions.explorer.refresh");
       }
     })
   );
@@ -64,18 +64,18 @@ export function getRemoteName(): string {
   return getConfiguration().get<string>(getSettingsKey("remote-name"), "origin");
 }
 
-export function isUseEnterprise(): boolean {
+export function useEnterprise(): boolean {
   return getConfiguration().get<boolean>(getSettingsKey("use-enterprise"), false);
 }
 
 export function getGitHubApiUri(): string {
-  if (!isUseEnterprise()) return DEFAULT_GITHUB_API;
+  if (!useEnterprise()) return DEFAULT_GITHUB_API;
   const base = getConfiguration().get<string>("github-enterprise.uri", DEFAULT_GITHUB_API).replace(/\/$/, "");
   return base === DEFAULT_GITHUB_API ? base : `${base}/api/v3`;
 }
 
-function updateLanguageServerApiUrl(context: vscode.ExtensionContext) {
-  deactivateLanguageServer();
+async function updateLanguageServerApiUrl(context: vscode.ExtensionContext) {
+  await deactivateLanguageServer();
 
-  initLanguageServer(context);
+  await initLanguageServer(context);
 }

src/git/repository.ts

@@ -4,11 +4,12 @@ import {Octokit} from "@octokit/rest";
 import {canReachGitHubAPI} from "../api/canReachGitHubAPI";
 import {handleSamlError} from "../api/handleSamlError";
 import {getSession} from "../auth/auth";
-import {getRemoteName, isUseEnterprise} from "../configuration/configuration";
+import {getRemoteName, useEnterprise} from "../configuration/configuration";
 import {Protocol} from "../external/protocol";
 import {logDebug, logError} from "../log";
 import {API, GitExtension, RefType, RepositoryState} from "../typings/git";
 import {RepositoryPermission, getRepositoryPermission} from "./repository-permissions";
+import {getGitHubApiUri} from "../configuration/configuration";
 
 interface GitHubUrls {
   workspaceUri: vscode.Uri;
@@ -74,7 +75,11 @@ export async function getGitHubUrls(): Promise<GitHubUrls[] | null> {
           remote = [r.state.remotes[0]];
         }
 
-        if (remote.length > 0 && (remote[0].pushUrl?.indexOf("github.com") !== -1 || isUseEnterprise())) {
+        if (
+          remote.length > 0 &&
+          (remote[0].pushUrl?.indexOf("github.com") !== -1 ||
+            (useEnterprise() && remote[0].pushUrl?.indexOf(new URL(getGitHubApiUri()).host) !== -1))
+        ) {
           const url = remote[0].pushUrl;
 
           return {

src/workflow/languageServer.ts

@@ -11,7 +11,7 @@ import {userAgent} from "../api/api";
 import {getSession} from "../auth/auth";
 import {getGitHubContext} from "../git/repository";
 import {WorkflowSelector} from "./documentSelector";
-import {getGitHubApiUri, isUseEnterprise} from "../configuration/configuration";
+import {getGitHubApiUri, useEnterprise} from "../configuration/configuration";
 
 let client: BaseLanguageClient;
 
@@ -27,7 +27,7 @@ export async function initLanguageServer(context: vscode.ExtensionContext) {
   const initializationOptions: InitializationOptions = {
     sessionToken: session?.accessToken,
     userAgent: userAgent,
-    githubApiUrl: isUseEnterprise() ? getGitHubApiUri() : undefined,
+    gitHubApiUrl: useEnterprise() ? getGitHubApiUri() : undefined,
     repos: ghContext?.repos.map(repo => ({
       id: repo.id,
       owner: repo.owner,