Merge pull request #75 from js-accounts/fix-login

Fixed logging in state on failed login

Author: dotansimha

packages/client/src/AccountsClient.js

@@ -196,19 +196,20 @@ export class AccountsClient {
     this.store.dispatch(loggingIn(true));
     try {
       const res : LoginReturnType = await this.transport.loginWithPassword(user, password);
+      this.store.dispatch(loggingIn(false));
       await this.storeTokens(res);
       this.store.dispatch(setUser(res.user));
       this.options.onSignedInHook();
       if (callback && isFunction(callback)) {
         callback();
       }
     } catch (err) {
+      this.store.dispatch(loggingIn(false));
       if (callback && isFunction(callback)) {
         callback(err);
       }
       throw new AccountsError(err.message);
     }
-    this.store.dispatch(loggingIn(false), user);
   }
 
   loggingIn(): boolean {

packages/client/src/AccountsClient.spec.js

@@ -212,6 +212,7 @@ describe('Accounts', () => {
       const callback = jest.fn();
       await Accounts.loginWithPassword('username', 'password', callback);
       expect(callback.mock.calls.length).toEqual(1);
+      expect(Accounts.loggingIn()).toBe(false);
     });
     it('calls transport', async () => {
       const loginWithPassword = jest.fn(() => Promise.resolve(loggedInUser));
@@ -238,6 +239,18 @@ describe('Accounts', () => {
         expect(callback.mock.calls[0][0]).toEqual('error');
       }
     });
+    it('sets loggingIn flag to false on failed login', async () => {
+      const transport = {
+        loginWithPassword: () => Promise.reject('error'),
+      };
+      Accounts.config({ history }, transport);
+      try {
+        await Accounts.loginWithPassword('username', 'password');
+        throw new Error();
+      } catch (err) {
+        expect(Accounts.loggingIn()).toBe(false);
+      }
+    });
     it('stores tokens in local storage', async () => {
       const transport = {
         loginWithPassword: () => Promise.resolve(loggedInUser),