Support asynchronous validators (#5)

If the validation function passed to $awaitUser returns a promise, the resolved value will be used to determine the user's validity.

Author: canac

src/angular-meteor-auth.js

@@ -17,8 +17,9 @@ angular.module(name, [
 .factory('$$Auth', [
   '$Mixer',
   '$log',
+  '$q',
 
-function($Mixer, $log) {
+function($Mixer, $log, $q) {
   const Accounts = (Package['accounts-base'] || {}).Accounts;
 
   if (!Accounts) {
@@ -77,20 +78,26 @@ function($Mixer, $log) {
 
       if (!this.currentUser) return this.$$afterFlush(deferred.reject, errors.required);
 
-      const isValid = validate(this.currentUser);
-      // Resolve the promise if validation has passed
-      if (isValid === true) return this.$$afterFlush(deferred.resolve, this.currentUser);
-
-      let error;
-
-      if (_.isString(isValid) || isValid instanceof Error) {
-        error = isValid;
-      }
-      else {
-        error = errors.forbidden;
-      }
-
-      return this.$$afterFlush(deferred.reject, error);
+      $q.when(validate(this.currentUser)).then(isValid => {
+        // Resolve the promise if validation has passed
+        if (isValid === true) {
+          this.$$afterFlush(deferred.resolve, this.currentUser);
+        }
+        else {
+          return $q.reject(isValid);
+        }
+      }).catch(isValid => {
+        let error;
+
+        if (_.isString(isValid) || isValid instanceof Error) {
+          error = isValid;
+        }
+        else {
+          error = errors.forbidden;
+        }
+
+        this.$$afterFlush(deferred.reject, error);
+      });
     });
 
     deferred.promise.stop = computation.stop.bind(computation);

tests/integration/auth.spec.js

@@ -4,10 +4,12 @@ describe('angular-meteor.auth', function() {
 
   var Accounts = Package['accounts-base'].Accounts;
   var $rootScope;
+  var $q;
   var $auth;
 
-  beforeEach(angular.mock.inject(function(_$rootScope_, _$auth_) {
+  beforeEach(angular.mock.inject(function(_$rootScope_, _$q_, _$auth_) {
     $rootScope = _$rootScope_;
+    $q = _$q_;
     $auth = _$auth_;
   }));
 
@@ -175,6 +177,82 @@ describe('angular-meteor.auth', function() {
         });
       });
 
+      it('should succeed if validation method asynchronously returns true', function(done) {
+        Accounts.login('tempUser', function() {
+          var spy = jasmine.createSpy().and.returnValue($q.resolve(true));
+
+          scope.$awaitUser(spy).then(function() {
+            expect(Tracker.Computation.prototype.stop).toHaveBeenCalled();
+            expect(spy).toHaveBeenCalled();
+            done();
+          });
+        }).onEnd(function() {
+          scope.$$afterFlush('$$throttledDigest');
+        });
+      });
+
+      it('should return a custom validation error if validation method asynchronously resolves to a string', function(done) {
+        Accounts.login('tempUser', function() {
+          var spy = jasmine.createSpy().and.returnValue($q.resolve('NOT_ALLOWED'));
+
+          scope.$awaitUser(spy).catch(function(err) {
+            expect(Tracker.Computation.prototype.stop).toHaveBeenCalled();
+            expect(spy).toHaveBeenCalled();
+            expect(err).toEqual('NOT_ALLOWED');
+            done();
+          });
+        }).onEnd(function() {
+          scope.$$afterFlush('$$throttledDigest');
+        });
+      });
+
+      it('should return a custom validation error if validation method asynchronously resolves to an error', function(done) {
+        Accounts.login('tempUser', function() {
+          var err = Error();
+          var spy = jasmine.createSpy().and.returnValue($q.resolve(err));
+
+          scope.$awaitUser(spy).catch(function(err) {
+            expect(Tracker.Computation.prototype.stop).toHaveBeenCalled();
+            expect(spy).toHaveBeenCalled();
+            expect(err).toEqual(err);
+            done();
+          });
+        }).onEnd(function() {
+          scope.$$afterFlush('$$throttledDigest');
+        });
+      });
+
+      it('should return a custom validation error if validation method asynchronously rejects to a string', function(done) {
+        Accounts.login('tempUser', function() {
+          var spy = jasmine.createSpy().and.returnValue($q.reject('NOT_ALLOWED'));
+
+          scope.$awaitUser(spy).catch(function(err) {
+            expect(Tracker.Computation.prototype.stop).toHaveBeenCalled();
+            expect(spy).toHaveBeenCalled();
+            expect(err).toEqual('NOT_ALLOWED');
+            done();
+          });
+        }).onEnd(function() {
+          scope.$$afterFlush('$$throttledDigest');
+        });
+      });
+
+      it('should return a custom validation error if validation method asynchronously rejects to an error', function(done) {
+        Accounts.login('tempUser', function() {
+          var err = Error();
+          var spy = jasmine.createSpy().and.returnValue($q.reject(err));
+
+          scope.$awaitUser(spy).catch(function(err) {
+            expect(Tracker.Computation.prototype.stop).toHaveBeenCalled();
+            expect(spy).toHaveBeenCalled();
+            expect(err).toEqual(err);
+            done();
+          });
+        }).onEnd(function() {
+          scope.$$afterFlush('$$throttledDigest');
+        });
+      });
+
       it('should not fulfill promise once auto computation has been stopped', function() {
         var promise = scope.$awaitUser();
         expect(Tracker.Computation.prototype.stop).toHaveBeenCalled();
@@ -301,4 +379,4 @@ describe('angular-meteor.auth', function() {
       });
     });
   });
-});
+});