Exposes socket.auth. Closes #27

hapijs · Sep 8, 2015 · 896bc00 · 896bc00
1 parent 671ebc5
commit 896bc00
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/lib/listener.js b/lib/listener.js
@@ -217,7 +217,7 @@ internals.Listener.prototype._publish = function (path, update) {
                 socket._send(update);
             }
             else {
-                route.filter(path, update.message, { credentials: socket._auth.credentials, params: sub.params }, internals.send(socket, update));
+                route.filter(path, update.message, { credentials: socket.auth.credentials, params: sub.params }, internals.send(socket, update));
             }
         }
     }
@@ -250,7 +250,7 @@ internals.Listener.prototype._subscribe = function (path, socket, next) {
 
     var auth = this._connection.auth.lookup({ settings: { auth: match.route.auth } });         // Create a synthetic route
     if (auth) {
-        var credentials = socket._auth.credentials;
+        var credentials = socket.auth.credentials;
         if (credentials) {
 
             // Check scope

diff --git a/lib/socket.js b/lib/socket.js
@@ -17,7 +17,8 @@ exports = module.exports = internals.Socket = function (ws, listener) {
 
     this._ws = ws;
     this._listener = listener;
-    this._auth = {
+    this.auth = {
+        isAuthenticated: false,
         credentials: null,
         artifects: null
     };
@@ -126,7 +127,7 @@ internals.Socket.prototype._processHello = function (request) {
         return this._processHelloSubscriptions(request, response);
     }
 
-    if (this._auth.credentials) {
+    if (this.auth.isAuthenticated) {
         response.error = 'Connection already authenticated';
         return this._send(response);
     }
@@ -140,7 +141,12 @@ internals.Socket.prototype._processHello = function (request) {
                 return self._send(response);
             }
 
-            self._auth = res.result;
+            self.auth = {
+                isAuthenticated: true,
+                credentials: res.result.credentials,
+                artifects: res.result.artifects
+            };
+
             return self._processHelloSubscriptions(request, response);
         });
 
@@ -154,7 +160,12 @@ internals.Socket.prototype._processHello = function (request) {
             return self._send(response);
         }
 
-        self._auth = credentials;
+        self.auth = {
+            isAuthenticated: true,
+            credentials: credentials,
+            artifects: null
+        };
+
         return self._processHelloSubscriptions(request, response);
     });
 };
@@ -227,8 +238,8 @@ internals.Socket.prototype._processRequest = function (request) {
         url: path,
         payload: request.payload,
         headers: request.headers,
-        credentials: this._auth.credentials,
-        artifects: this._auth.artifects
+        credentials: this.auth.credentials,
+        artifects: this.auth.artifects
     };
 
     this._listener._connection.inject(shot, function (res) {
@@ -343,7 +354,11 @@ internals.Socket.prototype._authenticate = function (next) {
 
         var auth = state[config.cookie];
         if (auth) {
-            self._auth = auth;
+            self.auth = {
+                isAuthenticated: true,
+                credentials: auth.credentials,
+                artifects: auth.artifects
+            };
         }
 
         return next();