Add support for user info on ws: and wss: URLs

tests/standalone/io/web_socket_test.dart

Index: tests/standalone/io/web_socket_test.dart
diff --git a/tests/standalone/io/web_socket_test.dart b/tests/standalone/io/web_socket_test.dart
index d9229b6e74f7893973b46248cd9e53abd06da164..81a15bba619f03afa5e29ed550965f6177acd2c5 100644
--- a/tests/standalone/io/web_socket_test.dart
+++ b/tests/standalone/io/web_socket_test.dart
@@ -8,6 +8,7 @@
 // VMOptions=--short_socket_read --short_socket_write
 
 import "dart:async";
+import "dart:convert";
 import "dart:io";
 import "dart:typed_data";
 
@@ -452,9 +453,6 @@ class SecurityConfiguration {
       var url = '${secure ? "wss" : "ws"}://$HOST_NAME:${server.port}/';
       var headers = {'My-Header': 'my-value',
                      'My-Header-Multiple': ['my-value-1', 'my-value-2']};
-      print(headers);
-      print(headers['My-Header-Multiple'] is Iterable);
-      print(headers['My-Header-Multiple'].length);
       WebSocket.connect(url, headers: headers).then((websocket) {
         return websocket.listen((message) {
           Expect.equals("Hello", message);
@@ -468,6 +466,37 @@ class SecurityConfiguration {
   }
 
 
+  void testBasicAuthentication() {
+    var userInfo = 'user:password';
+  
+    asyncStart();
+    createServer().then((server) {
+      server.listen((request) {
+        Expect.isTrue(WebSocketTransformer.isUpgradeRequest(request));
+        String auth =
+              CryptoUtils.bytesToBase64(UTF8.encode(userInfo));
+        Expect.equals('Basic $auth', request.headers['Authorization'][0]);
+        Expect.equals(1, request.headers['Authorization'].length);
+        WebSocketTransformer.upgrade(request).then((webSocket) {
+          webSocket.listen((_) { webSocket.close(); });
+          webSocket.add("Hello");

[kustermann, 2015/02/06 13:13:46]

Why do you close inside listen and add one line after?

Maybe

webSocket.drain();
webSocket
  ..add('Hello')
  ..close();

[Søren Gjesse, 2015/02/09 10:38:59]

This test just sends "Hello" back, but no data is send from the other side. So
the onData in listen is never called, and the close is dead code. Changed onData
to throw, and added asyncEnd to onDone (after adding one more asyncStart().

+        });
+      });
+
+      var url =
+          '${secure ? "wss" : "ws"}://$userInfo@$HOST_NAME:${server.port}/';
+      WebSocket.connect(url).then((websocket) {
+        return websocket.listen((message) {
+          Expect.equals("Hello", message);
+          websocket.close();

[kustermann, 2015/02/06 13:13:46]

-> `return websocket.close()` 

[Søren Gjesse, 2015/02/09 10:38:59]

Why? The future is the asFuture on the stream subscription which is unrelated to
the return value from the onData closure.

+        }).asFuture();
+      }).then((_) {
+        server.close();

[kustermann, 2015/02/06 13:13:46]

-> `return server.close();`

before asyncEnd()

[Søren Gjesse, 2015/02/09 10:38:59]

Done. Moved asyncEnd to whenComplete.

+        asyncEnd();
+      });
+    });
+  }
+
   void runTests() {
     testRequestResponseClientCloses(2, null, null, 1);
     testRequestResponseClientCloses(2, 3001, null, 2);
@@ -490,6 +519,7 @@ class SecurityConfiguration {
     testIndividualUpgrade(5);
     testFromUpgradedSocket();
     testAdditionalHeaders();
+    testBasicAuthentication();
   }
 }