fix: if user call enablePromises and pass stayLoggedIn flag to social login methods, the async callback will not be called (#27)

* fix: if user called enablePromises and pass stayLoggedIn flag to social login methods, the async callback will be not called

* fixed typescript definition according to change social login methods

* fix: revert functions signature, extract async cb from arguments

* refactor: order of arguments changed

* fixed typescript definition according to change

Author: Stanislaw

libs/backendless.d.ts

@@ -795,7 +795,7 @@ declare module __Backendless {
 
         loginWithFacebook(fields?:Object, permissions?:Object, async?:Backendless.Async, stayLoggedIn?:boolean):void;
 
-        loginWithGooglePlus(fields?:Object, permissions?:Object, async?:Backendless.Async, container?:HTMLElement, stayLoggedIn?:boolean):void;
+        loginWithGooglePlus(fields?:Object, permissions?:Object, container?:HTMLElement, async?:Backendless.Async, stayLoggedIn?:boolean):void;
 
         loginWithTwitter(fields?:Object, async?:Backendless.Async, stayLoggedIn?:boolean):void;
 

libs/backendless.js

@@ -1702,16 +1702,19 @@
             return isAsync ? result : this._parseResponse(result);
         },
 
-        loginWithFacebook      : function(facebookFieldsMapping, permissions, callback, stayLoggedIn) {
-            this._loginSocial('Facebook', facebookFieldsMapping, permissions, callback, null, stayLoggedIn);
+        loginWithFacebook      : function(facebookFieldsMapping, permissions, async, stayLoggedIn) {
+            async = extractResponder(arguments);
+            this._loginSocial('Facebook', facebookFieldsMapping, permissions, async, null, stayLoggedIn);
         },
 
-        loginWithGooglePlus    : function(googlePlusFieldsMapping, permissions, callback, container, stayLoggedIn) {
-            this._loginSocial('GooglePlus', googlePlusFieldsMapping, permissions, callback, container, stayLoggedIn);
+        loginWithGooglePlus    : function(googlePlusFieldsMapping, permissions, async, container, stayLoggedIn) {
+            async = extractResponder(arguments);
+            this._loginSocial('GooglePlus', googlePlusFieldsMapping, permissions, async, container, stayLoggedIn);
         },
 
-        loginWithTwitter       : function(twitterFieldsMapping, callback, stayLoggedIn) {
-            this._loginSocial('Twitter', twitterFieldsMapping, null, callback, null, stayLoggedIn);
+        loginWithTwitter       : function(twitterFieldsMapping, async, stayLoggedIn) {
+            async = extractResponder(arguments);
+            this._loginSocial('Twitter', twitterFieldsMapping, null, async, null, stayLoggedIn);
         },
 
         _socialContainer       : function(socialType, container) {
@@ -1772,23 +1775,20 @@
             }
         },
 
-        _loginSocial: function(socialType, fieldsMapping, permissions, callback, container, stayLoggedIn) {
+        _loginSocial: function(socialType, fieldsMapping, permissions, async, container, stayLoggedIn) {
             var socialContainer = new this._socialContainer(socialType, container);
-            var responder = extractResponder(arguments);
-            if (responder) {
-                responder = this._wrapAsync(responder);
-            }
+            async = async && this._wrapAsync(async);
 
             Utils.addEvent('message', window, function(e) {
                 if (e.origin == Backendless.serverURL) {
                     var result = JSON.parse(e.data);
 
                     if (result.fault) {
-                        responder.fault(result.fault);
+                        async.fault(result.fault);
                     } else {
                         Backendless.LocalCache.set("stayLoggedIn", !!stayLoggedIn);
                         currentUser = this.Backendless.UserService._parseResponse(result);
-                        responder.success(this.Backendless.UserService._getUserFromResponse(currentUser));
+                        async.success(this.Backendless.UserService._getUserFromResponse(currentUser));
                     }
 
                     Utils.removeEvent('message', window);
@@ -1800,7 +1800,7 @@
                 socialContainer.doAuthorizationActivity(r);
             }, function(e) {
                 socialContainer.closeContainer();
-                responder.fault(e);
+                async.fault(e);
             });
 
             var request = {};
@@ -4191,7 +4191,7 @@
                             lastFlushListeners = null;
                         }
                     }
-                }
+                };
 
                 if (async) {
                     listeners = lastFlushListeners = lastFlushListeners ? lastFlushListeners.splice(0) : [];
@@ -4348,7 +4348,7 @@
                              'getCategories', 'deleteCategory', 'deletePoint']],
             [UserService.prototype, ['register', 'getUserRoles', 'roleHelper', 'login', 'describeUserClass',
                                      'restorePassword', 'logout', 'update', 'isValidLogin', 'loginWithFacebookSdk',
-                                     'loginWithGooglePlusSdk','loginWithFacebook', 'loginWithGooglePlus', 'loginWithTwitter']]
+                                     'loginWithGooglePlusSdk', 'loginWithGooglePlus', 'loginWithTwitter', 'loginWithFacebook']]
         ].forEach(promisifyPack);
 
         UserService.prototype.getCurrentUser = function() {

tests/tsd.ts

@@ -353,31 +353,39 @@ function testUserService() {
     Backendless.UserService.loginWithFacebook({});
     Backendless.UserService.loginWithFacebook({}, {});
     Backendless.UserService.loginWithFacebook({}, {}, async);
-    Backendless.UserService.loginWithFacebook({}, null, async);
-    Backendless.UserService.loginWithFacebook(null, null, async);
-    Backendless.UserService.loginWithFacebook({}, {}, async, document.createElement('div'));
-    Backendless.UserService.loginWithFacebook({}, {}, null, document.createElement('div'));
+    Backendless.UserService.loginWithFacebook({}, {}, async, true);
+    Backendless.UserService.loginWithFacebook({}, {}, null, true);
+    Backendless.UserService.loginWithFacebook({}, null, null, true);
+    Backendless.UserService.loginWithFacebook(null, null, null, true);
 
     Backendless.UserService.loginWithGooglePlus();
     Backendless.UserService.loginWithGooglePlus({});
     Backendless.UserService.loginWithGooglePlus({}, {});
-    Backendless.UserService.loginWithGooglePlus({}, {}, async);
-    Backendless.UserService.loginWithGooglePlus({}, null, async);
-    Backendless.UserService.loginWithGooglePlus(null, null, async);
-    Backendless.UserService.loginWithGooglePlus({}, {}, async, document.createElement('div'));
-    Backendless.UserService.loginWithGooglePlus({}, {}, null, document.createElement('div'));
+    Backendless.UserService.loginWithGooglePlus({}, {}, document.createElement('div'));
+    Backendless.UserService.loginWithGooglePlus({}, {}, document.createElement('div'), async);
+    Backendless.UserService.loginWithGooglePlus({}, {}, document.createElement('div'), async, true);
+    Backendless.UserService.loginWithGooglePlus({}, {}, document.createElement('div'), null, true);
+    Backendless.UserService.loginWithGooglePlus({}, {}, null, null, true);
+    Backendless.UserService.loginWithGooglePlus({}, null, null, null, true);
+    Backendless.UserService.loginWithGooglePlus(null, null, null, null, true);
 
     Backendless.UserService.loginWithTwitter();
     Backendless.UserService.loginWithTwitter({}, async);
-    Backendless.UserService.loginWithTwitter(null, async);
+    Backendless.UserService.loginWithTwitter({}, async, true);
+    Backendless.UserService.loginWithTwitter({}, null, true);
+    Backendless.UserService.loginWithTwitter(null, null, true);
 
     Backendless.UserService.loginWithFacebookSdk();
-    Backendless.UserService.loginWithFacebookSdk({}, async);
-    Backendless.UserService.loginWithFacebookSdk(null, async);
+    Backendless.UserService.loginWithFacebookSdk({}, true);
+    Backendless.UserService.loginWithFacebookSdk({}, true, async);
+    Backendless.UserService.loginWithFacebookSdk({}, null, async);
+    Backendless.UserService.loginWithFacebookSdk(null, null, async);
 
     Backendless.UserService.loginWithGooglePlusSdk();
-    Backendless.UserService.loginWithGooglePlusSdk({}, async);
-    Backendless.UserService.loginWithGooglePlusSdk(null, async);
+    Backendless.UserService.loginWithGooglePlusSdk({}, true);
+    Backendless.UserService.loginWithGooglePlusSdk({}, true, async);
+    Backendless.UserService.loginWithGooglePlusSdk({}, null, async);
+    Backendless.UserService.loginWithGooglePlusSdk(null, null, async);
 
     bol = Backendless.UserService.isValidLogin();
     resultXHR = Backendless.UserService.isValidLogin(async);