1.0.0

Author: maxprog

modules/lib/message.js

@@ -1,14 +1,15 @@
+ const _  = require('lodash');
 
 exports.broadcast = function(socket,data){
 
-    
     security.verifyConnection(socket,data).then(function(result) {
 
     console.log('Access allowed to broadcast()');
         try{
         var obj = {org:data.org,topic:data.topic,message:data.message};
                 console.log('socket.io broadcast:',obj);
-                clients.forEach(function(client) {
+                _.each(clients,function(client,index) {
+                   
                     client.emit('message', obj);
                     }
                 );

modules/lib/security.js

@@ -4,17 +4,10 @@ const    _  = require('lodash'),
 
 
 const func = (socket,data) => {
+    
     return new Promise((resolve, reject) => {
 
-                verifyConnection(socket,data);
-    });
-};
-
-exports.verifyConnection = func;
-
-const verifyConnection = function(socket, data) {
-
-    var token = data && data.token || null;
+                 var token = data && data.token || null;
 
     if(!socket || socket==='undefined' || !clients[socket.id] || !token)
     {
@@ -54,30 +47,23 @@ const verifyConnection = function(socket, data) {
                          }
                   else {  
                             console.log('user:true'); 
-                            resolve(true);}
+                            resolve(true);
+                        }
 
          });
     }
-    
-};
-
-
-const func2 = (socket,data) => {
-    return new Promise((resolve, reject) => {
-      
-       verifyConnectionAuth0(socket,data);
-
     });
 };
 
+exports.verifyConnection = func;
 
 
-exports.verifyConnectionAuth0 = func2;
 
-exports.verifyConnectionAuth0 = function(socket, data) {
 
-   
-    var token = data && data.token || null;
+const func2 = (socket,data) => {
+    return new Promise((resolve, reject) => {
+      
+      var token = data && data.token || null;
 
 
      if(!socket || socket==='undefined' || !clients[socket.id] || !token)
@@ -123,9 +109,16 @@ exports.verifyConnectionAuth0 = function(socket, data) {
 
          });
     };
-    
+
+    });
 };
 
+
+
+exports.verifyConnectionAuth0 = func2;
+
+
+
 exports.authenticateUser = function authenticateUser (socket, data) {
 
   const {email,password}=data;
@@ -165,7 +158,7 @@ const loginUser = function loginUser(socket, user) {
   var data =  {profile: profile, token:token};
     socket.emit('login.success', data);
 
-    clients[socket.id]=data;
+    clients[socket.id]=socket;
     //clients[token]=data;
     console.log('User logged to socket.io. number of authorized connections:',NumberOfConnections());
      console.log('User profile logged to socket.io=',profile);

modules/mainSocketLocalToken.js

@@ -1,8 +1,6 @@
-
 /* 
 Socket.io Authentication based on Local generated token
 */
-
 const user = require('./lib/user'),
      socketio = require('socket.io');
 
@@ -18,8 +16,6 @@ global.NumberOfConnections = function() {
     return Object.keys(clients).length;
 }
 
-
-
 exports.connect = function(server){
 
         var io = socketio.listen(server);
@@ -54,14 +50,11 @@ exports.connect = function(server){
 
                 });
 
-
-
-            socket.on('disconnect', function () {
+     
+               socket.on('disconnect', function () {
                  clients[socket.id] && delete clients[socket.id];
                 console.log('close connection, number of authorized connections:',NumberOfConnections());
-                
-
-            });
+                 });
         });
 
         io.on('end', function() {