Merge branch 'requires-infra' of https://github.com/learnlinux/tuxlab-app into requires-infra

Author: DerekTBrown

server/imports/api/lab.env.js

@@ -370,7 +370,10 @@ env.prototype.shell = function(vmName,command,opts) {
  */
 env.prototype.getPass = function(vmName,callback){
   this.shell1(vmName, "cat /pass")
-    .then(function(sOut){ callback(null,null,sOut); }, function(s1,s2,s3){callback(s1,s2,s3);});
+    .then(function(sOut){ callback(null,sOut); }, function(s1,s2,s3){
+	    if(s1){ callback(s1,s3) }
+	    else{ callback(s2,s3) }
+    });
 }
 env.prototype.getNetwork = function() {}	//Don't know what this does
 env.prototype.getVolume = function() {}		//Don't know what this does

server/imports/api/lab.session.js

@@ -45,13 +45,13 @@ session.prototype.init = function(user,labId,callback){
         });
 
         slf.lab.taskNo = 0;
-        callback(null, lab.tasks);
+	slf.env.getPass(callback);
       }
       else{
         // Get LabFile from Cache
         slf.lab.taskNo = 0;
         slf.lab = value;
-        callback(null, lab.tasks);
+        slf.env.getPass(callback);
       }
     });
   }
@@ -125,4 +125,4 @@ session.prototype.end = function(callback){
                                      });
 }
 
-module.exports = new session();
+module.exports = session;

server/imports/lab/methods.ts

@@ -1,36 +1,18 @@
 declare var Collections : any;
 declare var TuxLog : any;
 
+var Session = require('../api/lab.session.js');
 Meteor.methods({
 
-  /** prepareLab: prepares a labExec object for the current user
-   *  takes the id of the lab and a callback as parameter
-   *  callback: (err,parseTasks,labExec)
+  /**prepareLab: prepares a labExec object for the current user
+   * takes the id of the lab and a callback as parameter
+   * callback: (err,pass)
+   * implement loading wheel, md fetch, course record create in callback
    */
-  'prepareLab' : function(labId : number, callback : any){
-     var session = require('../api/lab.session.js');
-     var userid = Meteor.userId();
-
-     /** session.init(userId,labId,cb)
-      * cb(err,parsedTasks) cache session in cb, get rid of parsedTasks if unnecessary
-      * implement loading wheel here -in callback
-      * session.env.getPass(cb) callback(pass) is called, call this here and then call the prepareLab callback
-      * what to put in res of callback(err,res)? session obj? true/false? session id?...
-      * get task md -frontend
-      * create course record
-      */
-     session.init(userid,labId,function(err,res){
-       session.env.getPass(function(err,pass){
-         if(err){
-      	   TuxLog.log("debug","error getting pass from labVm container: "+err);
-      	   callback("Internal Service Error",null);
-      	 }
-      	 else{
-           var resp = {'pass': pass}
-      	   callback(null, resp);
-      	 }
-       });
-     });
+  'prepareLab': function(labId : number, callback : any){
+     var session = Session();
+     var uId = Meteor.userId();
+     session.init(uId,labId,callback);
   },
   'startLab': function(callback : any){
     /** somehow get session,