Use serverSettings to make API requests (#1437)

* Use `IServerSettings` to make API requests

* update mock

* use serverSettings directly

* fix

* tests

* cleanup

Author: jtpio

src/__tests__/plugin.spec.ts

@@ -6,6 +6,7 @@ import { ISettingRegistry, SettingRegistry } from '@jupyterlab/settingregistry';
 import { JupyterLab } from '@jupyterlab/application';
 import { showErrorMessage } from '@jupyterlab/apputils';
 import { URLExt } from '@jupyterlab/coreutils';
+import { ServerConnection } from '@jupyterlab/services';
 import { Signal } from '@lumino/signaling';
 import {
   defaultMockedResponses,
@@ -30,6 +31,10 @@ describe('plugin', () => {
 
   beforeAll(() => {
     app = new JupyterLab() as jest.Mocked<JupyterLab>;
+    // Add the serviceManager.serverSettings mock
+    (app as any).serviceManager = {
+      serverSettings: ServerConnection.makeSettings()
+    };
     browserFactory = {
       defaultBrowser: {
         model: { pathChanged: new Signal(null), restored: Promise.resolve() }

src/__tests__/utils.ts

@@ -1,3 +1,4 @@
+import { ServerConnection } from '@jupyterlab/services';
 import { ReadonlyJSONObject } from '@lumino/coreutils';
 import { Git } from '../tokens';
 
@@ -44,8 +45,7 @@ export const defaultMockedResponses: {
   stash: {
     body: () => ({
       code: 0,
-      message: '',
-      command: ''
+      stashes: []
     })
   },
   status: {
@@ -68,13 +68,15 @@ export function mockedRequestAPI(
   endPoint?: string,
   method?: string,
   body?: ReadonlyJSONObject | null,
-  namespace?: string
+  namespace?: string,
+  serverSettings?: ServerConnection.ISettings
 ) => Promise<any> {
   const mockedImplementation = (
     url?: string,
     method?: string,
     body?: ReadonlyJSONObject | null,
-    namespace?: string
+    namespace?: string,
+    serverSettings?: ServerConnection.ISettings
   ) => {
     mockedResponses = mockedResponses ?? {};
     const path = mockedResponses.path ?? DEFAULT_REPOSITORY_PATH;

src/git.ts

@@ -20,6 +20,7 @@ export const AUTH_ERROR_MESSAGES = [
  * @param method HTML method; default 'GET'
  * @param body JSON object to be passed as body or null; default null
  * @param namespace API namespace; default 'git'
+ * @param serverSettings Optional server connection settings; if not provided, uses ServerConnection.makeSettings()
  * @returns The response body interpreted as JSON
  *
  * @throws {Git.GitResponseError} If the server response is not ok
@@ -29,10 +30,11 @@ export async function requestAPI<T>(
   endPoint = '',
   method = 'GET',
   body: Partial<ReadonlyJSONObject> | null = null,
-  namespace = 'git'
+  namespace = 'git',
+  serverSettings?: ServerConnection.ISettings
 ): Promise<T> {
   // Make request to Jupyter API
-  const settings = ServerConnection.makeSettings();
+  const settings = serverSettings ?? ServerConnection.makeSettings();
   const requestUrl = URLExt.join(
     settings.baseUrl,
     namespace, // API Namespace

src/index.ts

@@ -86,7 +86,7 @@ async function activate(
   translator: ITranslator | null
 ): Promise<IGitExtension> {
   let settings: ISettingRegistry.ISettings | undefined = undefined;
-  let serverSettings: Git.IServerSettings;
+  let gitServerSettings: Git.IServerSettings;
   translator = translator ?? nullTranslator;
   const trans = translator.load('jupyterlab_git');
 
@@ -98,9 +98,10 @@ async function activate(
       trans.__('Failed to load settings for the Git Extension.\n%1', error)
     );
   }
+  const serverSettings = app.serviceManager.serverSettings;
   try {
-    serverSettings = await getServerSettings(trans);
-    const { frontendVersion, gitVersion, serverVersion } = serverSettings;
+    gitServerSettings = await getServerSettings(trans, serverSettings);
+    const { frontendVersion, gitVersion, serverVersion } = gitServerSettings;
 
     // Version validation
     if (!gitVersion) {
@@ -145,7 +146,12 @@ async function activate(
     return null;
   }
   // Create the Git model
-  const gitExtension = new GitExtension(docmanager, app.docRegistry, settings);
+  const gitExtension = new GitExtension(
+    docmanager,
+    app.docRegistry,
+    settings,
+    serverSettings
+  );
 
   const onPathChanged = (
     model: FileBrowserModel,