Merge pull request #11 from kylecorbelli/improve-signoutuser

Improve signOutUser

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-token-auth",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Redux actions and reducers to integrate with Devise Token Auth",
   "main": "dist/index.js",
   "types": "index.d.ts",

src/actions.ts

@@ -212,9 +212,12 @@ const generateAuthActions = (config: { [key: string]: any }): ActionsExport => {
     }
   }
 
-  const signOutUser = (
+  const signOutUser = () => async function (dispatch: Dispatch<{}>): Promise<void> {
-    userSignOutCredentials: UserSignOutCredentials,
+    const userSignOutCredentials: UserSignOutCredentials = {
-  ) => async function (dispatch: Dispatch<{}>): Promise<void> {
+      'access-token': localStorage.getItem('access-token') as string,
+      client: localStorage.getItem('client') as string,
+      uid: localStorage.getItem('uid') as string,
+    }
     dispatch(signOutRequestSent())
     try {
       await axios({

src/reducers/current-user/index.test.ts

@@ -42,6 +42,7 @@ describe('currentUser', () => {
   const loggedInUser: User = {
     attributes: {
       firstName: 'Snowball',
+      imageUrl: 'http://some.url',
     },
     isLoading: false,
     isLoggedIn: true,
@@ -169,6 +170,7 @@ describe('currentUser', () => {
       const expectedNewState: User = {
         attributes: {
           firstName: null,
+          imageUrl: null,
         },
         isLoading: false,
         isLoggedIn: false,

src/reducers/current-user/index.ts

@@ -1,5 +1,6 @@
 import {
   User,
+  UserAttributes,
   ReduxAction,
   REGISTRATION_REQUEST_SENT,
   REGISTRATION_REQUEST_SUCCEEDED,
@@ -49,12 +50,19 @@ const currentUser = (state: User = initialUser, action: ReduxAction): User => {
         isLoggedIn: false,
       }
     case SIGNOUT_REQUEST_SUCCEEDED:
+      const userAttributeKeys: string[] = Object.keys(state.attributes)
+      const allNullUserAttributes: UserAttributes = userAttributeKeys.reduce(
+        (accumulatedNullUserAttributes: UserAttributes, currentUserAttributeKey: string): UserAttributes => {
+          return {
+            ...accumulatedNullUserAttributes,
+            [currentUserAttributeKey]: null,
+          }
+        },
+        {},
+      )
       return {
         ...state,
-        attributes: {
+        attributes: allNullUserAttributes,
-          ...state.attributes,
-          firstName: null,
-        },
         isLoading: false,
         isLoggedIn: false,
       }

src/types.ts

@@ -3,7 +3,9 @@ import {
   Store,
 } from 'redux'
 
-export interface UserAttributes {}
+export interface UserAttributes {
+  [key: string]: string | number | null
+}
 
 export interface User {
   readonly isLoggedIn: boolean