#76 further changes for REST support

joola · May 9, 2014 · 5812992 · 5812992
1 parent 2d5769e
commit 5812992
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/bin/joola.io.js b/bin/joola.io.js
@@ -77,7 +77,7 @@ Object.defineProperty(joolaio, 'APITOKEN', {
 
     joolaio.dispatch.users.verifyAPIToken(joolaio.APITOKEN, function (err, user) {
       joolaio.USER = user;
-      joolaio.TOKEN = user.token._;
+      //joolaio.TOKEN = user.token._;
     });
   }
 });
@@ -237,9 +237,8 @@ joolaio.init = function (options, callback) {
 
         joolaio.dispatch.users.verifyAPIToken(joolaio._apitoken, function (err, user) {
           joolaio.USER = user;
-          joolaio.TOKEN = user.token._;
-
           joolaio.events.emit('core.init.finish');
+          joolaio.events.emit('ready');
           if (typeof callback === 'function')
             return callback(null, joolaio);
         });
@@ -289,9 +288,9 @@ joolaio.set = function (key, value, callback) {
         return callback(new Error('Failed to verify API Token'));
 
       joolaio.USER = user;
-      joolaio.TOKEN = user.token._;
-      if (typeof callback === 'function')
+      if (typeof callback === 'function'){
         return callback(null);
+      }
     });
   }
   else if (key === 'token') {
@@ -1050,7 +1049,8 @@ api.getJSON = function (options, objOptions, callback) {
 
     var routeID = options.path + '-' + joolaio.common.uuid();
 
-    objOptions._token = joolaio.TOKEN;
+    if (joolaio.TOKEN)
+      objOptions._token = joolaio.TOKEN;
     if (!objOptions._token)
       objOptions.APIToken = joolaio.APITOKEN;
     objOptions._path = options.path;

diff --git a/bin/joola.io.min.js b/bin/joola.io.min.js
diff --git a/index.js b/index.js
@@ -75,7 +75,7 @@ Object.defineProperty(joolaio, 'APITOKEN', {
 
     joolaio.dispatch.users.verifyAPIToken(joolaio.APITOKEN, function (err, user) {
       joolaio.USER = user;
-      joolaio.TOKEN = user.token._;
+      //joolaio.TOKEN = user.token._;
     });
   }
 });
@@ -235,9 +235,8 @@ joolaio.init = function (options, callback) {
 
         joolaio.dispatch.users.verifyAPIToken(joolaio._apitoken, function (err, user) {
           joolaio.USER = user;
-          joolaio.TOKEN = user.token._;
-
           joolaio.events.emit('core.init.finish');
+          joolaio.events.emit('ready');
           if (typeof callback === 'function')
             return callback(null, joolaio);
         });
@@ -287,9 +286,9 @@ joolaio.set = function (key, value, callback) {
         return callback(new Error('Failed to verify API Token'));
 
       joolaio.USER = user;
-      joolaio.TOKEN = user.token._;
-      if (typeof callback === 'function')
+      if (typeof callback === 'function'){
         return callback(null);
+      }
     });
   }
   else if (key === 'token') {

diff --git a/lib/common/api.js b/lib/common/api.js
@@ -237,7 +237,8 @@ api.getJSON = function (options, objOptions, callback) {
 
     var routeID = options.path + '-' + joolaio.common.uuid();
 
-    objOptions._token = joolaio.TOKEN;
+    if (joolaio.TOKEN)
+      objOptions._token = joolaio.TOKEN;
     if (!objOptions._token)
       objOptions.APIToken = joolaio.APITOKEN;
     objOptions._path = options.path;