@iobroker/socket-classes 0.4.0 → 0.4.3

package/README.md

@@ -69,6 +69,15 @@ io.close();
 -->
 
 ## Changelog
+### 0.4.3 (2022-06-03)
+* (bluefox) Allowed call of getAdapterInstances for non admin
+
+### 0.4.2 (2022-05-23)
+* (bluefox) Corrected renameFile command for admin
+
+### 0.4.1 (2022-05-23)
+* (bluefox) Corrected changePassword command for admin
+
 ### 0.4.0 (2022-05-19)
 * (bluefox) Added support of socket.io 4.x
 

package/lib/socketCommands.js

@@ -800,7 +800,7 @@ class SocketCommands {
 
         this.commands['renameFile'] = (socket, _adapter, oldName, newName, callback) => {
             if (this._checkPermissions(socket, 'rename', callback, oldName)) {
-                this.adapter._rename(_adapter, oldName, newName, {user: socket._acl.user}, (err, ...args) =>
+                this.adapter.rename(_adapter, oldName, newName, {user: socket._acl.user}, (err, ...args) =>
                     SocketCommands._fixCallback(callback, err, ...args));
             }
         };
@@ -875,6 +875,35 @@ class SocketCommands {
         this.commands['subscribeFiles'] = (socket, id, pattern, callback) => this._subscribeFiles(socket, id, pattern, callback);
 
         this.commands['unsubscribeFiles'] = (socket, id, pattern, callback) => this._unsubscribeFiles(socket, id, pattern, callback);
+
+        this.commands['getAdapterInstances'] = (socket, adapterName, callback) => {
+            if (typeof callback === 'function') {
+                if (this._checkPermissions(socket, 'getObject', callback)) {
+                    let _adapterName = adapterName || this.adapterName || '';
+                    if (_adapterName) {
+                        _adapterName += '.'
+                    }
+                    this.adapter.getObjectView('system', 'instance',
+                        {startkey: `system.adapter.${_adapterName}`, endkey: `system.adapter.${_adapterName}\u9999`},
+                        (err, doc) => {
+                            if (err) {
+                                callback(err);
+                            } else {
+                                callback(null, doc.rows
+                                    .map(item => {
+                                        const obj = item.value;
+                                        if (obj.common) {
+                                            delete obj.common.news;
+                                        }
+                                        this._fixAdminUI(obj);
+                                        return obj;
+                                    })
+                                    .filter(obj => obj && (!adapterName || (obj.common && obj.common.name === adapterName))));
+                            }
+                        });
+                }
+            }
+        };
     }
 
     __initCommandsStates() {

package/lib/socketCommandsAdmin.js

@@ -568,11 +568,9 @@ class SocketCommandsAdmin extends SocketCommands {
             }
         };
         this.commands['changePassword'] = (socket, user, pass, callback) => {
-            if (this.__updateSession(socket)) {
-                if (user === socket._acl.user || this._checkPermissions(socket, 'changePassword', callback, user)) {
-                    this.adapter.setPassword(user, pass, {user: socket._acl.user}, (err, ...args) =>
-                        SocketCommands._fixCallback(callback, err, ...args));
-                }
+            if (user === socket._acl.user || this._checkPermissions(socket, 'changePassword', callback, user)) {
+                this.adapter.setPassword(user, pass, {user: socket._acl.user}, (err, ...args) =>
+                    SocketCommands._fixCallback(callback, err, ...args));
             }
         };
     }
@@ -832,35 +830,6 @@ class SocketCommandsAdmin extends SocketCommands {
             }
         };
 
-        this.commands['getAdapterInstances'] = (socket, adapterName, callback) => {
-            if (typeof callback === 'function') {
-                if (this._checkPermissions(socket, 'getObject', callback)) {
-                    let _adapterName = adapterName || this.adapterName || '';
-                    if (_adapterName) {
-                        _adapterName += '.'
-                    }
-                    this.adapter.getObjectView('system', 'instance',
-                        {startkey: `system.adapter.${_adapterName}`, endkey: `system.adapter.${_adapterName}\u9999`},
-                        (err, doc) => {
-                            if (err) {
-                                callback(err);
-                            } else {
-                                callback(null, doc.rows
-                                    .map(item => {
-                                        const obj = item.value;
-                                        if (obj.common) {
-                                            delete obj.common.news;
-                                        }
-                                        this._fixAdminUI(obj);
-                                        return obj;
-                                    })
-                                    .filter(obj => obj && (!adapterName || (obj.common && obj.common.name === adapterName))));
-                            }
-                        });
-                }
-            }
-        };
-
         this.commands['getAdapters'] = (socket, adapterName, callback) => {
             if (typeof callback === 'function' && this._checkPermissions(socket, 'getObject', callback)) {
                 this.adapter.getObjectView('system', 'adapter',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/socket-classes",
-  "version": "0.4.0",
+  "version": "0.4.3",
   "description": "ioBroker server-side web sockets",
   "author": {
     "name": "bluefox",