added an abiulity to init SDK via QB.init(56655ac9a0eb476d92002b66, CREDENTIALS.appId)

Author: Igor Khomenko

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "homepage": "http://quickblox.com/developers/Javascript",
   "main": "quickblox.js",
   "license": "BSD",

js/qbConfig.js

@@ -6,7 +6,7 @@
  */
 
 var config = {
-  version: '1.17.0',
+  version: '1.17.1',
   creds: {
     appId: '',
     authKey: '',

js/qbMain.js

@@ -15,7 +15,7 @@ function QuickBlox() {}
 
 QuickBlox.prototype = {
 
-  init: function(appId, authKey, authSecret, configMap) {
+  init: function(appIdOrToken, authKeyOrAppId, authSecret, configMap) {
     if (configMap && typeof configMap === 'object') {
       config.set(configMap);
     }
@@ -51,11 +51,16 @@ QuickBlox.prototype = {
     this.data = new Data(this.service);
 
     // Initialization by outside token
-    if (typeof appId === 'string' && !authKey && !authSecret) {
-      this.service.setSession({ token: appId });
+    if (typeof appIdOrToken === 'string' && (!authKeyOrAppId || typeof authKeyOrAppId === 'number') && !authSecret) {
+
+      if(typeof authKeyOrAppId === 'number'){
+        config.creds.appId = authKeyOrAppId;
+      }
+
+      this.service.setSession({ token: appIdOrToken });
     } else {
-      config.creds.appId = appId;
-      config.creds.authKey = authKey;
+      config.creds.appId = appIdOrToken;
+      config.creds.authKey = authKeyOrAppId;
       config.creds.authSecret = authSecret;
     }
   },

package.json

@@ -1,7 +1,7 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "homepage": "http://quickblox.com/developers/Javascript",
   "main": "js/qbMain.js",
   "license": [

quickblox.min.js

@@ -3,9 +3,17 @@ var REST_REQUESTS_TIMEOUT = 3000;
 describe('Session API', function() {
 
 
-  // Load config
+  // can Init (simple)
   //
-  beforeAll(function (){
+  it('can init SDK with session token and appId', function(){
+    QB.init("56655ac9a0eb476d92002b66", CREDENTIALS.appId);
+
+    expect(QB.service.qbInst.config.creds.appId).toEqual(CREDENTIALS.appId);
+  });
+
+  // can Init
+  //
+  it('can init SDK with appId, authKey, authSecret, config', function(){
     QB.init(CREDENTIALS.appId, CREDENTIALS.authKey, CREDENTIALS.authSecret, CONFIG);
 
     expect(QB.service.qbInst.config.creds.appId).toEqual(CREDENTIALS.appId);
@@ -47,96 +55,45 @@ describe('Session API', function() {
   }, REST_REQUESTS_TIMEOUT);
 
 
-  // Destroy a session
-  //
-  it('can destroy a session', function(done){
-
-    QB.createSession(function (err, result){
-      if(err){
-        done.fail("Destroy session error1: " + JSON.stringify(err));
-      }else{
-        QB.destroySession(function (err, result){
-          if(err){
-            done.fail("Destroy session error2: " + JSON.stringify(err));
-          }else{
-            expect(QB.service.qbInst.session).toBeNull();
-            done()
-          }
-        });
-      }
-    });
-  }, REST_REQUESTS_TIMEOUT);
-
-
   // Login a user
   //
   it('can login a user', function(done){
-
-    QB.createSession(function (err, result){
+    QB.login(QBUser1, function (err, user){
       if(err){
-        done.fail("Login user error1: " + JSON.stringify(err));
+        done.fail("Login user error2: " + JSON.stringify(err));
       }else{
-        QB.login(QBUser1, function (err, user){
-          if(err){
-            done.fail("Login user error2: " + JSON.stringify(err));
-          }else{
-            expect(user).not.toBeNull();
-            expect(user.login).toEqual(QBUser1.login);
-            expect(user.id).toEqual(QBUser1.id);
-            done()
-          }
-        });
+        expect(user).not.toBeNull();
+        expect(user.login).toEqual(QBUser1.login);
+        expect(user.id).toEqual(QBUser1.id);
+        done()
       }
     });
   }, REST_REQUESTS_TIMEOUT);
 
 
-  // Login a user when initialised with just a valid token
+  // Logout a user
   //
-  it('can login a user when initialised with just a valid token', function(done){
-
-    QB.createSession(function (err, session){
+  it('can logout a user', function(done){
+    QB.logout(function(err, result){
       if(err){
-        done.fail("Login user when initialised with just a valid token error1: " + JSON.stringify(err));
+        done.fail("Logout user error3: " + JSON.stringify(err));
       }else{
-        QB.init(session.token);
-
-        QB.login(QBUser1, function (err, user){
-          if(err){
-            done.fail("Login user when initialised with just a valid token error2: " + JSON.stringify(err));
-          }else{
-            expect(user).not.toBeNull();
-            expect(user.login).toEqual(QBUser1.login);
-            expect(user.id).toEqual(QBUser1.id);
-            done();
-          }
-        });
+        expect(null).toBeNull(); // we just have to have some expectations.
+        done();
       }
     });
   }, REST_REQUESTS_TIMEOUT);
 
 
-  // Logout a user
+  // Destroy a session
   //
-  it('can logout a user', function(done){
-
-    QB.createSession(function (err, result){
+  it('can destroy a session', function(done){
+    QB.destroySession(function (err, result){
       if(err){
-        done.fail("Logout user error1: " + JSON.stringify(err));
+        done.fail("Destroy session error2: " + JSON.stringify(err));
       }else{
-        QB.login(QBUser1, function (err, user){
-          if(err){
-            done.fail("Logout user error2: " + JSON.stringify(err));
-          }else{
-            QB.logout(function(err, result){
-              if(err){
-                done.fail("Logout user error3: " + JSON.stringify(err));
-              }else{
-                done();
-              }
-            });
-          }
-        });
+        expect(QB.service.qbInst.session).toBeNull();
+        done()
       }
     });
   }, REST_REQUESTS_TIMEOUT);