Merge pull request #154 from accounts-js/feature/remove-user-unused-code

remove unused actions to store user

Author: pradel

packages/client/__tests__/accounts-client.ts

@@ -307,22 +307,6 @@ describe('Accounts', () => {
         expect(Accounts.instance.getState().get('tokens')).toEqual(null);
       }
     });
-
-    it('clear user in redux', async () => {
-      const transport = {
-        ...mockTransport,
-        logout: () => Promise.reject({ message: 'error message' }),
-      };
-      Accounts.instance.storeTokens({ 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 () => {
@@ -332,13 +316,11 @@ describe('Accounts', () => {
       Accounts.instance.clearTokens = jest.fn(
         () => Accounts.instance.clearTokens
       );
-      Accounts.instance.clearUser = jest.fn(() => Accounts.instance.clearUser);
       try {
         await Accounts.refreshSession();
       } catch (err) {
         expect(err.message).toEqual('no tokens provided');
         expect(Accounts.instance.clearTokens).toHaveBeenCalledTimes(1);
-        expect(Accounts.instance.clearUser).toHaveBeenCalledTimes(1);
       }
     });
 
@@ -349,7 +331,6 @@ describe('Accounts', () => {
       Accounts.instance.clearTokens = jest.fn(
         () => Accounts.instance.clearTokens
       );
-      Accounts.instance.clearUser = jest.fn(() => Accounts.instance.clearUser);
       try {
         await Accounts.refreshSession();
         throw new Error();

packages/client/src/accounts-client.ts

@@ -17,7 +17,6 @@ import config, { TokenStorage, AccountsClientConfiguration } from './config';
 import createStore from './create-store';
 import reducer, {
   loggingIn,
-  clearUser,
   setTokens,
   clearTokens as clearStoreTokens,
   setOriginalTokens,
@@ -122,12 +121,6 @@ export class AccountsClient {
     this.store.dispatch(setOriginalTokens(tokens));
   }
 
-  public user(): UserObjectType {
-    const user = this.getState().get('user');
-
-    return user ? user.toJS() : null;
-  }
-
   public async impersonate(username: string): Promise<ImpersonateReturnType> {
     if (!isString(username)) {
       throw new AccountsError('Username is required');
@@ -239,10 +232,6 @@ export class AccountsClient {
     }
   }
 
-  public clearUser() {
-    this.store.dispatch(clearUser());
-  }
-
   public async resumeSession(): Promise<void> {
     try {
       await this.refreshSession();
@@ -267,7 +256,6 @@ export class AccountsClient {
         // Refresh token is expired, user must sign back in
         if (decodedRefreshToken.exp < currentTime) {
           this.clearTokens();
-          this.clearUser();
         } else {
           // Request a new token pair
           const refreshedSession: LoginReturnType = await this.transport.refreshTokens(
@@ -282,12 +270,10 @@ export class AccountsClient {
       } catch (err) {
         this.store.dispatch(loggingIn(false));
         this.clearTokens();
-        this.clearUser();
         throw new AccountsError('falsy token provided');
       }
     } else {
       this.clearTokens();
-      this.clearUser();
       throw new AccountsError('no tokens provided');
     }
   }
@@ -364,7 +350,6 @@ export class AccountsClient {
       return response;
     } catch (err) {
       this.clearTokens();
-      this.store.dispatch(clearUser());
       this.store.dispatch(loggingIn(false));
       throw new AccountsError(err.message);
     }
@@ -387,7 +372,6 @@ export class AccountsClient {
       }
 
       this.clearTokens();
-      this.store.dispatch(clearUser());
       if (callback && isFunction(callback)) {
         callback();
       }
@@ -397,7 +381,6 @@ export class AccountsClient {
       }
     } catch (err) {
       this.clearTokens();
-      this.store.dispatch(clearUser());
       if (callback && isFunction(callback)) {
         callback(err);
       }
@@ -435,9 +418,6 @@ const Accounts = {
 
     return this.instance;
   },
-  user(): UserObjectType | null {
-    return this.instance.user();
-  },
   options(): AccountsClientConfiguration {
     return this.instance.options;
   },

packages/client/src/module.ts

@@ -2,18 +2,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 SET_ORIGINAL_TOKENS = `${PATH}SET_ORIGINAL_TOKENS`;
 const CLEAR_ORIGINAL_TOKENS = `${PATH}CLEAR_ORIGINAL_TOKENS`;
 const SET_IMPERSONATED = `${PATH}SET_IMPERSONATED`;
 
 const initialState = Map<string, any>({
   isLoading: false,
-  user: null,
   tokens: null,
   loggingIn: false,
   originalTokens: null,
@@ -26,10 +23,6 @@ const reducer = (state = initialState, action) => {
     case LOGIN: {
       break;
     }
-    case SET_USER: {
-      const { user } = action.payload;
-      return state.set('user', Map(user));
-    }
     case SET_TOKENS: {
       const { tokens } = action.payload;
       return state.set('tokens', Map(tokens));
@@ -38,9 +31,6 @@ const reducer = (state = initialState, action) => {
       state.set('originalTokens', null);
       return state.set('tokens', null);
     }
-    case CLEAR_USER: {
-      return state.set('user', null);
-    }
     case LOGGING_IN: {
       const { isLoggingIn } = action.payload;
       return state.set('loggingIn', isLoggingIn);
@@ -75,13 +65,6 @@ export const loggingIn = isLoggingIn => ({
   },
 });
 
-export const setUser = user => ({
-  type: SET_USER,
-  payload: {
-    user,
-  },
-});
-
 export const setTokens = tokens => ({
   type: SET_TOKENS,
   payload: {
@@ -93,10 +76,6 @@ export const clearTokens = () => ({
   type: CLEAR_TOKENS,
 });
 
-export const clearUser = () => ({
-  type: CLEAR_USER,
-});
-
 export const setOriginalTokens = tokens => ({
   type: SET_ORIGINAL_TOKENS,
   payload: {