From 408c2fca75c6d94c65a89767034ca7cea1dcda8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Delattre?= <gregoire.delattre@gmail.com>
Date: Wed, 16 Nov 2016 21:52:06 +0100
Subject: [PATCH] Make Axios ready to receive the server responses

---
 src/public/js/actions/actionCreators.js | 15 ++++++++-------
 src/public/js/reducers/movie-store.js   |  2 +-
 src/public/js/reducers/users.js         |  5 ++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/public/js/actions/actionCreators.js b/src/public/js/actions/actionCreators.js
index 8e8d5e2..6712a3a 100644
--- a/src/public/js/actions/actionCreators.js
+++ b/src/public/js/actions/actionCreators.js
@@ -54,7 +54,7 @@ export function loginUser(username, password) {
         password: password,
       },
     ).then(response => {
-      if (response.data && response.data.type && response.data.type === 'error')
+      if (response.data.status === 'error')
       {
         dispatch({
           type: ADD_ERROR,
@@ -65,7 +65,7 @@ export function loginUser(username, password) {
       }
       dispatch({
         type: USER_LOGIN_FULFILLED,
-        payload: response,
+        payload: response.data,
       })
     }).catch(error => {
       console.log(error)
@@ -86,7 +86,7 @@ export function fetchMovies() {
       headers: { 'Authorization': header },
     })
     .then(response => {
-      if (response.data.type && response.data.type === 'error')
+      if (response.data.status === 'error')
       {
         dispatch({
           type: ADD_ERROR,
@@ -94,11 +94,12 @@ export function fetchMovies() {
             message: response.data.message,
           }
         })
+      } else {
+        dispatch({
+          type: MOVIE_LIST_FETCH_FULFILLED,
+          payload: response.data,
+        })
       }
-      dispatch({
-        type: MOVIE_LIST_FETCH_FULFILLED,
-        payload: response,
-      })
     })
     .catch(error => {
       // Unauthorized
diff --git a/src/public/js/reducers/movie-store.js b/src/public/js/reducers/movie-store.js
index 95f7257..d217d0d 100644
--- a/src/public/js/reducers/movie-store.js
+++ b/src/public/js/reducers/movie-store.js
@@ -9,7 +9,7 @@ export default function movieStore(state = defaultState, action) {
   switch (action.type) {
     case MOVIE_LIST_FETCH_FULFILLED:
       return Object.assign({}, state, {
-        movies: action.payload.data.Data.movies,
+        movies: action.payload.data,
       })
     case MOVIE_LIST_FETCH_PENDING:
       return state
diff --git a/src/public/js/reducers/users.js b/src/public/js/reducers/users.js
index 5c046dc..c2c767e 100644
--- a/src/public/js/reducers/users.js
+++ b/src/public/js/reducers/users.js
@@ -15,11 +15,10 @@ export default function userStore(state = defaultState, action) {
         userLoading: true,
       })
     case USER_LOGIN_FULFILLED:
-      const data = action.payload.data;
-      if (data && data.type === "error") {
+      if (action.payload.status === "error") {
         return logoutUser(state)
       }
-      return updateFromToken(state, data.token)
+      return updateFromToken(state, action.payload.data.token)
     case IS_USER_LOGGED_IN:
       let localToken = localStorage.getItem('token');
       if (!localToken || localToken === "") {