Meteor.methods and api changes (#122)

* issue 32 fixed

* removed swp

* fixed nconf issues

* issue 82, 84 fixes

* fixed #82

* isse #77

* fixed tests

* fixed files

* fixed tests master

* fixed comment

* moved validator

* removed duplicate file

* fixed tests, removed duplicate underscore, publish

* changes

* fixed methods.ts import

* fixed issues w methods

* fixes

* minor fixes

* A

* api changes

Author: cemersoz

server/imports/api/lab.env.js

@@ -2,7 +2,7 @@
 var dockerode = require('dockerode');
 // Import other libraries
 var async = require('async');
-var underscore = require('underscore');
+var etcd = require('node-etcd');
 var nconf = require('nconf');
 
 /* constructor
@@ -370,7 +370,7 @@ env.prototype.shell = function(vmName,command,opts) {
  */
 env.prototype.getPass = function(vmName,callback){
   this.shell1(vmName, "cat /pass")
-    .then(function(sOut){ callback(sOut); }, function(s1,s2,s3){callback(s1,s2,s3);});
+    .then(function(sOut){ callback(null,null,sOut); }, function(s1,s2,s3){callback(s1,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.d.ts

@@ -0,0 +1,13 @@
+namespace lab_exec {
+  interface labExec{
+    var env : any;
+    var tuxlab : any;
+    function init(user : string, labId : number, callback : any)
+    function parseTasks() : any
+    function start(callback : any) : any
+    function next(callback : any) : any
+    function end(callback : any) : any
+    
+  }
+  function labExec() : any
+}

server/imports/api/lab.session.js

@@ -15,8 +15,8 @@ session.prototype.init = function(user,labId,callback){
   this.env.setUser(user);
 
   // Get Metadata from Database
-  var lab = Collections.labs.findOne({_id: lab_id}, {fields: {'file' : 0}}).fetch();
-  if(lab.length < 0){
+  var lab = Collections.labs.findOne({_id: labId}, {fields: {'file' : 0}});
+  if(!lab || lab.length < 0){
     callback(new Error("Lab Not Found.", null));
   }
   else{

server/imports/lab/methods.ts

@@ -5,8 +5,24 @@ Meteor.methods({
    * callback: (err,parseTasks,labExec)
    */
   'prepareLab': function(labId : number,callback : any){
-     var lab = require('../api/lab.session.js');
+     var session = require('../api/lab.session.js');
      var uId = Meteor.userId();
+     session.init(uId,labId,function(err,res){
+       session.env.getPass(function(err1,err2,pass){
+         if(err1){
+	   TuxLog.log("debug","error getting pass from labVm container: "+err1);
+	   callback("Internal Service Error",null);
+	 }
+	 else if(err2){
+	   TuxLog.log("debug","error getting pass from labVm container: "+err2);
+	   callback("Internal Service Error",null);
+	 }
+	 else{
+           var resolve = {'pass': pass}
+	   callback(null,resolve);
+	 }
+       });
+     });
      return uId;
      /**lab.init(userId,labId,cb)
       * cb(err,parsedTasks) cache session in cb, get rid of parsedTasks if unnecessary