Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules

.env
19 changes: 19 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
language: node_js
node_js:
- 'stable'
services:
- mongodb
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-4.8
- g++-4.8
env:
- CXX=g++-4.8
sudo: required
before_script: npm i
script:
- npm test
- npm run lint
Binary file added data/tester.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions lib/basic-auth-middleware.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
'use strict';

const createError = require('http-errors');
const debug = require('debug')('cfgram:basic-auth-middleware');

module.exports = function(req, res, next) {
debug('basic auth');

var authHeader = req.headers.authorization;
if (!authHeader) {
return next(createError(401, 'authorization header required'));
}

var base64str = authHeader.split('Basic ')[1];
if (!base64str) {
return next(createError(401, 'username and password required'));
}

var utf8str = new Buffer(base64str, 'base64').toString();
var authArr = utf8str.split(':');

req.auth = {
username: authArr[0],
password: authArr[1]
}

if (!req.auth.username) {
return next(createError(401, 'username required'));
}

if (!req.auth.password) {
return next(createError(401, 'password required'));
}

next();
}
34 changes: 34 additions & 0 deletions lib/bearer-auth-middleware.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
'use strict';

const jwt = require('jsonwebtoken');
const createError = require('http-errors');
const debug = require('debug')('cfgram:bearer-auth-middleware');

const User = require('../model/user.js');

module.exports = function(req, res, next) {
debug('bearer auth');

var authHeader = req.headers.authorization;
if (!authHeader) {
return next(createError(401, 'authorization header required'));
}

var token = authHeader.split('Bearer ')[1];
if (!token) {
return next(createError(401, 'token required'));
}

jwt.verify(token, process.env.APP_SECRET, (err, decoded) => {
if (err) return next(err);

User.findOne({ findHash: decoded.token })
.then( user => {
req.user = user;
next();
})
.catch( err => {
next(createError(401, err.message))
})
});
}
28 changes: 28 additions & 0 deletions lib/error-middleware.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
'use strict';

const createError = require('http-errors');
const debug = require('debug')('cfgram:error-middleware');

module.exports = function(err, req, res, next) {
debug('error middleware');

console.error('message:', err.message);
console.error('name:', err.name);

if (err.status) {
res.status(err.status).send(err.name);
next();
return;
}

if (err.name === 'ValidationError') {
err = createError(400, err.message);
res.status(err.status).send(err.name);
next();
return;
}

err = createError(500, err.message);
res.status(err.status).send(err.name);
next();
}
13 changes: 13 additions & 0 deletions model/gallery.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
'use strict';

const mongoose = require('mongoose');
const Schema = mongoose.Schema;

const gallerySchema = Schema({
name: { type: String, required: true },
desc: { type: String, required: true },
created: { type: Date, required: true, default: Date.now },
userID: { type: Schema.Types.ObjectId, required: true }
});

module.exports = mongoose.model('gallery', gallerySchema);
16 changes: 16 additions & 0 deletions model/pic.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
'use strict';

const mongoose = require('mongoose');
const Schema = mongoose.Schema;

const picSchema = Schema({
name: { type: String, required: true },
desc: { type: String, required: true },
userID: { type: Schema.Types.ObjectId, required: true },
galleryID: { type: Schema.Types.ObjectId, required: true },
imageURI: { type: String, required: true, unique: true },
objectKey: { type: String, required: true, unique: true },
created: { type: Date, default: Date.now }
});

module.exports = mongoose.model('pic', picSchema);
74 changes: 74 additions & 0 deletions model/user.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
'use strict';

const crypto = require('crypto');
const bcrypt = require('bcrypt');
const jwt = require('jsonwebtoken');
const mongoose = require('mongoose');
const createError = require('http-errors');
const Promise = require('bluebird');
const debug = require('debug')('cfgram:user');

const Schema = mongoose.Schema;

const userSchema = Schema({
username: { type: String, required: true, unique: true },
email: { type: String, required: true, unique: true },
password: { type: String, required: true },
findHash: { type: String, unique: true }
});

