Remove one indirection for ConfigContext

Things like ConfigContext.BACKEND_ENDPOINT are dynamically changed, and assigning them statically like this only bypasses that mechanism :(

Co-authored-by: Steve Faulkner <471400+southpolesteve@users.noreply.github.com>

src/Common/Constants.ts

@@ -1,5 +1,4 @@
 import { AutopilotTier } from "../Contracts/DataModels";
-import { configContext } from "../ConfigContext";
 import { HashMap } from "./HashMap";
 
 export class AuthorizationEndpoints {
@@ -13,12 +12,6 @@ export class CodeOfConductEndpoints {
   public static termsOfUse: string = "https://aka.ms/ms-terms-of-use";
 }
 
-export class BackendEndpoints {
-  public static localhost: string = "https://localhost:12900";
-  public static dev: string = "https://ext.documents-dev.windows-int.net";
-  public static productionPortal: string = configContext.BACKEND_ENDPOINT || "https://main.documentdb.ext.azure.com";
-}
-
 export class EndpointsRegex {
   public static readonly cassandra = [
     "AccountEndpoint=(.*).cassandra.cosmosdb.azure.com",

src/Common/CosmosClient.test.ts

@@ -14,7 +14,9 @@ describe("tokenProvider", () => {
   };
 
   beforeEach(() => {
-    window.dataExplorer = { extensionEndpoint: () => "https://main.documentdb.ext.azure.com" } as any;
+    updateConfigContext({
+      BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+    });
     window.fetch = jest.fn().mockImplementation(() => {
       return {
         json: () => "{}",
@@ -58,7 +60,9 @@ describe("getTokenFromAuthService", () => {
   });
 
   it("builds the correct URL in production", () => {
-    window.dataExplorer = { extensionEndpoint: () => "https://main.documentdb.ext.azure.com" } as any;
+    updateConfigContext({
+      BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+    });
     getTokenFromAuthService("GET", "dbs", "foo");
     expect(window.fetch).toHaveBeenCalledWith(
       "https://main.documentdb.ext.azure.com/api/guest/runtimeproxy/authorizationTokens",

src/Common/CosmosClient.ts

@@ -52,7 +52,7 @@ export const endpoint = () => {
 
 export async function getTokenFromAuthService(verb: string, resourceType: string, resourceId?: string): Promise<any> {
   try {
-    const host = configContext.BACKEND_ENDPOINT || _global.dataExplorer.extensionEndpoint();
+    const host = configContext.BACKEND_ENDPOINT;
     const response = await _global.fetch(host + "/api/guest/runtimeproxy/authorizationTokens", {
       method: "POST",
       headers: {
@@ -85,8 +85,7 @@ export function client(): Cosmos.CosmosClient {
     userAgentSuffix: "Azure Portal"
   };
 
-  // In development we proxy requests to the backend via webpack. This is removed in production bundles.
-  if (process.env.NODE_ENV === "development") {
+  if (configContext.PROXY_PATH !== undefined) {
     (options as any).plugins = [{ on: "request", plugin: requestPlugin }];
   }
   return new Cosmos.CosmosClient(options);

src/Common/MongoProxyClient.test.ts

@@ -63,10 +63,9 @@ describe("MongoProxyClient", () => {
       updateUserContext({
         databaseAccount
       });
-      window.dataExplorer = {
-        extensionEndpoint: () => "https://main.documentdb.ext.azure.com",
-        serverId: () => ""
-      } as any;
+      updateConfigContext({
+        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+      });
       window.fetch = jest.fn().mockImplementation(fetchMock);
     });
     afterEach(() => {
@@ -96,10 +95,9 @@ describe("MongoProxyClient", () => {
       updateUserContext({
         databaseAccount
       });
-      window.dataExplorer = {
-        extensionEndpoint: () => "https://main.documentdb.ext.azure.com",
-        serverId: () => ""
-      } as any;
+      updateConfigContext({
+        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+      });
       window.fetch = jest.fn().mockImplementation(fetchMock);
     });
     afterEach(() => {
@@ -129,10 +127,9 @@ describe("MongoProxyClient", () => {
       updateUserContext({
         databaseAccount
       });
-      window.dataExplorer = {
-        extensionEndpoint: () => "https://main.documentdb.ext.azure.com",
-        serverId: () => ""
-      } as any;
+      updateConfigContext({
+        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+      });
       window.fetch = jest.fn().mockImplementation(fetchMock);
     });
     afterEach(() => {
@@ -162,10 +159,9 @@ describe("MongoProxyClient", () => {
       updateUserContext({
         databaseAccount
       });
-      window.dataExplorer = {
-        extensionEndpoint: () => "https://main.documentdb.ext.azure.com",
-        serverId: () => ""
-      } as any;
+      updateConfigContext({
+        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+      });
       window.fetch = jest.fn().mockImplementation(fetchMock);
     });
     afterEach(() => {
@@ -195,10 +191,9 @@ describe("MongoProxyClient", () => {
       updateUserContext({
         databaseAccount
       });
-      window.dataExplorer = {
-        extensionEndpoint: () => "https://main.documentdb.ext.azure.com",
-        serverId: () => ""
-      } as any;
+      updateConfigContext({
+        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+      });
       window.fetch = jest.fn().mockImplementation(fetchMock);
     });
     afterEach(() => {
@@ -229,10 +224,9 @@ describe("MongoProxyClient", () => {
       updateUserContext({
         databaseAccount
       });
-      window.dataExplorer = {
-        extensionEndpoint: () => "https://main.documentdb.ext.azure.com",
-        serverId: () => ""
-      } as any;
+      updateConfigContext({
+        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+      });
     });
 
     it("returns a production endpoint", () => {

src/Common/MongoProxyClient.ts

@@ -327,8 +327,7 @@ export function createMongoCollectionWithProxy(
 }
 
 export function getEndpoint(): string {
-  const extensionEndpoint = window.dataExplorer.extensionEndpoint();
-  let url = (configContext.MONGO_BACKEND_ENDPOINT || extensionEndpoint) + "/api/mongo/explorer";
+  let url = (configContext.MONGO_BACKEND_ENDPOINT || configContext.BACKEND_ENDPOINT) + "/api/mongo/explorer";
 
   if (window.authType === AuthType.EncryptedToken) {
     url = url.replace("api/mongo", "api/guest/mongo");

src/Common/dataAccess/updateOfferThroughputBeyondLimit.test.ts

@@ -9,8 +9,7 @@ describe("updateOfferThroughputBeyondLimit", () => {
     });
     window.dataExplorer = {
       logConsoleData: jest.fn(),
-      deleteInProgressConsoleDataWithId: jest.fn(),
-      extensionEndpoint: jest.fn()
+      deleteInProgressConsoleDataWithId: jest.fn()
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } as any;
     await updateOfferThroughputBeyondLimit({

src/Common/dataAccess/updateOfferThroughputBeyondLimit.ts

@@ -28,8 +28,7 @@ export async function updateOfferThroughputBeyondLimit(request: UpdateOfferThrou
     `Requesting increase in throughput to ${request.throughput} for ${resourceDescriptionInfo}`
   );
 
-  const explorer = window.dataExplorer;
-  const url = `${explorer.extensionEndpoint()}/api/offerthroughputrequest/updatebeyondspecifiedlimit`;
+  const url = `${configContext.BACKEND_ENDPOINT}/api/offerthroughputrequest/updatebeyondspecifiedlimit`;
   const authorizationHeader = getAuthorizationHeader();
 
   const response = await fetch(url, {