fix(#25): Resolve promise immediately in case user is already logged in (#29)

Author: DAB0mB

src/angular-meteor-auth.js

@@ -57,6 +57,15 @@ function($Mixer, $log) {
 
     const deferred = this.$$defer();
 
+    // If user is already logged in resolve the promise immediately to prevent an
+    // unnecessary computation
+    if (this.currentUser) {
+      deferred.resolve(this.currentUser);
+      // Keep the schema of the promise consistent
+      deferred.promise.stop = angular.noop;
+      return deferred.promise;
+    }
+
     // Note the promise is being fulfilled in the next event loop to avoid
     // nested computations, otherwise the outer computation will cancel the
     // inner one once the scope has been destroyed which will lead to subscription
@@ -84,9 +93,8 @@ function($Mixer, $log) {
       return this.$$afterFlush(deferred.reject, error);
     });
 
-    const promise = deferred.promise;
-    promise.stop = computation.stop.bind(computation);
-    return promise;
+    deferred.promise.stop = computation.stop.bind(computation);
+    return deferred.promise;
   };
 
   // Calls a function with the provided args after flush

tests/integration/auth.spec.js

@@ -193,6 +193,19 @@ describe('angular-meteor.auth', function() {
           scope.$$afterFlush('$$throttledDigest');
         });
       });
+
+      it('should resolve promise immediately if user is already logged in', function(done) {
+        Accounts.login('tempUser').onEnd(function() {
+          var spy = jasmine.createSpy().and.returnValue(true);
+
+          scope.$awaitUser(spy).then(function(user) {
+            expect(user.username).toEqual('tempUser');
+            done()
+          });
+
+          scope.$$throttledDigest();
+        });
+      });
     });
 
     describe('$waitForUser()', function() {