Fixes for HTTPS

jakewins · jakewins · commit 0f559efb2448 · 2016-03-17T22:07:40.000-05:00
diff --git a/examples/neo4j.html b/examples/neo4j.html
@@ -93,7 +93,7 @@
         padding: 0 2px;
     }
     </style>
-    <script src="../lib/browser/neo4j-web.min.js"></script>
+    <script src="../lib/browser/neo4j-web.js"></script>
   </head>
   <body>
 
@@ -131,7 +131,11 @@ <h1>Cypher Runner for New Remoting</h1>
     </div>
 
     <script>
-    var driver = neo4j.driver("bolt+ws://localhost");
+    var authToken = neo4j.v1.auth.basic("neo4j", "neo4j");
+    console.log(authToken);
+    var driver = neo4j.v1.driver("bolt://localhost", authToken, {
+        encrypted:true
+    });
     var session = driver.session();
 
     function run() {
@@ -143,13 +147,14 @@ <h1>Cypher Runner for New Remoting</h1>
             onNext: function(record) {
                 // On receipt of RECORD
                 var tr = document.createElement("tr");
-                for(var i in record) {
+                record.forEach( function( value ) {
                     var td = document.createElement("td");
-                    td.appendChild(document.createTextNode(record[i]));
+                    td.appendChild(document.createTextNode(value));
                     tr.appendChild(td);
-                }
+                });
                 table.appendChild(tr);
-            }, onCompleted: function(metadata) {
+            },
+            onCompleted: function(metadata) {
                 
             }
         });
diff --git a/src/v1/graph-types.js b/src/v1/graph-types.js
@@ -73,7 +73,7 @@ class Relationship {
   }
 
   toString() {
-    let s = "(" + this.start.split('/')[1] + ")-[:" + this.type;
+    let s = "(" + this.start + ")-[:" + this.type;
     let keys = Object.keys(this.properties);
     if (keys.length > 0) {
       s += " {";
@@ -83,7 +83,7 @@ class Relationship {
       }
       s += "}";
     }
-    s += "]->(" + this.end.split('/')[1] + ")";
+    s += "]->(" + this.end + ")";
     return s;
   }
 }
diff --git a/src/v1/internal/ch-node.js b/src/v1/internal/ch-node.js
@@ -100,7 +100,7 @@ const TrustStrategy = {
     };
 
     let socket = tls.connect(opts.port, opts.host, tlsOpts, function () {
-      var serverCert = socket.getPeerCertificate(true);
+      var serverCert = socket.getPeerCertificate(raw=true);
 
       if( !serverCert.raw ) {
         // If `raw` is not available, we're on an old version of NodeJS, and
diff --git a/src/v1/internal/ch-websocket.js b/src/v1/internal/ch-websocket.js
@@ -38,6 +38,7 @@ class WebSocketChannel {
     this._open = true;
     this._pending = [];
     this._error = null;
+    this._handleConnectionError = this._handleConnectionError.bind(this);
 
     let scheme = "ws";
     if( opts.encrypted ) {
@@ -48,12 +49,12 @@ class WebSocketChannel {
           "strategy, 'TRUST_SIGNED_CERTIFICATES'. "+opts.trust+" is not supported. Please " +
           "either use TRUST_SIGNED_CERTIFICATES or disable encryption by setting " +
           "`encrypted:false` in the driver configuration.");
+        return;
       }
     }
     this._url = scheme + ":" + opts.host + ":" + opts.port;
     this._ws = new WebSocket(this._url);
     this._ws.binaryType = "arraybuffer";
-    this._handleConnectionError = this._handleConnectionError.bind(this);
 
     let self = this;
     this._ws.onopen = function() {
@@ -83,9 +84,10 @@ class WebSocketChannel {
         "to this Neo4j Driver. Please use your browsers development console to determine " +
         "the root cause of the failure. Common reasons include the database being " +
         "unavailable, using the wrong connection URL or temporary network problems. " +
-        "WebSocket `readyState` is: " + this._ws.readyState );
+        "If you have enabled encryption, ensure your browser is configured to trust the " +
+        "certificate Neo4j is configured to use. WebSocket `readyState` is: " + this._ws.readyState );
       if (this.onerror) {
-        this.onerror(error);
+        this.onerror(this._error);
       }
     }
   }
diff --git a/src/v1/result.js b/src/v1/result.js
@@ -46,6 +46,7 @@ class Result {
   /**
    * Create and return new Promise
    * @return {Promise} new Promise.
+   * @access private
    */
   _createPromise() {
     if(this._p) {
@@ -106,6 +107,9 @@ class Result {
       onCompletedOriginal.call(observer, sum);
     };
     observer.onCompleted = onCompletedWrapper;
+    observer.onError = observer.onError || ((err) => {
+      console.log("Uncaught error when processing result: " + err);
+    });
     this._streamObserver.subscribe(observer);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ class Relationship {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`toString() {`
`76`		`- let s = "(" + this.start.split('/')[1] + ")-[:" + this.type;`
	`76`	`+ let s = "(" + this.start + ")-[:" + this.type;`
`77`	`77`	`let keys = Object.keys(this.properties);`
`78`	`78`	`if (keys.length > 0) {`
`79`	`79`	`s += " {";`
`@@ -83,7 +83,7 @@ class Relationship {`
`83`	`83`	`}`
`84`	`84`	`s += "}";`
`85`	`85`	`}`
`86`		`- s += "]->(" + this.end.split('/')[1] + ")";`
	`86`	`+ s += "]->(" + this.end + ")";`
`87`	`87`	`return s;`
`88`	`88`	`}`
`89`	`89`	`}`