Browse Source

cookies name are now in a constant

Skylsmoi 6 years ago
parent
commit
c698a1d9d8
5 changed files with 18 additions and 14 deletions
  1. 4 4
      src/container/Header.jsx
  2. 4 5
      src/container/Login.jsx
  3. 1 1
      src/container/PrivateRoute.jsx
  4. 4 4
      src/container/Tracim.jsx
  5. 5 0
      src/helper.js

+ 4 - 4
src/container/Header.jsx View File

2
 import { connect } from 'react-redux'
2
 import { connect } from 'react-redux'
3
 import i18n from '../i18n.js'
3
 import i18n from '../i18n.js'
4
 import { translate } from 'react-i18next'
4
 import { translate } from 'react-i18next'
5
+import Cookies from 'js-cookie'
5
 import Logo from '../component/Header/Logo.jsx'
6
 import Logo from '../component/Header/Logo.jsx'
6
 import NavbarToggler from '../component/Header/NavbarToggler.jsx'
7
 import NavbarToggler from '../component/Header/NavbarToggler.jsx'
7
 import MenuLinkList from '../component/Header/MenuLinkList.jsx'
8
 import MenuLinkList from '../component/Header/MenuLinkList.jsx'
8
-// import MenuActionList from '../component/Header/MenuActionList.jsx'
9
 import MenuActionListItemSearch from '../component/Header/MenuActionListItem/Search.jsx'
9
 import MenuActionListItemSearch from '../component/Header/MenuActionListItem/Search.jsx'
10
 import MenuActionListItemDropdownLang from '../component/Header/MenuActionListItem/DropdownLang.jsx'
10
 import MenuActionListItemDropdownLang from '../component/Header/MenuActionListItem/DropdownLang.jsx'
11
 import MenuActionListItemHelp from '../component/Header/MenuActionListItem/Help.jsx'
11
 import MenuActionListItemHelp from '../component/Header/MenuActionListItem/Help.jsx'
20
 import {
20
 import {
21
   postUserLogout
21
   postUserLogout
22
 } from '../action-creator.async.js'
22
 } from '../action-creator.async.js'
23
-import Cookies from 'js-cookie'
23
+import { COOKIE } from '../helper.js'
24
 
24
 
