add endpoint to configuration

package.json

@@ -50,6 +50,11 @@
           "type": "string",
           "default": "",
           "description": "The secret to use to connnect to your fauna database."
+        },
+        "fauna.endpoint": {
+          "type": "string",
+          "default": "https://db.fauna.com",
+          "description": "The fauna endpoint to use."
         }
       }
     },

src/FQLConfigurationManager.ts

@@ -7,6 +7,7 @@ export class FQLConfigurationManager {
   static readonly EMPTY_SECRET = "0";
   static readonly FAUNA_CONFIG_PATH = "fauna";
   static readonly SECRET_CONFIG_FIELD = "dbSecret";
+  static readonly ENDPOINT_CONFIG_FIELD = "endpoint";
   static readonly SECRET_CONFIG_PATH = `${FQLConfigurationManager.FAUNA_CONFIG_PATH}.${FQLConfigurationManager.SECRET_CONFIG_FIELD}`;
 
   static readonly config_error_dialogue = (message: string) => {
@@ -22,7 +23,7 @@ export class FQLConfigurationManager {
 
 
   private dbSecret: string;
-  private endpoint: string = "http://localhost:8443";
+  private endpoint: string = "https://db.fauna.com";
   /** Used to send notifications when extension configuration is updated. */
   private subscriptions: ConfigurationChangeSubscription[] = [];
 
@@ -37,6 +38,11 @@ export class FQLConfigurationManager {
     } else {
       this.dbSecret = dbSecret;
     }
+
+    const endpoint = config.get<string>(FQLConfigurationManager.ENDPOINT_CONFIG_FIELD);
+    if (endpoint !== undefined && endpoint !== "") {
+      this.endpoint = endpoint;
+    }
   }
 
   config(): FQLConfiguration {
@@ -51,6 +57,7 @@ export class FQLConfigurationManager {
   }
 
   async onConfigurationChange(event: vscode.ConfigurationChangeEvent) {
+    // todo: need to update endpoint here as well
     if (event.affectsConfiguration(FQLConfigurationManager.SECRET_CONFIG_PATH)) {
       const newSecret = vscode.workspace.getConfiguration(FQLConfigurationManager.FAUNA_CONFIG_PATH).get<string>(FQLConfigurationManager.SECRET_CONFIG_FIELD);
       if (newSecret === undefined || newSecret === "") {

src/LanguageServer.ts

@@ -89,7 +89,7 @@ export class LanguageService implements ConfigurationChangeSubscription {
   }
 
   async configChanged(updatedConfiguration: FQLConfiguration) {
-    const resp = await this.client.sendRequest("setFaunaSecret", { secret: updatedConfiguration.dbSecret }) as any;
+    const resp = await this.client.sendRequest("setFaunaConfig", { endpoint: updatedConfiguration.endpoint, secret: updatedConfiguration.dbSecret }) as any;
     this.outputChannel.clear();
     if (resp.status === "error") {
       FQLConfigurationManager.config_error_dialogue(resp.message);

src/test/suite/extension.test.ts

@@ -19,6 +19,9 @@ suite("Extension Test Suite", () => {
   setup(async () => {
     [fqlClient, secret] = await testHelper.clientWithFreshDB("VSCodeTest");
     await setConfigSecret(secret);
+    if (fqlClient.clientConfiguration.endpoint) {
+      await setConfigEndpoint(fqlClient.clientConfiguration.endpoint.href);
+    }
   });
   test("should test completion items", async () => {
     await fqlClient.query(fql`Collection.create({ name: "Cats" })`);
@@ -40,11 +43,17 @@ suite("Extension Test Suite", () => {
     assert.ok(containsCollectionCompletionItem(completionList, "Cats"));
   });
 
+  // todo: don't shadow
   async function setConfigSecret(secret: string): Promise<void> {
     const config = vscode.workspace.getConfiguration(FQLConfigurationManager.FAUNA_CONFIG_PATH);
     await config.update(FQLConfigurationManager.SECRET_CONFIG_FIELD, secret, vscode.ConfigurationTarget.Global);
   }
 
+  async function setConfigEndpoint(endpoint: string): Promise<void> {
+    const config = vscode.workspace.getConfiguration(FQLConfigurationManager.FAUNA_CONFIG_PATH);
+    await config.update(FQLConfigurationManager.ENDPOINT_CONFIG_FIELD, endpoint, vscode.ConfigurationTarget.Global);
+  }
+
   function containsCollectionCompletionItem(completionItems: vscode.CompletionList, collectionName: string) {
     return completionItems.items.some(item => {
       return item.kind === vscode.CompletionItemKind.Module &&