fixed error in subscribeToRoom

sails/src/api/controllers/StudentController.js

@@ -60,12 +60,15 @@ module.exports = {
       if (student) {
       if (student) {
         if (bcrypt.compareSync(req.body.password, student.password)) {
         if (bcrypt.compareSync(req.body.password, student.password)) {
           student.isStudent = true;
           student.isStudent = true;
-          if (!student.license || !student.license[0] || student.license[0].hasExpired()) {
+          if (!student.license || !student.license[0]) {
             sails.log.error(`Tried to login with non valid license ${req.body.username}`);
             sails.log.error(`Tried to login with non valid license ${req.body.username}`);
-            return res.unauthorized("Student has an invalid license");
           } else
           } else
             student = student.toObject(); // to enable overwrite license field
             student = student.toObject(); // to enable overwrite license field
             student.license = student.license[0];
             student.license = student.license[0];
+            if (student.license[0].hasExpired())
+              student.license.expired = true;
+            else
+              student.license.expired = false;
             return res.ok({
             return res.ok({
               user: student,
               user: student,
               token: sailsTokenAuth.issueToken(student, sails.config.jwt.expiresInMinutes),
               token: sailsTokenAuth.issueToken(student, sails.config.jwt.expiresInMinutes),

sails/src/api/hooks/rooms.js

@@ -55,8 +55,11 @@ module.exports = function roomsHook (sails) {
             var socket_id = sails.sockets.getId(socket);
             var socket_id = sails.sockets.getId(socket);
 
 
             // append to socketRooms
             // append to socketRooms
-            socketRooms[socket_id] = socketRooms[socket_id] ? [socketRooms[socket_id],room]
-                                                            : [room];
+
+            if (!socketRooms[socket_id])
+              socketRooms[socket_id] = [room];
+            else
+              socketRooms[socket_id].push(room);
 
 
             // broadcast data
             // broadcast data
             sails.hooks.events.broadcastEvent(
             sails.hooks.events.broadcastEvent(