completed migration to webpack-transferred environment variables, rather than a server route

3 files changed, 2 insertions, 21 deletions

diff --git a/src/client/Network.ts b/src/client/Network.ts
index bd0e6e61a..6982ecf19 100644
--- a/src/client/Network.ts
+++ b/src/client/Network.ts
@@ -4,23 +4,10 @@ import { Upload } from "../server/SharedMediaTypes";
 
 export namespace Networking {
 
-    const EnvVarCache = new Map<string, string>();
-
     export async function FetchFromServer(relativeRoute: string) {
         return (await fetch(relativeRoute)).text();
     }
 
-    export async function FetchEnvironmentVariable(varNameLiteral: string) {
-        let resolved = EnvVarCache.get(varNameLiteral);
-        if (!resolved) {
-            resolved = await FetchFromServer(`/environment/${varNameLiteral}`);
-            if (resolved !== undefined) {
-                EnvVarCache.set(varNameLiteral, resolved);
-            }
-        }
-        return resolved;
-    }
-
     export async function PostToServer(relativeRoute: string, body?: any) {
         const options = {
             uri: Utils.prepend(relativeRoute),
diff --git a/src/client/cognitive_services/CognitiveServices.ts b/src/client/cognitive_services/CognitiveServices.ts
index 3133bf4b1..8c63ae906 100644
--- a/src/client/cognitive_services/CognitiveServices.ts
+++ b/src/client/cognitive_services/CognitiveServices.ts
@@ -45,7 +45,7 @@ export enum Confidence {
 export namespace CognitiveServices {
 
     const ExecuteQuery = async <D>(service: Service, manager: APIManager<D>, data: D): Promise<any> => {
-        const apiKey = await Utils.getApiKey(service);
+        const apiKey = process.env[service.toUpperCase()];
         if (!apiKey) {
             console.log(`No API key found for ${service}: ensure index.ts has access to a .env file in your root directory.`);
             return undefined;
diff --git a/src/client/views/collections/CollectionMapView.tsx b/src/client/views/collections/CollectionMapView.tsx
index 6ab152836..a99d5be50 100644
--- a/src/client/views/collections/CollectionMapView.tsx
+++ b/src/client/views/collections/CollectionMapView.tsx
@@ -64,10 +64,4 @@ class CollectionMapView extends CollectionSubView<MapDocument, Partial<MapProps>
 
 }
 
-declare var process: {
-    env: {
-        GOOGLE_MAPS_API_KEY: string;
-    }
-};
-
-export default GoogleApiWrapper({ apiKey: process.env.GOOGLE_MAPS_API_KEY })(CollectionMapView) as any;
\ No newline at end of file
+export default GoogleApiWrapper({ apiKey: process.env.GOOGLE_MAPS_API_KEY! })(CollectionMapView) as any;
\ No newline at end of file