1.0.0

Author: maxprog

modules/lib/message.js

@@ -25,8 +25,8 @@ exports.broadcast = function(socket,data){
 
 
 exports.sendError = function(socket, message) {
-
-          return socket.emit('error', {
+console.log('socket.io: send Error to socket client');
+          socket.emit('error.messages', {
               message: message
           });
 

modules/lib/security.js

@@ -19,9 +19,9 @@ const verifyConnection = function(socket, data) {
     if(!socket || socket==='undefined' || !clients[socket.id] || !token)
     {
         console.log('Unauthorized access: access denied');
-        message.sendError(socket,'Invalid email or password');  
+        message.sendError(socket,'Unauthorized access: access denied');  
 
-        socket.disconnect();
+        socket.disconnect(true);
         reject(false);
     }
 
@@ -33,23 +33,23 @@ const verifyConnection = function(socket, data) {
             if (err) 
             {
 
-                console.log(err);
-                 message.sendError(socket,'Invalid email or password');
+                console.log('Invalid token');
+                 message.sendError(socket,'Invalid token');
 
-                    socket.disconnect();
+                socket.disconnect(true);
                 reject(false);
              }
 
 
             let userID = decoded.id;
 
              let user = _.find(users,{id:userID});
-             console.log('founded user',user);
+           
              if(!user) {
-                         console.log('!user:false');
-                         message.sendError(socket, 'Invalid email or password');
+                         console.log('User not found');
+                         message.sendError(socket, 'User not found');
 
-                          socket.disconnect();
+                            socket.disconnect(true);
                           reject(false);
                          }
                   else {  
@@ -83,10 +83,10 @@ exports.verifyConnectionAuth0 = function(socket, data) {
      if(!socket || socket==='undefined' || !clients[socket.id] || !token)
     {
         console.log('Unauthorized access: access denied');
-        message.sendError(socket,'Invalid email or password');  
+        message.sendError(socket,'Unauthorized access: access denied');  
 
-           socket.disconnect();
-      reject(false);
+           socket.disconnect(true);
+           reject(false);
     }
 
     if (token) 
@@ -97,9 +97,9 @@ exports.verifyConnectionAuth0 = function(socket, data) {
             if (err) 
             {
                console.log(err);
-                 message.sendError(socket,'Invalid email or password');
+                 message.sendError(socket,'Invalid token');
 
-                    socket.disconnect();
+               socket.disconnect(true);
                reject(false);
              }
 
@@ -111,9 +111,9 @@ exports.verifyConnectionAuth0 = function(socket, data) {
              let user = _.find(users,{auth0_user_id:auth0UserID});
 
              if(!user) {
-                         message.sendError(socket, 'Invalid email or password');
+                         message.sendError(socket, 'User not found');
 
-                            socket.disconnect();
+                        socket.disconnect(true);
                         reject(false);
                          }
                   else { 

modules/lib/user.js

@@ -6,7 +6,7 @@ exports.getUser = function (socket, data) {
 security.verifyConnection(socket,data).then(function(result) {
 
   console.log('Access allowed to getUser()');
-  if(!data.id) return socket.emit('user.success', null);
+  if(!data.id) socket.emit('user.success', null);
 
   const user = _.find(users,{id:data.id});
 
@@ -17,7 +17,7 @@ security.verifyConnection(socket,data).then(function(result) {
       id: user.id
     } : null;
 
-  return socket.emit('user.success', profile);
+  socket.emit('user.success', profile);
 
 }, function(err) {
   console.log('Access denied to getUser()'); return;

modules/mainSocketLocalToken.js

@@ -28,23 +28,27 @@ exports.connect = function(server){
         io.on('connection', function (socket) {
 
             console.log('socket.io: new connection, current number of authorized connections:',NumberOfConnections());
+          
               //Get User   
               socket.on('getUser', function (data) {
-                   console.log('socket.io: call getUser');
+                console.log('socket.io: call getUser()');
                  user.getUser(socket, data);
                });
 
                 socket.on('message', function (data) {
+                 console.log('socket.io: call message()');
                  message.broadcast(socket,data);
                });
 
                // Login
                 socket.on('login', function (data) {
+                     console.log('socket.io: call login()');
                     security.authenticateUser(socket, data);
                 });
 
                 // Logout
                 socket.on('logout', function (token) {
+                      console.log('socket.io: call logout()');
                       clients[socket.id] && delete clients[socket.id];
                      console.log('close connection, number of authorized connections:',NumberOfConnections());