userSchema.methods.generatePasswordHash = function(password) {
debug('generatePasswordHash');

return new Promise((resolve, reject) => {
bcrypt.hash(password, 10, (err, hash) => {
if (err) return reject(err);
this.password = hash;
resolve(this);
});
});
}

userSchema.methods.comparePasswordHash = function(password) {
debug('comparePasswordHash');
return new Promise((resolve, reject) => {
bcrypt.compare(password, this.password, (err, valid) => {
if (err) return reject(err);
if (!valid) return reject(createError(401, 'invalid password'));
resolve(this);
});
});
}

userSchema.methods.generateFindHash = function() {
debug('generateFindHash');

return new Promise((resolve, reject) => {
let tries = 0;

_generateFindHash.call(this);

function _generateFindHash() {
this.findHash = crypto.randomBytes(32).toString('hex');
this.save()
.then( () => resolve(this.findHash))
.catch( err => {
if ( tries > 3) return reject(err);
tries++;
_generateFindHash.call(this);
});
}
});
}

userSchema.methods.generateToken = function() {
debug('generateToken');

return new Promise((resolve, reject) => {
this.generateFindHash()
.then( findHash => resolve(jwt.sign({ token: findHash }, process.env.APP_SECRET)))
.catch( err => reject(err));
});
}

module.exports = mongoose.model('user', userSchema);
37 changes: 37 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"name": "cfgram",
"version": "1.0.0",
"description": "",
"main": "server.js",
"directories": {
"test": "test"
},
"scripts": {
"test": "DEBUG='cfgram*' mocha",
"start": "DEBUG='cfgram*' node server.js"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"aws-sdk": "^2.95.0",
"bcrypt": "^1.0.2",
"bluebird": "^3.5.0",
"body-parser": "^1.17.2",
"cors": "^2.8.4",
"debug": "^2.6.8",
"del": "^3.0.0",
"dotenv": "^4.0.0",
"express": "^4.15.4",
"http-errors": "^1.6.2",
"jsonwebtoken": "^7.4.2",
"mongoose": "^4.11.6",
"morgan": "^1.8.2",
"multer": "^1.3.0"
},
"devDependencies": {
"chai": "^4.1.1",
"mocha": "^3.5.0",
"superagent": "^3.5.2"
}
}
34 changes: 34 additions & 0 deletions route/auth-router.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
'use strict';

const jsonParser = require('body-parser').json();
const debug = require('debug')('cfgram:auth-router');
const Router = require('express').Router;
const basicAuth = require('../lib/basic-auth-middleware.js');
const User = require('../model/user.js');

const authRouter = module.exports = Router();

authRouter.post('/api/signup', jsonParser, function(req, res, next) {
debug('POST: /api/signup');

let password = req.body.password;
delete req.body.password;

let user = new User(req.body);

user.generatePasswordHash(password)
.then( user => user.save())
.then( user => user.generateToken())
.then( token => res.send(token))
.catch(next);
});

authRouter.get('/api/signin', basicAuth, function(req, res, next) {
debug('GET: /api/signin');

User.findOne({ username: req.auth.username })
.then( user => user.comparePasswordHash(req.auth.password))
.then( user => user.generateToken())
.then( token => res.send(token))
.catch(next);
});
30 changes: 30 additions & 0 deletions route/gallery-router.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
'use strict';

const Router = require('express').Router;
const jsonParser = require('body-parser').json();
const createError = require('http-errors');
const debug = require('debug')('cfgram:gallery-router');

const Gallery = require('../model/gallery.js');
const bearerAuth = require('../lib/bearer-auth-middleware.js');

const galleryRouter = module.exports = Router();

galleryRouter.post('/api/gallery', bearerAuth, jsonParser, function(req, res, next) {
debug('POST: /api/gallery');

req.body.userID = req.user._id;
new Gallery(req.body).save()
.then( gallery => res.json(gallery))
.catch(next);
});

galleryRouter.get('/api/gallery/:id', bearerAuth, function(req, res, next) {
debug('GET: /api/gallery/:id');

Gallery.findById(req.params.id)
.then( gallery => {
res.json(gallery);
})
.catch(next);
});
Loading