Merge pull request #45 from placidrod/master

Fix authentication

public/src/components/app.jsx

@@ -14,7 +14,9 @@ export default class App extends React.Component {
       currentAlbum: null,
       currentPhoto: 0,
       currentAlbumIndex: 5,
-      currentUser: {}, // change
+      currentUser: {
+        albums: []
+      }, // change
       displayUser: {} // change
     };
   }
@@ -105,7 +107,7 @@ export default class App extends React.Component {
   render() {
     return (
       <div>
-        <Navbar addPhoto={this.addPhoto.bind(this)}/>
+        <Navbar addPhoto={this.addPhoto.bind(this)} currentUser={this.state.currentUser}/>
         <div className="container-fluid">
           <this.renderPage
             currentAlbum={this.state.currentAlbum}

public/src/components/navbar.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 // import Bootstrap from 'bootstrap';
 import PhotoForm from './photoform.jsx';
 
-const Navbar = ({addPhoto}) => {
+const Navbar = ({addPhoto, currentUser}) => {
   return (
 
 <nav className="navbar navbar-default navbar-fixed-top">
@@ -24,7 +24,7 @@ const Navbar = ({addPhoto}) => {
         <li className="dropdown">
           <a className="dropdown-toggle" href="#" data-toggle="dropdown">Upload <span className="caret"></span></a>
           <div className="dropdown-menu">
-            <PhotoForm addPhoto={addPhoto}/>
+            <PhotoForm addPhoto={addPhoto} currentUser={currentUser}/>
           </div>
         </li>
 

public/src/components/photoform.jsx

@@ -1,10 +1,19 @@
 import React from 'react';
 
-const PhotoForm = ({addPhoto}) => {
+const PhotoForm = ({addPhoto, currentUser}) => {
   let photo;
   let name;
   let desc;
   let newName;
+  let albums;
+
+  if(currentUser.albums.length) {
+    albums = currentUser.albums.map((album) => {
+      return <option value={album.name}>{album.name}</option>
+    });
+  } else {
+    albums = <option value="All Photos">All Photos</option>;
+  }
 
   $('select#name').on('change', function(e) {
     e.preventDefault();
@@ -40,8 +49,7 @@ const PhotoForm = ({addPhoto}) => {
       <div className="form-group">
         <select id="name" className="form-control" name="name">
           <option value="">Select Album</option>
-          <option value="personal">Personal</option>
-          <option value="office">Office</option>
+          {albums}
           <option value="__newalbum">Create New Album</option>
         </select>
       </div>

server/app.js

@@ -1,12 +1,10 @@
 const express = require('express');
-// const router = require('./routes.js');
 const cors = require('cors');
 const path = require('path');
 const session = require('express-session');
 const requestHandler = require('./lib/request-handler.js');
 const bodyParser = require('body-parser');
 
-
 const app = express();
 
 
@@ -34,7 +32,7 @@ app.use(session({
 app.get('/', authenticate);
 
 app.get('/user/:username', requestHandler.getUser);
-// app.get('/user/albums/:username', requestHandler.getUser);
+
 app.post('/user/upload', requestHandler.handleUploadPhoto);
 
 

server/db/models/user.js

@@ -41,23 +41,6 @@ const userSchema = new Schema({
   friends: [],
 });
 
-
-
-userSchema.pre('save', function (next) {
-  const cipher = Promise.promisify(bcrypt.hash);
-  if (!this.profilePic) {
-    this.profilePic = 'http://www.lovemarks.com/wp-content/uploads/profile-avatars/default-avatar-tech-guy.png';
-  }
-
-  return cipher(this.password, null, null).bind(this)
-    .then(function (hash) {
-      this.password = hash;
-      next();
-    });
-});
-
-
-
 const User = mongoose.model('User', userSchema);
 
 User.comparePassword = function (candidatePassword, savedPassword, cb) {

server/lib/request-handler.js

@@ -3,6 +3,8 @@ const multer = require('multer');
 const cloudinaryApi = require('./cloudinaryApi.js');
 const _ = require('underscore');
 const path = require('path');
+const bcrypt = require('bcrypt-nodejs');
+const Promise = require('bluebird');
 
 const upload = multer().single('photo');
 const requestHandler = {};
@@ -176,19 +178,28 @@ requestHandler.sendLogin = function (req, res) {
 
 
 function createUser(user, req, res) {
-  User.create(
-    user,
-    (error, user) => {// eslint-disable-line
-      if (error) {
-        res.status(500).redirect('/signup');
-      } else {
-        req.session.regenerate(() => {
-          req.session.username = req.body.username;
-          res.redirect('/');
-        });
-      }
-    } // eslint-disable-line
-  );
+  const cipher = Promise.promisify(bcrypt.hash);
+  if (!user.profilePic) {
+    user.profilePic = 'http://www.lovemarks.com/wp-content/uploads/profile-avatars/default-avatar-tech-guy.png';
+  }
+  cipher(user.password, null, null)
+    .then(function (hash) {
+      user.password = hash;
+      // console.log(hash);
+      User.create(
+        user,
+        (error, user) => {// eslint-disable-line
+          if (error) {
+            res.status(500).redirect('/signup');
+          } else {
+            req.session.regenerate(() => {
+              req.session.username = req.body.username;
+              res.redirect('/');
+            });
+          }
+        } // eslint-disable-line
+      );
+    });
 }
 
 requestHandler.handleSignup = function (req, res) {