Skip to content

Day18 lab brian #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
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
21 changes: 21 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"rules": {
"no-console": "off",
"indent": [ "error", 2 ],
"quotes": [ "error", "single" ],
"semi": ["error", "always"],
"linebreak-style": [ "error", "unix" ]
},
"env": {
"es6": true,
"node": true,
"mocha": true,
"jasmine": true
},
"ecmaFeatures": {
"modules": true,
"experimentalObjectRestSpread": true,
"impliedStrict": true
},
"extends": "eslint:recommended"
}
117 changes: 117 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
# Created by https://www.gitignore.io/api/node,vim,osx,macos,linux

*node_modules

### Node ###
# Logs
logs
*.log
npm-debug.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules
jspm_packages

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity



### Vim ###
# swap
[._]*.s[a-v][a-z]
[._]*.sw[a-p]
[._]s[a-v][a-z]
[._]sw[a-p]
# session
Session.vim
# temporary
.netrwhist
*~
# auto-generated tag files
tags


### OSX ###
*.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
.env

### macOS ###
# Icon must end with two \r
# Thumbnails
# Files that might appear in the root of a volume
# Directories potentially created on remote AFP share


### Linux ###

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

# End of https://www.gitignore.io/api/node,vim,osx,macos,linux
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 lint
23 changes: 23 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
'use strict';

const gulp = require('gulp');
const eslint = require('gulp-eslint');
const mocha = require('gulp-mocha');

gulp.task('test', function(){
gulp.src('./test/*-test.js', {read: false})
.pipe(mocha({reporter:'nyan'}));
});

gulp.task('lint', function(){
return gulp.src(['**/*.js', '!node_modules/**'])
.pipe(eslint())
.pipe(eslint.format())
.pipe(eslint.failAfterError());
});

gulp.task('dev', function(){
gulp.watch(['**/*.js', '!node_modules/**'], ['lint', 'test']);
});

gulp.task('default', ['dev']);
37 changes: 37 additions & 0 deletions lib/basic-auth-middleware.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@

'use strict';

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

module.exports = function(req, res, next) {
debug('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();
};
29 changes: 29 additions & 0 deletions lib/bearer-auth-middleware.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
'use strict';

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

const User = require('../model/user.js');
module.exports = function(req, res, next){
debug('bearer auth');
var authHeader = req.headers.authorization;
console.log('auth header in beaerer auth', authHeader);
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));
});
});
};
33 changes: 33 additions & 0 deletions lib/error-middleware.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
'use strict';

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

module.exports = function(err, req, res, next){
debug('error-middleware');
console.error('name', err.name);
console.error('message', err.message);
console.error('status', err.status);

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

if(err.name === 'CastError'){
err = createError(404, err.message);
res.status(err.status).send(err.name);
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);
15 changes: 15 additions & 0 deletions model/pic.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
'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);
72 changes: 72 additions & 0 deletions model/user.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
'use strict';

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

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, 'incorrect 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);
Loading