25
 class Header extends React.Component {
25
 class Header extends React.Component {
26
   handleClickLogo = () => {}
26
   handleClickLogo = () => {}
44
 
44
 
45
     const fetchPostUserLogout = await dispatch(postUserLogout())
45
     const fetchPostUserLogout = await dispatch(postUserLogout())
46
     if (fetchPostUserLogout.status === 204) {
46
     if (fetchPostUserLogout.status === 204) {
47
-      Cookies.remove('user_login')
48
-      Cookies.remove('user_auth')
47
+      Cookies.remove(COOKIE.USER_LOGIN)
48
+      Cookies.remove(COOKIE.USER_AUTH)
49
 
49
 
50
       dispatch(setUserDisconnected())
50
       dispatch(setUserDisconnected())
51
     } else {
51
     } else {

+ 4 - 5
src/container/Login.jsx View File

2
 import { connect } from 'react-redux'
2
 import { connect } from 'react-redux'
3
 import { Redirect } from 'react-router'
3
 import { Redirect } from 'react-router'
4
 import { translate } from 'react-i18next'
4
 import { translate } from 'react-i18next'
5
+import Cookies from 'js-cookie'
5
 import LoginLogo from '../component/Login/LoginLogo.jsx'
6
 import LoginLogo from '../component/Login/LoginLogo.jsx'
6
 import LoginLogoImg from '../img/logoTracimWhite.svg'
7
 import LoginLogoImg from '../img/logoTracimWhite.svg'
7
 import { postUserLogin } from '../action-creator.async.js'
8
 import { postUserLogin } from '../action-creator.async.js'
9
 import CardHeader from '../component/common/Card/CardHeader.jsx'
10
 import CardHeader from '../component/common/Card/CardHeader.jsx'
10
 import CardBody from '../component/common/Card/CardBody.jsx'
11
 import CardBody from '../component/common/Card/CardBody.jsx'
11
 import InputGroupText from '../component/common/Input/InputGroupText.jsx'
12
 import InputGroupText from '../component/common/Input/InputGroupText.jsx'
12
-// import InputCheckbox from '../component/common/Input/InputCheckbox.jsx'
13
 import Button from '../component/common/Input/Button.jsx'
13
 import Button from '../component/common/Input/Button.jsx'
14
 import LoginBtnForgotPw from '../component/Login/LoginBtnForgotPw.jsx'
14
 import LoginBtnForgotPw from '../component/Login/LoginBtnForgotPw.jsx'
15
 import {
15
 import {
16
   newFlashMessage,
16
   newFlashMessage,
17
   setUserConnected
17
   setUserConnected
18
 } from '../action-creator.sync.js'
18
 } from '../action-creator.sync.js'
19
-import { PAGE } from '../helper.js'
20
-import Cookies from 'js-cookie'
19
+import { COOKIE, PAGE } from '../helper.js'
21
 
20
 
22
 class Login extends React.Component {
21
 class Login extends React.Component {
23
   constructor (props) {
22
   constructor (props) {
53
         logged: true
52
         logged: true
54
       }))
53
       }))
55
 
54
 
56
-      Cookies.set('user_login', inputLogin.value)
57
-      Cookies.set('user_auth', userAuth)
55
+      Cookies.set(COOKIE.USER_LOGIN, inputLogin.value)
56
+      Cookies.set(COOKIE.USER_AUTH, userAuth)
58
 
57
 
59
       history.push(PAGE.HOME)
58
       history.push(PAGE.HOME)
60
     } else if (fetchPostUserLogin.status === 400) {
59
     } else if (fetchPostUserLogin.status === 400) {

+ 1 - 1
src/container/PrivateRoute.jsx View File

9
 // "You should not use <Route component> and <Route render> in the same route; <Route render> will be ignored
9
 // "You should not use <Route component> and <Route render> in the same route; <Route render> will be ignored
10
 const PrivateRoute = ({ component: Component, ...rest }) => (
10
 const PrivateRoute = ({ component: Component, ...rest }) => (
11
   <Route {...rest} render={props => rest.user.logged
11
   <Route {...rest} render={props => rest.user.logged
12
-    ? <Component {...props} /> // user logged, return composant
12
+    ? <Component {...props} /> // user logged, return component
13
     : rest.user.logged === null
13
     : rest.user.logged === null
14
       ? <div /> // dont know if user logged yet (waiting for api to respond), do nothing @TODO display loader
14
       ? <div /> // dont know if user logged yet (waiting for api to respond), do nothing @TODO display loader
15
       : <Redirect to={{pathname: '/login', state: {from: props.location}}} /> // // user not logged, redirect to login page
15
       : <Redirect to={{pathname: '/login', state: {from: props.location}}} /> // // user not logged, redirect to login page

+ 4 - 4
src/container/Tracim.jsx View File

13
   Route, withRouter, Switch
13
   Route, withRouter, Switch
14
 } from 'react-router-dom'
14
 } from 'react-router-dom'
15
 import PrivateRoute from './PrivateRoute.jsx'
15
 import PrivateRoute from './PrivateRoute.jsx'
16
-import { PAGE } from '../helper.js'
16
+import { COOKIE, PAGE } from '../helper.js'
17
 import {
17
 import {
18
   getUserIsConnected
18
   getUserIsConnected
19
 } from '../action-creator.async.js'
19
 } from '../action-creator.async.js'
28
     const { dispatch } = this.props
28
     const { dispatch } = this.props
29
 
29
 
30
     const userFromCookies = {
30
     const userFromCookies = {
31
-      email: Cookies.get('user_login'),
32
-      auth: Cookies.get('user_auth')
31
+      email: Cookies.get(COOKIE.USER_LOGIN),
32
+      auth: Cookies.get(COOKIE.USER_AUTH)
33
     }
33
     }
34
 
34
 
35
     const fetchGetUserIsConnected = await dispatch(getUserIsConnected(userFromCookies))
35
     const fetchGetUserIsConnected = await dispatch(getUserIsConnected(userFromCookies))
51
   handleRemoveFlashMessage = msg => this.props.dispatch(removeFlashMessage(msg))
51
   handleRemoveFlashMessage = msg => this.props.dispatch(removeFlashMessage(msg))
52
 
52
 
53
   render () {
53
   render () {
54
-    const { flashMessage, user, t } = this.props
54
+    const { flashMessage, t } = this.props
55
 
55
 
56
     return (
56
     return (
57
       <div className='tracim'>
57
       <div className='tracim'>

+ 5 - 0
src/helper.js View File

7
   mockApiUrl: 'http://localhost:3001'
7
   mockApiUrl: 'http://localhost:3001'
8
 }
8
 }
9
 
9
 
10
+export const COOKIE = {
11
+  USER_LOGIN: 'user_login',
12
+  USER_AUTH: 'user_auth'
13
+}
14
+
10
 export const PAGE = {
15
 export const PAGE = {
11
   HOME: '/',
16
   HOME: '/',
12
   WORKSPACE: {
17
   WORKSPACE: {