[wip] connection to login api

src/action-creator.async.js

@@ -70,7 +70,7 @@ const fetchWrapper = async ({url, param, actionName, dispatch, debug = false}) =
 
 export const getLangList = () => async dispatch => {
   const fetchGetLangList = await fetchWrapper({
-    url: `${FETCH_CONFIG.apiUrl}/lang`,
+    url: `${FETCH_CONFIG.mockApiUrl}/lang`,
     param: {...FETCH_CONFIG.header, method: 'GET'},
     actionName: LANG,
     dispatch
@@ -80,7 +80,7 @@ export const getLangList = () => async dispatch => {
 
 export const getTimezone = () => async dispatch => {
   const fetchGetTimezone = await fetchWrapper({
-    url: `${FETCH_CONFIG.apiUrl}/timezone`,
+    url: `${FETCH_CONFIG.mockApiUrl}/timezone`,
     param: {...FETCH_CONFIG.header, method: 'GET'},
     actionName: TIMEZONE,
     dispatch
@@ -88,16 +88,16 @@ export const getTimezone = () => async dispatch => {
   if (fetchGetTimezone.status === 200) dispatch(setTimezone(fetchGetTimezone.json))
 }
 
-export const userLogin = (login, password, rememberMe) => async dispatch => {
+export const postUserLogin = (login, password, rememberMe) => async dispatch => {
   const fetchUserLogin = await fetchWrapper({
-    url: `${FETCH_CONFIG.apiUrl}/user/login`,
+    url: `${FETCH_CONFIG.apiUrl}/sessions/login`,
     param: {
-      ...FETCH_CONFIG.header,
+      headers: {...FETCH_CONFIG.headers},
       method: 'POST',
       body: JSON.stringify({
-        login,
-        password,
-        remember_me: rememberMe
+        email: login,
+        password: password
+        // remember_me: rememberMe
       })
     },
     actionName: USER_LOGIN,
@@ -106,19 +106,21 @@ export const userLogin = (login, password, rememberMe) => async dispatch => {
   if (fetchUserLogin.status === 200) dispatch(setUserConnected(fetchUserLogin.json))
 }
 
-export const getIsUserConnected = () => async dispatch => {
+export const getUserIsConnected = () => async dispatch => {
   const fetchUserLogged = await fetchWrapper({
-    url: `${FETCH_CONFIG.apiUrl}/user/is_logged_in`,
+    url: `${FETCH_CONFIG.apiUrl}/sessions/whoami`,
     param: {...FETCH_CONFIG.header, method: 'GET'},
     actionName: USER_CONNECTED,
     dispatch
   })
   if (fetchUserLogged.status === 200) dispatch(setUserConnected(fetchUserLogged.json))
+  else if (fetchUserLogged.status === 401) dispatch(setUserConnected({logged: false}))
+  else dispatch(setUserConnected({logged: undefined}))
 }
 
 export const getUserRole = user => async dispatch => {
   const fetchGetUserRole = await fetchWrapper({
-    url: `${FETCH_CONFIG.apiUrl}/user/${user.id}/roles`,
+    url: `${FETCH_CONFIG.mockApiUrl}/user/${user.id}/roles`,
     param: {...FETCH_CONFIG.header, method: 'GET'},
     actionName: USER_ROLE,
     dispatch
@@ -128,7 +130,7 @@ export const getUserRole = user => async dispatch => {
 
 export const updateUserLang = newLang => async dispatch => { // unused
   const fetchUpdateUserLang = await fetchWrapper({
-    url: `${FETCH_CONFIG.apiUrl}/user`,
+    url: `${FETCH_CONFIG.mockApiUrl}/user`,
     param: {...FETCH_CONFIG.header, method: 'PATCH', body: JSON.stringify({lang: newLang})},
     actionName: USER_DATA,
     dispatch
@@ -148,7 +150,7 @@ export const updateUserLang = newLang => async dispatch => { // unused
 
 export const getWorkspaceList = (userId, workspaceIdToOpen) => async dispatch => {
   const fetchGetWorkspaceList = await fetchWrapper({
-    url: `${FETCH_CONFIG.apiUrl}/user/${userId}/workspace`,
+    url: `${FETCH_CONFIG.mockApiUrl}/user/${userId}/workspace`,
     param: {...FETCH_CONFIG.header, method: 'GET'},
     actionName: WORKSPACE_LIST,
     dispatch
@@ -161,7 +163,7 @@ export const getWorkspaceList = (userId, workspaceIdToOpen) => async dispatch =>
 
 export const getWorkspaceContent = (workspaceId, filterStr) => async dispatch => {
   const fetchGetWorkspaceContent = await fetchWrapper({
-    url: `${FETCH_CONFIG.apiUrl}/workspace/${workspaceId}`,
+    url: `${FETCH_CONFIG.mockApiUrl}/workspace/${workspaceId}`,
     param: {...FETCH_CONFIG.header, method: 'GET'},
     actionName: WORKSPACE,
     dispatch
@@ -171,7 +173,7 @@ export const getWorkspaceContent = (workspaceId, filterStr) => async dispatch =>
 
 export const getFolderContent = (workspaceId, folderId) => async dispatch => {
   const fetchGetFolderContent = await fetchWrapper({
-    url: `${FETCH_CONFIG.apiUrl}/workspace/${workspaceId}/folder/${folderId}`,
+    url: `${FETCH_CONFIG.mockApiUrl}/workspace/${workspaceId}/folder/${folderId}`,
     param: {...FETCH_CONFIG.header, method: 'GET'},
     actionName: `${WORKSPACE}/${FOLDER}`,
     dispatch
@@ -181,7 +183,7 @@ export const getFolderContent = (workspaceId, folderId) => async dispatch => {
 
 export const getAppList = () => async dispatch => {
   const fetchGetAppList = await fetchWrapper({
-    url: `${FETCH_CONFIG.apiUrl}/app/config`,
+    url: `${FETCH_CONFIG.mockApiUrl}/app/config`,
     param: {...FETCH_CONFIG.header, method: 'GET'},
     actionName: APP_LIST,
     dispatch

src/container/Login.jsx

@@ -3,7 +3,7 @@ import { connect } from 'react-redux'
 import { Redirect } from 'react-router'
 import LoginLogo from '../component/Login/LoginLogo.jsx'
 import LoginLogoImg from '../img/logoTracimWhite.svg'
-import { userLogin } from '../action-creator.async.js'
+import { postUserLogin } from '../action-creator.async.js'
 import Card from '../component/common/Card/Card.jsx'
 import CardHeader from '../component/common/Card/CardHeader.jsx'
 import CardBody from '../component/common/Card/CardBody.jsx'
@@ -30,7 +30,7 @@ class Login extends React.Component {
     const { history, dispatch } = this.props
     const { inputLogin, inputPassword, inputRememberMe } = this.state
 
-    await dispatch(userLogin(inputLogin, inputPassword, inputRememberMe))
+    await dispatch(postUserLogin(inputLogin, inputPassword, inputRememberMe))
     history.push('/')
   }
 

src/container/Tracim.jsx

@@ -15,12 +15,12 @@ import PrivateRoute from './PrivateRoute.jsx'
 import { PAGE_NAME } from '../helper.js'
 import {
   getLangList,
-  getIsUserConnected
+  getUserIsConnected
 } from '../action-creator.async.js'
 
 class Tracim extends React.Component {
   componentDidMount () {
-    this.props.dispatch(getIsUserConnected())
+    this.props.dispatch(getUserIsConnected())
     this.props.dispatch(getLangList())
   }
 

src/helper.js

@@ -1,9 +1,10 @@
 export const FETCH_CONFIG = {
-  header: {
+  headers: {
     'Accept': 'application/json',
     'Content-Type': 'application/json'
   },
-  apiUrl: 'http://localhost:3001'
+  apiUrl: 'http://localhost:6543/api/v2',
+  mockApiUrl: 'http://localhost:3001'
 }
 
 export const PAGE_NAME = {