Merge pull request #867 from Meloman-zz/fix-usersfile

Fix Users File field not being persisted in OPC UA Server node config… relative to issue #848

Author: mikakaraila

opcua/104-opcuaserver.html

@@ -24,7 +24,7 @@
             port: {value: "53880", required: true},
             name: {value:""},
             endpoint: {value: ""},
-            users: {value: "users.json"},
+            usersFile: {value: "users.json"},
             nodesetDir: {value: ""},
             autoAcceptUnknownCertificate: {value: true},
             registerToDiscovery: {value: false},
@@ -83,8 +83,8 @@
         <input type="text" id="node-input-endpoint" placeholder="UA/SimpleNodeRedServer">
     </div>
     <div class="form-row">
-        <label for="node-input-users"><i class="icon-tasks"></i> Users file</label>
-        <input type="text" id="node-input-users" placeholder="users.json">
+        <label for="node-input-usersFile"><i class="icon-tasks"></i> Users file</label>
+        <input type="text" id="node-input-usersFile" placeholder="users.json">
     </div>
     <div class="form-row">
         <label for="node-input-nodesetDir"><i class="icon-tasks"></i> Custom nodeset directory</label>

opcua/104-opcuaserver.js

@@ -38,7 +38,7 @@
         this.name = n.name;
         this.port = n.port;
         this.endpoint = n.endpoint;
-        this.users = n.users;
+        this.usersFile = n.usersFile;
         this.nodesetDir = n.nodesetDir;
         this.autoAcceptUnknownCertificate = n.autoAcceptUnknownCertificate;
         this.allowAnonymous = n.allowAnonymous;
@@ -98,33 +98,33 @@
         let users = [{ username: "", password: "", roles: "" }]; // Empty as default
         let savedAddressSpace = "";
 
-        if (node.users && node.users.length > 0) {
-            verbose_log(chalk.yellow("Trying to load default users from file: ") + chalk.cyan(node.users) + chalk.yellow(" folder: ") + chalk.cyan(__dirname));
-            if (fs.existsSync(node.users)) {
-                users = JSON.parse(fs.readFileSync(node.users));
+        if (node.usersFile && node.usersFile.length > 0) {
+            verbose_log(chalk.yellow("Trying to load default users from file: ") + chalk.cyan(node.usersFile) + chalk.yellow(" folder: ") + chalk.cyan(__dirname));
+            if (fs.existsSync(node.usersFile)) {
+                users = JSON.parse(fs.readFileSync(node.usersFile, "utf8"));
                 verbose_log(chalk.green("Loaded users: ") + chalk.cyan(JSON.stringify(users)));
-                setUsers(users);
+                setUsers();
             }
             else {
                 // Current working directory
-                let fileName = path.join(process.cwd(), node.users);
-                verbose_log(chalk.yellow("Trying to load default users from file: ") + chalk.cyan(node.users) + chalk.yellow(" folder: ") + chalk.cyan(fileName));
+                let fileName = path.join(process.cwd(), node.usersFile);
+                verbose_log(chalk.yellow("Trying to load default users from file: ") + chalk.cyan(node.usersFile) + chalk.yellow(" folder: ") + chalk.cyan(fileName));
                 if (fs.existsSync(fileName)) {
-                    users = JSON.parse(fs.readFileSync(fileName));
+                    users = JSON.parse(fs.readFileSync(fileName, "utf8"));
                     verbose_log(chalk.green("Loaded users: ") + chalk.cyan(JSON.stringify(users)));
-                    setUsers(users);
+                    setUsers();
                 }
                 else {
-                    let fileName = path.join(process.cwd(), ".node-red", node.users);
-                    verbose_log(chalk.yellow("Trying to load default users from file: ") + chalk.cyan(node.users) + chalk.yellow(" folder: ") + chalk.cyan(fileName));
+                    let fileName = path.join(process.cwd(), ".node-red", node.usersFile);
+                    verbose_log(chalk.yellow("Trying to load default users from file: ") + chalk.cyan(node.usersFile) + chalk.yellow(" folder: ") + chalk.cyan(fileName));
                     if (fs.existsSync(fileName)) {
-                        users = JSON.parse(fs.readFileSync(fileName));
+                        users = JSON.parse(fs.readFileSync(fileName, "utf8"));
                         verbose_log(chalk.green("Loaded users: ") + chalk.cyan(JSON.stringify(users)));
-                        setUsers(users);
+                        setUsers();
                     }
                     else {
-                        verbose_log(chalk.red("File: " + node.users + " not found! You can inject users to server or add file to folder: " + fileName));
-                        node.error("File: " + node.users + " not found! You can inject users to server or add file to folder: " + fileName);
+                        verbose_log(chalk.red("File: " + node.usersFile + " not found! You can inject users to server or add file to folder: " + fileName));
+                        node.error("File: " + node.usersFile + " not found! You can inject users to server or add file to folder: " + fileName);
                     }
                 }
             }