Merge pull request #76 from js-accounts/feat/redux-store-stokens

feat(redux-tokens): expose js-accounts tokens to redux store

Author: dotansimha

packages/client/src/AccountsClient.js

@@ -15,7 +15,7 @@ import type {
 } from '@accounts/common';
 import config from './config';
 import createStore from './createStore';
-import reducer, { loggingIn, setUser, clearUser } from './module';
+import reducer, { loggingIn, setUser, clearUser, setTokens, clearTokens as clearStoreTokens } from './module';
 import type { TransportInterface } from './TransportInterface';
 
 const isValidUserObject = (user: PasswordLoginUserIdentityType) => has(user, 'user') || has(user, 'email') || has(user, 'id');
@@ -94,6 +94,7 @@ export class AccountsClient {
   }
 
   async clearTokens(): Promise<void> {
+    this.store.dispatch(clearStoreTokens());
     await this.removeStorageData(getTokenKey(ACCESS_TOKEN, this.options));
     await this.removeStorageData(getTokenKey(REFRESH_TOKEN, this.options));
   }
@@ -135,6 +136,7 @@ export class AccountsClient {
             await this.transport.refreshTokens(accessToken, refreshToken);
 
           await this.storeTokens(refreshedSession);
+          this.store.dispatch(setTokens(refreshedSession.tokens));
           this.store.dispatch(setUser(refreshedSession.user));
         }
       } catch (err) {
@@ -198,6 +200,7 @@ export class AccountsClient {
       const res : LoginReturnType = await this.transport.loginWithPassword(user, password);
       this.store.dispatch(loggingIn(false));
       await this.storeTokens(res);
+      this.store.dispatch(setTokens(res.tokens));
       this.store.dispatch(setUser(res.user));
       this.options.onSignedInHook();
       if (callback && isFunction(callback)) {

packages/client/src/AccountsClient.spec.js

@@ -305,6 +305,16 @@ describe('Accounts', () => {
         ...loggedInUser.user,
       }));
     });
+    it('stores tokens in redux', async () => {
+      const transport = {
+        loginWithPassword: () => Promise.resolve(loggedInUser),
+      };
+      Accounts.config({ history }, transport);
+      await Accounts.loginWithPassword('username', 'password');
+      expect(Accounts.instance.getState().get('tokens')).toEqual(Map({
+        ...loggedInUser.tokens,
+      }));
+    });
   });
   describe('logout', () => {
     it('calls callback on successful logout', async () => {
@@ -342,6 +352,35 @@ describe('Accounts', () => {
         expect(callback.mock.calls[0][0]).toEqual({ message: 'error message' });
       }
     });
+
+    it('clear tokens in redux', async () => {
+      const transport = {
+        logout: () => Promise.reject({ message: 'error message' }),
+      };
+      Accounts.instance.storeTokens({ tokens: { accessToken: '1' } });
+      Accounts.config({ history }, transport);
+      const callback = jest.fn();
+      try {
+        await Accounts.logout(callback);
+        throw new Error();
+      } catch (err) {
+        expect(Accounts.instance.getState().get('tokens')).toEqual(null);
+      }
+    });
+    it('clear user in redux', async () => {
+      const transport = {
+        logout: () => Promise.reject({ message: 'error message' }),
+      };
+      Accounts.instance.storeTokens({ tokens: { accessToken: '1' } });
+      Accounts.config({ history }, transport);
+      const callback = jest.fn();
+      try {
+        await Accounts.logout(callback);
+        throw new Error();
+      } catch (err) {
+        expect(Accounts.instance.getState().get('user')).toEqual(null);
+      }
+    });
   });
   describe('refreshSession', async () => {
     // TODO test that user and tokens are cleared if refreshToken is expired

packages/client/src/module.js

@@ -3,12 +3,15 @@ import { Map } from 'immutable';
 const PATH = 'js-accounts/';
 const LOGIN = `${PATH}LOGIN`;
 const SET_USER = `${PATH}SET_USER`;
+const SET_TOKENS = `${PATH}SET_TOKENS`;
+const CLEAR_TOKENS = `${PATH}CLEAR_TOKENS`;
 const CLEAR_USER = `${PATH}CLEAR_USER`;
 const LOGGING_IN = `${PATH}LOGGING_IN`;
 
 const initialState = Map({
   isLoading: false,
   user: null,
+  tokens: null,
   loggingIn: false,
 });
 
@@ -22,6 +25,13 @@ const reducer = (state = initialState, action) => {
       const { user } = action.payload;
       return state.set('user', Map(user));
     }
+    case SET_TOKENS: {
+      const { tokens } = action.payload;
+      return state.set('tokens', Map(tokens));
+    }
+    case CLEAR_TOKENS: {
+      return state.set('tokens', null);
+    }
     case CLEAR_USER: {
       return state.set('user', null);
     }
@@ -51,6 +61,17 @@ export const setUser = user => ({
   },
 });
 
+export const setTokens = tokens => ({
+  type: SET_TOKENS,
+  payload: {
+    tokens,
+  },
+});
+
+export const clearTokens = () => ({
+  type: CLEAR_TOKENS,
+});
+
 export const clearUser = () => ({
   type: CLEAR_USER,
 });