Added in Meteor.loggingOut() and related Blaze helpers.

packages/accounts-base/accounts_client.js

@@ -14,8 +14,8 @@ export class AccountsClient extends AccountsCommon {
   constructor(options) {
     super(options);
 
-    this._loggingIn = false;
-    this._loggingInDeps = new Tracker.Dependency;
+    this._loggingIn = new ReactiveVar(false);
+    this._loggingOut = new ReactiveVar(false);
 
     this._loginServicesHandle =
       this.connection.subscribe("meteor.loginServiceConfiguration");
@@ -43,19 +43,23 @@ export class AccountsClient extends AccountsCommon {
   // also uses it to make loggingIn() be true during the beginPasswordExchange
   // method call too.
   _setLoggingIn(x) {
-    if (this._loggingIn !== x) {
-      this._loggingIn = x;
-      this._loggingInDeps.changed();
-    }
+    this._loggingIn.set(x);
   }
 
   /**
    * @summary True if a login method (such as `Meteor.loginWithPassword`, `Meteor.loginWithFacebook`, or `Accounts.createUser`) is currently in progress. A reactive data source.
    * @locus Client
    */
   loggingIn() {
-    this._loggingInDeps.depend();
-    return this._loggingIn;
+    return this._loggingIn.get();
+  }
+
+  /**
+   * @summary True if a logout method (such as `Meteor.logout`) is currently in progress. A reactive data source.
+   * @locus Client
+   */
+  loggingOut() {
+    return this._loggingOut.get();
   }
 
   /**
@@ -65,9 +69,11 @@ export class AccountsClient extends AccountsCommon {
    */
   logout(callback) {
     var self = this;
+    self._loggingOut.set(true);
     self.connection.apply('logout', [], {
       wait: true
     }, function (error, result) {
+      self._loggingOut.set(false);
       if (error) {
         callback && callback(error);
       } else {
@@ -138,6 +144,15 @@ Meteor.loggingIn = function () {
   return Accounts.loggingIn();
 };
 
+/**
+ * @summary True if a logout method (such as `Meteor.logout`) is currently in progress. A reactive data source.
+ * @locus Client
+ * @importFromPackage meteor
+ */
+Meteor.loggingOut = function () {
+  return Accounts.loggingOut();
+};
+
 ///
 /// LOGIN METHODS
 ///
@@ -438,4 +453,24 @@ if (Package.blaze) {
   Package.blaze.Blaze.Template.registerHelper('loggingIn', function () {
     return Meteor.loggingIn();
   });
+
+  /**
+   * @global
+   * @name  loggingOut
+   * @isHelper true
+   * @summary Calls [Meteor.loggingOut()](#meteor_loggingout).
+   */
+  Package.blaze.Blaze.Template.registerHelper('loggingOut', function () {
+    return Meteor.loggingOut();
+  });
+
+  /**
+   * @global
+   * @name  loggingInOrOut
+   * @isHelper true
+   * @summary Calls [Meteor.loggingIn()](#meteor_loggingin) or [Meteor.loggingOut()](#meteor_loggingout).
+   */
+  Package.blaze.Blaze.Template.registerHelper('loggingInOrOut', function () {
+    return (Meteor.loggingIn() || Meteor.loggingOut());
+  });
 }

packages/accounts-base/accounts_client_tests.js

@@ -0,0 +1,73 @@
+const username = 'jsmith';
+const password = 'password';
+
+const logoutAndCreateUser = (test, done, nextTests) => {
+  Meteor.logout(() => {
+    // Make sure we're logged out to start with
+    test.isFalse(Meteor.user());
+
+    // Setup a new test user
+    Accounts.createUser({ username, password }, () => {
+      // Handle next tests
+      nextTests(test, done);
+    });
+  });
+};
+
+const removeTestUser = (done) => {
+  Meteor.call('removeAccountsTestUser', username, () => {
+    done();
+  });
+};
+
+Tinytest.addAsync(
+  'accounts - Meteor.loggingIn() is true right after a login call',
+  (test, done) => {
+    logoutAndCreateUser(test, done, () => {
+      // Login then immediately verify loggingIn is true
+      Meteor.loginWithPassword(username, password);
+      test.isTrue(Meteor.loggingIn());
+      removeTestUser(done);
+    });
+  }
+);
+
+Tinytest.addAsync(
+  'accounts - Meteor.loggingIn() is false after login has completed',
+  (test, done) => {
+    logoutAndCreateUser(test, done, () => {
+      // Login then verify loggingIn is false after login has completed
+      Meteor.loginWithPassword(username, password, () => {
+        test.isTrue(Meteor.user());
+        test.isFalse(Meteor.loggingIn());
+        removeTestUser(done);
+      });
+    });
+  }
+);
+
+Tinytest.addAsync(
+  'accounts - Meteor.loggingOut() is true right after a logout call',
+  (test, done) => {
+    logoutAndCreateUser(test, done, () => {
+      // Logout then immediately verify loggingOut is true
+      Meteor.logout();
+      test.isTrue(Meteor.loggingOut());
+      removeTestUser(done);
+    });
+  }
+);
+
+Tinytest.addAsync(
+  'accounts - Meteor.loggingOut() is false after logout has completed',
+  (test, done) => {
+    logoutAndCreateUser(test, done, () => {
+      // Logout then verify loggingOut is false after logout has completed
+      Meteor.logout((error) => {
+        test.isFalse(Meteor.user());
+        test.isFalse(Meteor.loggingOut());
+        removeTestUser(done);
+      });
+    });
+  }
+);

packages/accounts-base/accounts_tests_setup.js

@@ -0,0 +1,5 @@
+Meteor.methods({
+  removeAccountsTestUser(username) {
+    Meteor.users.remove({ username });
+  },
+});

packages/accounts-base/client_tests.js

@@ -1,2 +1,3 @@
 import "./accounts_url_tests.js";
 import "./accounts_reconnect_tests.js";
+import "./accounts_client_tests.js";

packages/accounts-base/package.js

@@ -13,6 +13,7 @@ Package.onUse(function (api) {
   api.use('random', ['client', 'server']);
   api.use('ejson', 'server');
   api.use('callback-hook', ['client', 'server']);
+  api.use('reactive-var', 'client');
 
   // use unordered to work around a circular dependency
   // (service-configuration needs Accounts.connection)
@@ -62,6 +63,7 @@ Package.onTest(function (api) {
     'accounts-password'
   ]);
 
+  api.addFiles('accounts_tests_setup.js', 'server');
   api.mainModule('server_tests.js', 'server');
   api.mainModule('client_tests.js', 'client');
 });

packages/accounts-ui-unstyled/login_buttons.html

@@ -1,8 +1,8 @@
 <template name="loginButtons">
   <div id="login-buttons" class="login-buttons-dropdown-align-{{align}}">
     {{#if currentUser}}
-      {{#if loggingIn}}
-        {{! We aren't actually logged in yet; we're just setting Meteor.userId
+      {{#if loggingInOrOut}}
+        {{! We aren't actually logged in/out yet; we're just setting Meteor.userId
             optimistically during an at-startup login-with-token. We expose this
             state so other UIs can treat it specially, but we'll just treat it
             as logged out. }}