Merge pull request #2319 from ether/fix-socket-admin-etc

Fixing admin issues due to socket upgrade

src/node/hooks/express/adminplugins.js

@@ -14,7 +14,6 @@ exports.expressCreateServer = function (hook_name, args, cb) {
       search_results: {},
       errors: [],
     };
-
     res.send( eejs.require("ep_etherpad-lite/templates/admin/plugins.html", render_args) );
   });
   args.app.get('/admin/plugins/info', function(req, res) {
@@ -25,7 +24,8 @@ exports.expressCreateServer = function (hook_name, args, cb) {
 exports.socketio = function (hook_name, args, cb) {
   var io = args.io.of("/pluginfw/installer");
   io.on('connection', function (socket) {
-    if (!socket.handshake.session.user || !socket.handshake.session.user.is_admin) return;
+
+    if (!socket.conn.request.session || !socket.conn.request.session.user || !socket.conn.request.session.user.is_admin) return;
 
     socket.on("getInstalled", function (query) {
       // send currently installed plugins

src/node/hooks/express/adminsettings.js

@@ -22,7 +22,8 @@ exports.expressCreateServer = function (hook_name, args, cb) {
 exports.socketio = function (hook_name, args, cb) {
   var io = args.io.of("/settings");
   io.on('connection', function (socket) {
-    if (!socket.handshake.session.user || !socket.handshake.session.user.is_admin) return;
+
+    if (!socket.conn.request.session || !socket.conn.request.session.user || !socket.conn.request.session.user.is_admin) return;
 
     socket.on("load", function (query) {
       fs.readFile('settings.json', 'utf8', function (err,data) {

src/static/js/admin/plugins.js

@@ -10,7 +10,8 @@ $(document).ready(function () {
     resource = baseURL.substring(1) + "socket.io";
 
   //connect
-  socket = io.connect(url, {resource : resource}).of("/pluginfw/installer");
+  var room = url + "pluginfw/installer";
+  socket = io.connect(room, {resource : resource});
 
   function search(searchTerm, limit) {
     if(search.searchTerm != searchTerm) {

src/static/js/admin/settings.js

@@ -9,7 +9,8 @@ $(document).ready(function () {
     resource = baseURL.substring(1) + "socket.io";
 
   //connect
-  socket = io.connect(url, {resource : resource}).of("/settings");
+  var room = url + "settings";
+  socket = io.connect(room, {resource : resource});
 
   socket.on('settings', function (settings) {