Change user pss

controllers/admin.js

@@ -77,7 +77,7 @@ exports.getUsers = (req, res) => {
   });
 };
 
-exports.newUser = (req, res) => {
+exports.new = (req, res) => {
   const id = req.params.id;
   console.log(id);
 
@@ -87,34 +87,46 @@ exports.newUser = (req, res) => {
     else {
       console.log(user);
       user.state = 2;
-      User.update({username: id}, {state: user.state}, (err, data) => {
-        if(err)
+      getLinuxId((err, uid) => {
+        if(err) {
           console.log(err);
-        else {
-          getLinuxId((err, uid) => {
-            const userPath = 'sudo adduser --home /homeshare/' +
-                            id + ' --uid ' +
-                            String(uid) + ' --ingroup adm --ingroup cdrom --ingroup dip --ingroup plugdev --ingroup lpadmin --ingroup sambashare ' + id;
-            console.log(userPath);
-            const passPath = 'echo ' + id + ':'+
-                              decrypt(user.linux) + ' | sudo chpasswd';
-            // console.log(passPath);
-            exec(userPath, (err, stdout, stderr) => {
-              if(err) {
-                console.log('Error in terminal');
-                console.log(err);
-              } else if(stderr) {
-                console.log(stderr);
-              } else {
-                console.log(stdout);
-              }
-            });
+          res.redirect('/admin/users/');
+        } else {
+          User.update({username: id}, {
+                                        state: user.state,
+                                        uid: uid,
+                                      }, (err, data) => {
+            if(err) {
+              console.log(err);
+              res.redirect('/admin/users/');
+            } else {
+              // getLinuxId((err, uid) => {
+              //   const userPath = 'sudo adduser --home /homeshare/' +
+              //                   id + ' --uid ' +
+              //                   String(uid) + ' --ingroup adm --ingroup cdrom --ingroup dip --ingroup plugdev --ingroup lpadmin --ingroup sambashare ' + id;
+              //   console.log(userPath);
+              //   const passPath = 'echo ' + id + ':'+
+              //                     decrypt(user.linux) + ' | sudo chpasswd';
+              //   // console.log(passPath);
+              //   exec(userPath, (err, stdout, stderr) => {
+              //     if(err) {
+              //       console.log('Error in terminal');
+              //       console.log(err);
+              //     } else if(stderr) {
+              //       console.log(stderr);
+              //     } else {
+              //       console.log(stdout);
+              //     }
+              //   });
+              // });
+            }
+            res.redirect('/');
           });
         }
       });
     }
   });
-  res.redirect('/admin/users/newPass/' + id);
+  // res.redirect('/admin/users/newPass/' + id);
 };
 
 exports.linuxPass = (req, res) => {

routes/admin.js

@@ -11,7 +11,8 @@ router.get('/users', (req, res) => {
 
 router.get('/users/:id', isLoggedIn, adminController.getUsers);
 // router.get('/users/linux', isLoggedIn, adminController.getUsersLinux);
-router.get('/users/new/:id', isLoggedIn, adminController.newUser);
+router.get('/users/new/:id', isLoggedIn, adminController.new);
+router.get('/users/newUser/:id', isLoggedIn, adminController.newUser);
 router.get('/users/newPass/:id', isLoggedIn, adminController.linuxPass);
 router.get('/users/active/:id', isLoggedIn, adminController.activeUser);
 router.get('/users/inactive/:id', isLoggedIn, adminController.inactiveUser);