preparation for login api

jsonserver/server.js

@@ -47,7 +47,10 @@ server.post('/user/login', (req, res) => {
 
 server.get('/app/config', (req, res) => res.jsonp(jsonDb.app_config))
 
-server.get('/user/is_logged_in', (req, res) => res.jsonp(jsonDb.user_logged))
+server.get('/user/is_logged_in', (req, res) =>
+  // res.jsonp({"logged": false})
+  res.jsonp(jsonDb.user_logged)
+)
 
 server.get('/user/:id/workspace', (req, res) => res.jsonp(jsonDb.workspace_list))
 

src/action-creator.sync.js

@@ -5,7 +5,7 @@ export const USER_LOGIN = 'User/Login'
 export const USER_DATA = 'User/Data'
 export const USER_ROLE = 'User/Role'
 export const USER_CONNECTED = 'User/Connected'
-export const setUserConnected = user => ({ type: `Set/${USER_CONNECTED}`, user })
+export const setUserConnected = data => ({ type: `Set/${USER_CONNECTED}`, data })
 export const updateUserData = userData => ({ type: `Update/${USER_DATA}`, data: userData })
 export const setUserRole = userRole => ({ type: `Set/${USER_ROLE}`, userRole }) // this actually update workspaceList state
 export const updateUserWorkspaceSubscriptionNotif = (workspaceId, subscriptionNotif) =>

src/component/Workspace/Folder.jsx

@@ -80,7 +80,7 @@ class Folder extends React.Component {
               type={c.type}
               status={c.status}
               onClickItem={() => onClickItem(c)}
-              isLast={isLast && i === content.length - 1}
+              isLast={isLast && i === folderData.content.length - 1}
               key={c.id}
             />
           )}

src/component/common/Card/CardHeader.jsx

@@ -13,7 +13,10 @@ const CardHeader = props => {
 export default CardHeader
 
 CardHeader.propTypes = {
-  children: PropTypes.element.isRequired,
+  children: PropTypes.oneOfType([
+    PropTypes.element,
+    PropTypes.string
+  ]).isRequired,
   customClass: PropTypes.string
 }
 

src/container/Login.jsx

@@ -50,54 +50,56 @@ class Login extends React.Component {
                   <CardHeader customClass='connection__header text-center'>{'Connexion'}</CardHeader>
 
                   <CardBody formClass='connection__form'>
-                    <InputGroupText
-                      parentClassName='connection__form__groupemail'
-                      customClass='mb-3 mt-4'
-                      icon='fa-envelope-open-o'
-                      type='email'
-                      placeHolder='Adresse Email'
-                      invalidMsg='Email invalide.'
-                      value={this.state.inputLogin}
-                      onChange={this.handleChangeLogin}
-                    />
-
-                    <InputGroupText
-                      parentClassName='connection__form__groupepw'
-                      customClass=''
-                      icon='fa-lock'
-                      type='password'
-                      placeHolder='Mot de passe'
-                      invalidMsg='Mot de passe invalide.'
-                      value={this.state.inputPassword}
-                      onChange={this.handleChangePassword}
-                    />
-
-                    <div className='row mt-4 mb-4'>
-                      <div className='col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6'>
-                        <InputCheckbox
-                          parentClassName='connection__form__rememberme'
-                          customClass=''
-                          label='Se souvenir de moi'
-                          checked={this.state.inputRememberMe}
-                          onChange={this.handleChangeRememberMe}
-                        />
+                    <div>
+                      <InputGroupText
+                        parentClassName='connection__form__groupemail'
+                        customClass='mb-3 mt-4'
+                        icon='fa-envelope-open-o'
+                        type='email'
+                        placeHolder='Adresse Email'
+                        invalidMsg='Email invalide.'
+                        value={this.state.inputLogin}
+                        onChange={this.handleChangeLogin}
+                      />
+
+                      <InputGroupText
+                        parentClassName='connection__form__groupepw'
+                        customClass=''
+                        icon='fa-lock'
+                        type='password'
+                        placeHolder='Mot de passe'
+                        invalidMsg='Mot de passe invalide.'
+                        value={this.state.inputPassword}
+                        onChange={this.handleChangePassword}
+                      />
+
+                      <div className='row mt-4 mb-4'>
+                        <div className='col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6'>
+                          <InputCheckbox
+                            parentClassName='connection__form__rememberme'
+                            customClass=''
+                            label='Se souvenir de moi'
+                            checked={this.state.inputRememberMe}
+                            onChange={this.handleChangeRememberMe}
+                          />
+                        </div>
+
+                        <div className='col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6 text-sm-right'>
+                          <LoginBtnForgotPw
+                            customClass='connection__form__pwforgot'
+                            label='Mot de passe oublié ?'
+                          />
+                        </div>
                       </div>
 
-                      <div className='col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6 text-sm-right'>
-                        <LoginBtnForgotPw
-                          customClass='connection__form__pwforgot'
-                          label='Mot de passe oublié ?'
-                        />
-                      </div>
+                      <Button
+                        htmlType='button'
+                        bootstrapType='primary'
+                        customClass='connection__form__btnsubmit'
+                        label='Connexion'
+                        onClick={this.handleClickSubmit}
+                      />
                     </div>
-
-                    <Button
-                      htmlType='button'
-                      bootstrapType='primary'
-                      customClass='connection__form__btnsubmit'
-                      label='Connexion'
-                      onClick={this.handleClickSubmit}
-                    />
                   </CardBody>
                 </Card>
 

src/reducer/user.js

@@ -17,18 +17,22 @@ const serializeUser = data => ({
   caldavUrl: data.user.caldav_url
 })
 
-export default function user (state = {
+const defaultUser = {
   id: -1,
-  isLoggedIn: undefined,
+  isLoggedIn: undefined, // undefined means the api (/is_logged_in) has not responded yet
   username: '',
   firstname: '',
   lastname: '',
   email: '',
   avatar: ''
-}, action) {
+}
+
+export default function user (state = defaultUser, action) {
   switch (action.type) {
     case `Set/${USER_CONNECTED}`:
-      return serializeUser(action.user)
+      return action.data.logged
+        ? serializeUser(action.data)
+        : {...defaultUser, isLoggedIn: false}
 
     case `Update/${USER_DATA}`:
       return {...state, ...action.data}