method implementations (#127)

* 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

* fixed api

* comments

* minor changes

* minor fixes

* method implementations

Author: cemersoz

collections/labs.ts

@@ -6,7 +6,6 @@ declare var _ : any;
 var _ = require('underscore');
 
 declare var validateLab : any;
-var validateLab : any = require('../server/imports/lab/checkLab');
 
 export const labs : any = new Mongo.Collection('labs');
 
@@ -99,6 +98,7 @@ labs.allow({
 
 /* LAB VALIDATOR */
   if(Meteor.isServer){
+  var valdateLab : any = require('../server/imports/lab/checkLab.js');
     Meteor.startup(function(){
       var LabValidator = function(userid, doc, fieldNames?, modifier?, options?){
         if (typeof fieldNames === "undefined"){

server/imports/lab/checkLab.d.ts

@@ -1,3 +1,3 @@
 declare module "validateLab" {
-  export function validateLab(str: string): boolean
+  export function validateLab(str: string): any
 }

server/imports/lab/checkLab.js

@@ -4,7 +4,7 @@ var tuxOrig = require('./lab.js');
 
 /// <reference path="./checkLab.d.ts" />
 module.exports = function(str){
-  if(!str) { return false; } //check for file import
+  if(!str) { return null; } //check for file import
   var tux = eval(str);
   if(((typeof tux != "undefined") && 
       (typeof tux.setup === 'function') &&  //check for instructor field types
@@ -17,4 +17,5 @@ module.exports = function(str){
   else{
     return tux.titleList;
   }
+  return null;
 }

server/imports/lab/methods.ts

@@ -24,14 +24,14 @@ Meteor.methods({
     var uId = Meteor.userId();
     SessionCache.get(uId,labId,function(err,res){
       if(err || !res){
-        console.log("Internal Service Error");
+        callback("Internal Service Error",null);
       }
       else{
-      
+        res.next(callback);     
       }
     });
   },
-  'endLab': function(callback : any){
+  'endLab': function(labId : string, callback : any){
     /**session.end(cb)
      * cb(err,res)
      * call endLab callback(err,res) in cb
@@ -40,5 +40,14 @@ Meteor.methods({
      * session.env.removeVm removes virtual machines.
      * remove all vms and deleterecords after lab is completed for good. -highly optional
      */
+    var uId = Meteor.userId();
+    SessionCache.get(uId,labId,function(err,res){
+      if(err || !res){
+        callback("Internal Service Error",null);
+      }
+      else{
+        res.end(callback);
+      }
+    });
   }
 });