conn string support (#372)

Author: octref

client/src/actions/connection.js

@@ -24,6 +24,7 @@ export const SET_BACKUP_ENABLED = "connection/SET_BACKUP_ENABLED";
 export const SET_QUERY_TIMEOUT = "connection/SET_QUERY_TIMEOUT";
 export const SET_SLASH_API_KEY = "connection/SET_SLASH_API_KEY";
 export const SET_AUTH_TOKEN = "connection/SET_AUTH_TOKEN";
+export const SET_URL_AND_SLASH_API_KEY = "connection/SET_URL_AND_SLASH_API_KEY";
 export const REMOVE_URL = "connection/REMOVE_URL";
 export const UPDATE_URL = "connection/UPDATE_URL";
 export const UPDATE_ACL_STATE = "connection/UPDATE_ACL_STATE";
@@ -64,6 +65,15 @@ export function setSlashApiKey(url, slashApiKey) {
     };
 }
 
+export function setUrlAndSlashApiKey(connectionString) {
+    const { url, bearertoken } = helpers.parseDgraphUrl(connectionString);
+    return {
+        type: SET_URL_AND_SLASH_API_KEY,
+        url,
+        slashApiKey: bearertoken,
+    };
+}
+
 export function setAuthToken(url, authToken) {
     return {
         type: SET_AUTH_TOKEN,

client/src/components/ServerConnectionModal.js

@@ -66,6 +66,11 @@ export default function ServerConnectionModal() {
     }, CHECK_HEALTH_INTERVAL);
 
     const connectTo = url => {
+        if (url.startsWith("dgraph://")) {
+            dispatch(actions.setUrlAndSlashApiKey(url));
+            onHide();
+            return;
+        }
         if (!url || !url.trim()) {
             setShowError(true);
             return;
@@ -217,7 +222,7 @@ export default function ServerConnectionModal() {
             }}
         >
             <Form.Group controlId="serverUrlInput">
-                <Form.Label>Dgraph Alpha URL:</Form.Label>
+                <Form.Label>Dgraph Conn String:</Form.Label>
                 <Form.Control
                     type="text"
                     placeholder="https://dgraph.example.com:port"
@@ -265,7 +270,7 @@ export default function ServerConnectionModal() {
 
     const historyDisplay = (
         <>
-            <h6>Recent Alpha Connections</h6>
+            <h6>Recent Dgraph Connections</h6>
             <ListGroup>
                 {serverHistory.map((s, index) => (
                     <ListGroup.Item
@@ -334,7 +339,7 @@ export default function ServerConnectionModal() {
             <Modal.Header closeButton>
                 <Modal.Title>
                     <img src={DgraphLogo} alt="Dgraph Logo" className="logo" />
-                    <span className="title">Dgraph Alpha Connection</span>
+                    <span className="title">Dgraph Connections</span>
                 </Modal.Title>
             </Modal.Header>
             <Modal.Body>

client/src/lib/helpers.js

@@ -73,6 +73,31 @@ const clientStubOptions = {
     },
 };
 
+export const parseDgraphUrl = url => {
+    // Handle dgraph:// protocol
+    if (url.startsWith("dgraph://")) {
+        const [_protocol, rest] = url.split("://");
+        const [host, queryString] = rest.split("?");
+        const params = new URLSearchParams(queryString || "");
+
+        // Remove port number from host if present
+        const hostWithoutPort = host.split(":")[0];
+
+        return {
+            url: `https://${hostWithoutPort}/dgraph`,
+            sslmode: params.get("sslmode"),
+            bearertoken: params.get("bearertoken"),
+        };
+    }
+
+    // Handle regular http(s) URLs
+    return {
+        url,
+        sslmode: "verify-ca",
+        bearertoken: null,
+    };
+};
+
 const createDgraphClient = memoizeOne(async url => {
     const stub = new dgraph.DgraphClientStub(
         url,
@@ -135,6 +160,7 @@ export async function executeQuery(
     }
 
     const client = await getDgraphClient();
+    console.log("client", client);
 
     if (action === "query") {
         return client

client/src/reducers/connection.js

@@ -24,6 +24,8 @@ import {
     UPDATE_SERVER_HEALTH,
     UPDATE_SERVER_VERSION,
     UPDATE_ZERO_URL,
+    SET_MULTI_TENANCY_ENABLED,
+    SET_URL_AND_SLASH_API_KEY,
 } from "actions/connection";
 import {
     MIGRATE_TO_SERVER_CONNECTION,
@@ -48,7 +50,6 @@ import {
     SERVER_HISTORY_LENGTH,
     Unknown,
 } from "lib/constants";
-import { SET_MULTI_TENANCY_ENABLED } from "../actions/connection";
 
 const assert = (test, message = "No message") => {
     if (!test) {
@@ -192,6 +193,17 @@ export default (state = defaultState, action) =>
                     setCurrentServerSlashApiKey(activeServer.slashApiKey);
                 }
                 break;
+            case SET_URL_AND_SLASH_API_KEY:
+                draft.serverHistory = historyPlusServer(
+                    draft.serverHistory,
+                    makeServerRecord(action.url),
+                );
+
+                const newActiveServer = draft.serverHistory[0];
+                newActiveServer.slashApiKey = action.slashApiKey;
+                setCurrentServerUrl(newActiveServer.url);
+                setCurrentServerSlashApiKey(newActiveServer.slashApiKey);
+                break;
             case SET_AUTH_TOKEN:
                 assert(action.url, "This action requires url " + action.type);
                 activeServer.authToken = action.authToken;