Fixing user creation in master

controllers/admin.js

@@ -108,20 +108,33 @@ exports.new = (req, res) => {
                     if (err) {
                       console.log(err);
                       res.redirect('/');
-                    } else {
-                      // res.redirect('/admin/users');
-                      createUserCluster(uid, user, err => {
-                        if (err) {
-                          console.log(err);
-                          res.redirect('/');
-                        } else {
-                          res.redirect('/admin/users');
-                        }
-                      });
-                    }
+                    } else
+                      res.redirect('/admin/users');
                   });
                 }
               });
+              // createUserCluster(uid, user, err => {
+              //   if (err) {
+              //     console.log(err);
+              //     res.redirect('/');
+              //   } else {
+              //     console.log('CREATED');
+              //     User.update(
+              //       { username: id },
+              //       { state: user.state, uid: uid },
+              //       (err, data) => {
+              //         if (err)
+              //           console.log(err);
+              //         else {
+              //           sshKey(user, err => {
+              //             if (err) console.log(err);
+              //             else res.redirect('/admin/users');
+              //           });
+              //         }
+              //       }
+              //     );
+              //   }
+              // });
             }
           });
         }

helpers/user.js

@@ -95,36 +95,12 @@ exports.createUser = (uid, user, callback) => {
 
 exports.createUserCluster = (uid, username, callback) => {
   const { user, password, nodes } = config.cluster;
-  const path = `useradd -u ${uid} -g adm -g cdrom -g dip -g plugdev -g lpadmin -g sambashare -d /homeshare/${username.username} -s /bin/bash -m ${username.username}`;
-
-  const passPath = 'echo ' +
-    username.username +
-    ':' +
-    decrypt(username.linux) +
-    ' | sudo chpasswd';
-  let report = [];
 
   for (node in nodes) {
-    console.log(node);
-    let ssh = new SSH({
-      host: node,
-      user: node,
-      pass: password
-    });
-
-    ssh
-      .exec(path, {
-        err: stderr => {
-          if (err) {
-            console.log(node);
-            report.push(node);
-          }
-        }
-      })
-      .exec(pathKey, {})
-      .start();
+    console.log(nodes[node]);
   }
-  callback(report);
+
+  return callback(null);
 };
 
 exports.sshKey = (user, callback) => {
@@ -145,16 +121,22 @@ exports.sshKey = (user, callback) => {
         return callback(stderr);
       }
     })
+    .start();
+
+  ssh
     .exec(autKeys, {
       err: stderr => {
         console.log(stderr);
         return callback(stderr);
       }
     })
+    .start();
+
+  ssh
     .exec(`cat >> /homeshare/${user.username}/.bashrc`, {
       in: fs.readFileSync('./helpers/key')
     })
     .start();
 
-  return callback(null);
+  return callback();
 };