ODWRTW/canape
2
2
Fork 0
Code Issues 3 Pull Requests 1 Releases Activity

Make Axios ready to receive the server responses

Browse Source
This commit is contained in:
Grégoire Delattre 2016-11-16 21:52:06 +01:00
parent 4108e3a2ca
commit 408c2fca75
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/public/js/actions/actionCreators.js
View File

@ -54,7 +54,7 @@ export function loginUser(username, password) {
password: password, password: password,
}, },
).then(response => { ).then(response => {
if (response.data && response.data.type && response.data.type === 'error') if (response.data.status === 'error')
{ {
dispatch({ dispatch({
type: ADD_ERROR, type: ADD_ERROR,
@ -65,7 +65,7 @@ export function loginUser(username, password) {
} }
dispatch({ dispatch({
type: USER_LOGIN_FULFILLED, type: USER_LOGIN_FULFILLED,
payload: response, payload: response.data,
}) })
}).catch(error => { }).catch(error => {
console.log(error) console.log(error)
@ -86,7 +86,7 @@ export function fetchMovies() {
headers: { 'Authorization': header }, headers: { 'Authorization': header },
}) })
.then(response => { .then(response => {
if (response.data.type && response.data.type === 'error') if (response.data.status === 'error')
{ {
dispatch({ dispatch({
type: ADD_ERROR, type: ADD_ERROR,
@ -94,11 +94,12 @@ export function fetchMovies() {
message: response.data.message, message: response.data.message,
} }
}) })
} else {
dispatch({
type: MOVIE_LIST_FETCH_FULFILLED,
payload: response.data,
})
} }
dispatch({
type: MOVIE_LIST_FETCH_FULFILLED,
payload: response,
})
}) })
.catch(error => { .catch(error => {
// Unauthorized // Unauthorized

2
src/public/js/reducers/movie-store.js
View File

@ -9,7 +9,7 @@ export default function movieStore(state = defaultState, action) {
switch (action.type) { switch (action.type) {
case MOVIE_LIST_FETCH_FULFILLED: case MOVIE_LIST_FETCH_FULFILLED:
return Object.assign({}, state, { return Object.assign({}, state, {
movies: action.payload.data.Data.movies, movies: action.payload.data,
}) })
case MOVIE_LIST_FETCH_PENDING: case MOVIE_LIST_FETCH_PENDING:
return state return state

5
src/public/js/reducers/users.js
View File

@ -15,11 +15,10 @@ export default function userStore(state = defaultState, action) {
userLoading: true, userLoading: true,
}) })
case USER_LOGIN_FULFILLED: case USER_LOGIN_FULFILLED:
const data = action.payload.data; if (action.payload.status === "error") {
if (data && data.type === "error") {
return logoutUser(state) return logoutUser(state)
} }
return updateFromToken(state, data.token) return updateFromToken(state, action.payload.data.token)
case IS_USER_LOGGED_IN: case IS_USER_LOGGED_IN:
let localToken = localStorage.getItem('token'); let localToken = localStorage.getItem('token');
if (!localToken || localToken === "") { if (!localToken || localToken === "") {