fix: UI-Login

salisbuk7897 · salisbuk7897 · commit c8fb09d20aa1 · 2022-09-09T12:25:46.000+01:00
Fixed the user Login and Update password page. First time users can login using Admin/Admin and then change password and username.

Signed-off-by: Salisu Ali &lt;salisbuk7897@gmail.com&gt;
diff --git a/Documentation/User Documentation/8. Login.md b/Documentation/User Documentation/8. Login.md
@@ -0,0 +1,11 @@
+## First Time Login
+When Login for the very first time, The default Login is ```Admin/Admin```. This login credentials cannot be used to make modifications in ZEBRA, so The user will automatically be redirected to UPDATE Password page.  
+    
+## Update Password
+The user will need to Update his password using this page. As for user name, The user can choose any username of his choice. The user is also expected to provide access token and refresh token secrets of his choice.
+    
+## Restart ZEBRA
+The user will need to restart ZEBRA before the new login credentials can be used
+   
+## Error
+This error occurs when ZEBRA redirects user to /undefined. This happens when ZEBRA cannot find the redirect URL after login. The user can simply go back to the homepage and try login in again. 
diff --git a/src/Auth.js b/src/Auth.js
@@ -7,34 +7,6 @@ let dbrefresh = nedb.dbrefresh;
 var fs = require('fs'); //importing the fs module
 //var Zconfig = require("./config/");
 
-/*function parameters(fn){
-    parms = {
-      ddsbaseurl: Zconfig.ddsbaseurl,
-      ddsbaseport: Zconfig.ddsbaseport,
-      rmf3filename: Zconfig.rmf3filename,
-      rmfppfilename: Zconfig.rmfppfilename,
-      mvsResource: Zconfig.mvsResource,
-      mongourl: Zconfig.mongourl,
-      dbinterval: Zconfig.dbinterval,
-      dbname: Zconfig.dbname,
-      appurl: Zconfig.appurl,
-      appport: Zconfig.appport,
-      mongoport: Zconfig.mongoport,
-      ppminutesInterval: Zconfig.ppminutesInterval,
-      rmf3interval: Zconfig.rmf3interval,
-      httptype: Zconfig.httptype,
-      useDbAuth: Zconfig.useDbAuth,
-      dbUser: Zconfig.dbUser,
-      dbPassword: Zconfig.dbPassword,
-      authSource: Zconfig.authSource,
-      useMongo: Zconfig.useMongo,
-      usePrometheus: Zconfig.usePrometheus,
-      https: Zconfig.https,
-      grafanaurl: Zconfig.grafanaurl,
-      grafanaport: Zconfig.grafanaport
-    }
-    fn(parms);
-}*/
 
 //Update Password REST API
 module.exports.updatePassword = async function(req, res){
@@ -52,7 +24,7 @@ module.exports.updatePassword = async function(req, res){
                     const Salt = bcrypt.genSaltSync()
                     const hashedpassword = bcrypt.hashSync(newpassword, Salt)
                     //const user = {name: data.name, password: hashedpassword}
-                    db.update({ password: user.password }, {$set: { password: hashedpassword}}, {}, function (err, numReplaced) {
+                    db.update({ name: user.password }, {$set: { password: hashedpassword}}, {}, function (err, numReplaced) {
                         if(err){
                             res.status(201).send("Error");
                         } else {
@@ -284,7 +256,13 @@ function wenv(act, rft, fn){ //write to .env file
 //Update Paasword Form
 module.exports.updatePasswordForm = async function(req, res){
     db.find({ }, async function (err, users) {
-        const user = users.find(user => user.name == req.body.name)
+        var user = null;
+        if(req.body.name != "Admin"){
+            user = users.find(user => user.name == "Admin")
+        }
+        if(user == null){
+            user = users.find(user => user.name == req.body.name)
+        }
         username = req.body.name;
         oldpassword  = 'Admin';
         newpassword = req.body.newpassword;
@@ -301,7 +279,7 @@ module.exports.updatePasswordForm = async function(req, res){
                     //Update ENV here
                     wenv(req.body.act, req.body.rft, function(data){
                         if(data === "Success"){
-                            db.update({ password: user.password }, {$set: { password: hashedpassword}}, {}, function (err, numReplaced) {
+                            db.update({ name: user.name }, {$set: { password: hashedpassword, name:req.body.name}}, {}, function (err, numReplaced) {
                                 if(err){
                                     res.render("login", {data: "pwd"})
                                 } else {
