Merge pull request #488 from jamestalmage/utils-node-resolver

utils: add makeNodeResolver function.

Author: katowulf

src/FirebaseAuth.js

@@ -5,7 +5,7 @@
 
   // Define a service which provides user authentication and management.
   angular.module('firebase').factory('$firebaseAuth', [
-    '$q', '$log', function($q, $log) {
+    '$q', '$firebaseUtils', '$log', function($q, $firebaseUtils, $log) {
       // This factory returns an object containing the current authentication state of the client.
       // This service takes one argument:
       //
@@ -14,14 +14,15 @@
       // The returned object contains methods for authenticating clients, retrieving authentication
       // state, and managing users.
       return function(ref) {
-        var auth = new FirebaseAuth($q, $log, ref);
+        var auth = new FirebaseAuth($q, $firebaseUtils, $log, ref);
         return auth.construct();
       };
     }
   ]);
 
-  FirebaseAuth = function($q, $log, ref) {
+  FirebaseAuth = function($q, $firebaseUtils, $log, ref) {
     this._q = $q;
+    this._utils = $firebaseUtils;
     this._log = $log;
 
     if (typeof ref === 'string') {
@@ -63,20 +64,6 @@
     /********************/
     /*  Authentication  */
     /********************/
-    /**
-     * Common login completion handler for all authentication methods.
-     *
-     * @param {Promise} deferred A deferred promise which is either resolved or rejected.
-     * @param {Error|null} error A Firebase error if authentication fails.
-     * @param {Object|null} authData The authentication state upon successful authentication.
-     */
-    _onLoginHandler: function(deferred, error, authData) {
-      if (error !== null) {
-        deferred.reject(error);
-      } else {
-        deferred.resolve(authData);
-      }
-    },
 
     /**
      * Authenticates the Firebase reference with a custom authentication token.
@@ -91,7 +78,7 @@
     authWithCustomToken: function(authToken, options) {
       var deferred = this._q.defer();
 
-      this._ref.authWithCustomToken(authToken, this._onLoginHandler.bind(this, deferred), options);
+      this._ref.authWithCustomToken(authToken, this._utils.makeNodeResolver(deferred), options);
 
       return deferred.promise;
     },
@@ -106,7 +93,7 @@
     authAnonymously: function(options) {
       var deferred = this._q.defer();
 
-      this._ref.authAnonymously(this._onLoginHandler.bind(this, deferred), options);
+      this._ref.authAnonymously(this._utils.makeNodeResolver(deferred), options);
 
       return deferred.promise;
     },
@@ -123,7 +110,7 @@
     authWithPassword: function(credentials, options) {
       var deferred = this._q.defer();
 
-      this._ref.authWithPassword(credentials, this._onLoginHandler.bind(this, deferred), options);
+      this._ref.authWithPassword(credentials, this._utils.makeNodeResolver(deferred), options);
 
       return deferred.promise;
     },
@@ -140,7 +127,7 @@
     authWithOAuthPopup: function(provider, options) {
       var deferred = this._q.defer();
 
-      this._ref.authWithOAuthPopup(provider, this._onLoginHandler.bind(this, deferred), options);
+      this._ref.authWithOAuthPopup(provider, this._utils.makeNodeResolver(deferred), options);
 
       return deferred.promise;
     },
@@ -157,7 +144,7 @@
     authWithOAuthRedirect: function(provider, options) {
       var deferred = this._q.defer();
 
-      this._ref.authWithOAuthRedirect(provider, this._onLoginHandler.bind(this, deferred), options);
+      this._ref.authWithOAuthRedirect(provider, this._utils.makeNodeResolver(deferred), options);
 
       return deferred.promise;
     },
@@ -176,7 +163,7 @@
     authWithOAuthToken: function(provider, credentials, options) {
       var deferred = this._q.defer();
 
-      this._ref.authWithOAuthToken(provider, credentials, this._onLoginHandler.bind(this, deferred), options);
+      this._ref.authWithOAuthToken(provider, credentials, this._utils.makeNodeResolver(deferred), options);
 
       return deferred.promise;
     },
@@ -307,13 +294,7 @@
         };
       }
 
-      this._ref.createUser(credentials, function(error) {
-        if (error !== null) {
-          deferred.reject(error);
-        } else {
-          deferred.resolve(user);
-        }
-      });
+      this._ref.createUser(credentials, this._utils.makeNodeResolver(deferred));
 
       return deferred.promise;
     },
@@ -343,13 +324,7 @@
         };
       }
 
-      this._ref.changePassword(credentials, function(error) {
-        if (error !== null) {
-          deferred.reject(error);
-        } else {
-          deferred.resolve();
-        }
-      });
+      this._ref.changePassword(credentials, this._utils.makeNodeResolver(deferred));
 
       return deferred.promise;
     },
@@ -376,13 +351,7 @@
         };
       }
 
-      this._ref.removeUser(credentials, function(error) {
-        if (error !== null) {
-          deferred.reject(error);
-        } else {
-          deferred.resolve();
-        }
-      });
+      this._ref.removeUser(credentials, this._utils.makeNodeResolver(deferred));
 
       return deferred.promise;
     },
@@ -420,13 +389,7 @@
         };
       }
 
-      this._ref.resetPassword(credentials, function(error) {
-        if (error !== null) {
-          deferred.reject(error);
-        } else {
-          deferred.resolve();
-        }
-      });
+      this._ref.resetPassword(credentials, this._utils.makeNodeResolver(deferred));
 
       return deferred.promise;
     }

src/utils.js

@@ -236,6 +236,20 @@
             return def.promise;
           },
 
+          makeNodeResolver:function(deferred){
+            return function(err,result){
+              if(err === null){
+                if(arguments.length > 2){
+                  result = Array.prototype.slice.call(arguments,1);
+                }
+                deferred.resolve(result);
+              }
+              else {
+                deferred.reject(err);
+              }
+            };
+          },
+
           wait: function(fn, wait) {
             var to = $timeout(fn, wait||0);
             return function() {

tests/unit/utils.spec.js

@@ -217,4 +217,40 @@ describe('$firebaseUtils', function () {
     });
   });
 
+  describe('#makeNodeResolver', function(){
+    var deferred, callback;
+    beforeEach(function(){
+      deferred = jasmine.createSpyObj('promise',['resolve','reject']);
+      callback = $utils.makeNodeResolver(deferred);
+    });
+
+    it('should return a function', function(){
+      expect(callback).toBeA('function');
+    });
+
+    it('should reject the promise if the first argument is truthy', function(){
+      var error = new Error('blah');
+      callback(error);
+      expect(deferred.reject).toHaveBeenCalledWith(error);
+    });
+
+    it('should reject the promise if the first argument is not null', function(){
+      callback(false);
+      expect(deferred.reject).toHaveBeenCalledWith(false);
+    });
+
+    it('should aggregate multiple args into an array', function(){
+      var result1 = {data:'hello world!'};
+      var result2 = {data:'howdy!'};
+      callback(null,result1,result2);
+      expect(deferred.resolve).toHaveBeenCalledWith([result1,result2]);
+    });
+
+    it('should resolve the promise if the first argument is falsy', function(){
+      var result = {data:'hello world'};
+      callback(null,result);
+      expect(deferred.resolve).toHaveBeenCalledWith(result);
+    });
+  });
+
 });