fix (serialization of state): Changing the state object to a new vari…

client/src/app/actions/authenticate.js

@@ -112,7 +112,7 @@ export const login = credentials => dispatch => api
  */
 export const logout = () => (dispatch) => {
   localStorage.removeItem('token');
-  localStorage.removeItem('http://hellobooks');
+  localStorage.removeItem('http://hellobooks:state');
   localStorage.clear();
   setAuthorizationToken(false);
   dispatch(userLoggedOut());

client/src/app/actions/notifications.js

@@ -20,7 +20,7 @@ export const showErrorNotification = ({ message, error }) => (dispatch) => {
       kind: 'info',
       dismissAfter: 3500
     }));
-    localStorage.removeItem('http://hellobooks');
+    localStorage.removeItem('http://hellobooks:state');
     localStorage.removeItem('token');
     setAuthorizationToken(false);
   } else {

client/src/app/components/container/authentication/Logout.jsx

@@ -21,6 +21,8 @@ class Logout extends Component {
    */
   componentDidMount() {
     this.props.logout();
+    /* eslint-disable */
+      Materialize.toast("User Logging Out", 2500);
     this.props.history.push('/');
   }
   /**
@@ -31,10 +33,9 @@ class Logout extends Component {
    * @return {JSX} JSX representation of DOM
    */
   render() {
-    this.setState({ isAuthneticated: false });
     return (
       <Row className="center landing">
-        <h1 className="">
+        <h1>
           Logging out...
         </h1>
       </Row>

client/src/app/components/presentation/common/book/DisplayBook.jsx

@@ -196,5 +196,11 @@ const mapStateToProps = state => ({
 
 });
 
-export default connect(mapStateToProps, {
-  deleteBookAction, fetchAllBooks, fetchSelectedBook })(Book);
+export default connect(
+  mapStateToProps,
+  {
+    deleteBookAction,
+    fetchAllBooks,
+    fetchSelectedBook
+  }
+)(Book);

client/src/app/components/presentation/common/modal/EditBookModal.jsx

@@ -215,7 +215,7 @@ EditBookModal.defaultProps = {
 
 
 EditBookModal.propTypes = {
-  book: PropTypes.object,
+  book: PropTypes.array,
   header: PropTypes.string,
   updateBookDetails: PropTypes.func.isRequired
 };

client/src/app/utils/localSave.js

@@ -7,7 +7,7 @@
  */
 export const saveState = (state) => {
   const serializedState = JSON.stringify(state);
-  localStorage.setItem('http://hellobooks', serializedState);
+  localStorage.setItem('http://hellobooks:state', serializedState);
 };
 
 const initializeState = {
@@ -22,7 +22,7 @@ const initializeState = {
  */
 export const loadState = () => {
   try {
-    const serializedState = localStorage.getItem('http://hellobooks');
+    const serializedState = localStorage.getItem('http://hellobooks:state');
     if (serializedState === null) {
       return initializeState;
     }

server/src/controllers/books.js

@@ -60,21 +60,25 @@ export default {
               categoryId: req.body.categoryId,
               description: req.body.description,
               bookImage: req.body.bookImage || process.env.DEFAULT_BOOK_COVER
+
             })
-            .then((createdBook) => {
-              createdBook
+            .then((newBook) => {
+              newBook
                 .getCategory()
                 .then((category) => {
-                  const newBook = {
-                    title: createdBook.title,
-                    category: category.categoryName
+                  const createdBook = {
+                    title: newBook.title,
+                    category: category.categoryName,
+                    author: newBook.author,
+                    description: newBook.description,
+                    bookImage: newBook.bookImage
                   };
                   res
                     .status(201)
                     .send({
-                      message: `${newBook.title} ` +
+                      message: `${createdBook.title} ` +
                     `has been added to the library,` +
-                    `Category: ${newBook.category}`,
+                    `Category: ${createdBook.category}`,
                       createdBook
                     });
                 });
@@ -137,18 +141,21 @@ export default {
             .updateAttributes(req.body, {
               fields: Object.keys(req.body)
             })
-            .then((updatedBook) => {
-              updatedBook
+            .then((editedBook) => {
+              editedBook
                 .getCategory()
                 .then((category) => {
-                  const newBook = {
-                    title: updatedBook.title,
-                    category: category.categoryName
+                  const updatedBook = {
+                    title: editedBook.title,
+                    category: category.categoryName,
+                    author: editedBook.author,
+                    description: editedBook.description,
+                    bookImage: editedBook.bookImage
                   };
                   res
                     .status(200)
                     .send({
-                      message: `${newBook.title} has been updated`,
+                      message: `${updatedBook.title} has been updated`,
                       updatedBook
                     });
                 });
@@ -178,6 +185,14 @@ export default {
       .findAndCountAll({
         limit,
         offset,
+        attributes: [
+          'id',
+          'title',
+          'author',
+          'categoryId',
+          'description',
+          'bookImage'
+        ],
         order: [
           ['createdAt', 'DESC']
         ]

server/src/controllers/category.js

@@ -27,7 +27,11 @@ export default {
       Categories.create({
         categoryName
       })
-        .then((category) => {
+        .then((newCategory) => {
+          const category = {
+            categoryName: newCategory.categoryName,
+            id: newCategory.id
+          };
           res.status(201)
             .send({
               message: `Category added!, ${category.categoryName}`,
@@ -93,7 +97,10 @@ export default {
     */
   listCategories(req, res) {
     return Categories
-      .all({ order: [['categoryName', 'ASC']] })
+      .all({
+        attributes: ['id', 'categoryName'],
+        order: [['categoryName', 'ASC']]
+      })
       .then((categories) => {
         if (Object.keys(categories).length < 1) {
           return res.status(404)

server/src/controllers/middleware/authenticate.js

@@ -25,7 +25,6 @@ const authenticate = (req, res, next) => {
       if (error) {
         return res.status(401).json({
           token: null,
-          state: {},
           message: 'Unauthorised access'
         });
       }
@@ -41,7 +40,6 @@ const authenticate = (req, res, next) => {
   } else {
     res.status(401).send({
       token: null,
-      state: {},
       message: 'Unauthorised access'
     });
   }
@@ -50,13 +48,13 @@ const authenticate = (req, res, next) => {
 /**
  * @description Decode Token for the server side processes
  *
- * @param {object} req
+ * @param {object} req - HTTP request object
  *
- * @param {object} res
+ * @param {object} res - HTTP response object
  *
- * @param {object} next
+ * @param {undefined} next
  *
- * @returns {object} res
+ * @returns {object} res - decodedToken
  */
 const decodeToken = (req, res, next) => {
   const token = req.headers['x-access-token'] || req.headers.authorization;
@@ -65,15 +63,18 @@ const decodeToken = (req, res, next) => {
     req.userId = decodedToken.id.id;
     next();
   } else {
-    res.status(401).send({ message: 'Unauthorised access' });
+    res.status(401).send({ token: null, message: 'Unauthorised access' });
   }
 };
 
 
 /**
  * @description Generates a json web token with the supplied parameters
+ *
  * @param {number} id
+ *
  * @param {boolean} isAdmin
+ *
  * @return {promise} signed token
  */
 const getJWT = (id, isAdmin) =>

server/src/controllers/middleware/checkAdmin.js

@@ -1,7 +1,7 @@
 import jwtDecode from 'jwt-decode';
 
 /**
-  * R
+  *
   *
   * @description Middleware that to check token for administrator parameters
   *
@@ -17,10 +17,9 @@ export default (req, res, next) => {
   const token = req.headers['x-access-token'] || req.headers.authorization;
   const decodedToken = jwtDecode(token);
   if (decodedToken.id.isAdmin) {
-    next(null, {
-      isAdmin: decodedToken.id.isAdmin
-    });
+    req.isAdmin = decodedToken.id.isAdmin;
+    next();
   } else {
-    res.status(403).send({ message: 'You are forbidden, Sorry' });
+    res.status(403).send({ token: null, message: 'Unauthorised Access' });
   }
 };

server/src/controllers/middleware/checkGoogleAuth.js

@@ -20,7 +20,7 @@ export default (req, res, next) => {
       familyName: lastname,
       imageUrl: userImage
     } = req.body;
-    const username = email.slice(0, email.indexOf('@')) + googleId.slice(5);
+    const username = email.slice(0, email.indexOf('@')) + googleId.slice(0, 3);
     const password = googleId;
     const passwordConfirmation = googleId;
     req.body = {

server/src/controllers/user.js

@@ -50,7 +50,11 @@ const userController = {
                   googleId: req.body.googleId || null,
                   isAdmin: req.body.isAdmin
                 }).then((user) => {
-                  if (user) {
+                  if (user.googleId) 
+                  {
+                    return userController.signIn(req, res);
+                  }
+                  else {
                     res.status(201).send({
                       message: `${user.username} has been added to the ` +
                       'library, Please Login, you will be only ' +
@@ -91,7 +95,7 @@ const userController = {
       .then((user) => {
         if (!user) {
           if (googleId) {
-            return userController.create(req, res);
+            return userController.createUser(req, res);
           }
           return res.status(404).send({
             success: false,

server/src/controllers/userBooks.js

@@ -377,7 +377,7 @@ export default {
    * @return {string} message - returns message
    *
    * @return {Object} books
-   * 
+   *
    * @return {object} pagination - returns pagination
    *
    */
@@ -396,6 +396,14 @@ export default {
           required: true
         }
       ],
+      attributes: [
+        'bookId',
+        'userId',
+        'returnDate',
+        'userReturnDate',
+        'returnStatus',
+        'overdueAmount'
+      ],
       limit,
       offset,
       order: [

server/src/test/authenticate.spec.js

@@ -73,22 +73,22 @@ describe('Authentication', () => {
         done();
       });
   });
-  it('should return a 401 status ' +
-  'code if token is not an admin token', (done) => {
-    chai
-      .request(app)
-      .post('/api/v1/admin/category')
-      .set('x-access-token', userToken)
-      .send({ categoryName: 'EDUCATIONAL' })
-      .end((err, res) => {
-        expect(res.status)
-          .to
-          .equal(403);
-        expect(res.body.token)
-          .to.equal(undefined);
-        done();
-      });
-  });
+  it(`should return a 403 status ' +
+  'code if token is not an admin token`, (done) => {
+      chai
+        .request(app)
+        .post('/api/v1/admin/category')
+        .set('x-access-token', userToken)
+        .send({ categoryName: 'EDUCATIONAL' })
+        .end((err, res) => {
+          expect(res.status)
+            .to
+            .equal(403);
+          expect(res.body.token)
+            .to.equal(null);
+          done();
+        });
+    });
   it('should return 401 if there is an error with token', (done) => {
     chai
       .request(app)
@@ -172,7 +172,7 @@ describe('Authentication', () => {
         .post('/api/v1/auth/users/signin')
         .send(newUser)
         .end((err, res) => {
-          expect(res.status).to.equal(500);
+          expect(res.status).to.equal(400);
           done();
         });
     }