Skip to content

disa-lab #7

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 1 commit 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
25 changes: 25 additions & 0 deletions disa-lab/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"rules": {
"quotes": ["error", "single", { "allowTemplateLiterals": true }],
"comma-dangle": ["error", "always-multiline"],
"no-console": "off",
"indent": [ "error", 2 ],
"semi": ["error", "always"]
},
"env": {
"es6": true,
"node": true,
"mocha": true,
"jasmine": true
},
"globals": {
"__API_URI__": false,
"__DEBUG__": false
},
"ecmaFeatures": {
"modules": true,
"experimentalObjectRestSpread": true,
"impliedStrict": true
},
"extends": "eslint:recommended"
}
68 changes: 68 additions & 0 deletions disa-lab/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# Created by https://www.gitignore.io/api/osx,linux,node,vim

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

### 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-*


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

# Runtime data
pids
*.pid
*.seed

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

# Coverage directory used by tools like istanbul
coverage

# 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 REPL history
.node_repl_history

### Vim ###
# swap
[._]*.s[a-w][a-z]
[._]s[a-w][a-z]
# session
Session.vim
# temporary
.netrwhist
*~

# auto-generated tag files
tags

db
.env
32 changes: 32 additions & 0 deletions disa-lab/controllers/auth-controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
'use strict';

const debug = require('debug')('cfgram:auth-controller');
const User = require('../models/user');

module.exports = exports = {}; //assigning an alias--storing in an empty object

exports.createNewUser = function(body) {
dubug('#createNewUser');

let tempPassword = body.password;
body.password = null;
delete body.password;

let newUser = new User(body);

return newUser.generatePasswordHash(tempPassword)
.then(user => user.save())
.then(user => user.generateToken())
.then(token => Promise.resolve(token))
.catch(err => Promise.reject(err));
};

exports.authenticateUser = function(auth) {
debug('authenticateUser');

return User.findOne({username: auth.username})
.then(user => user.comparePasswordHash(auth.password))
.then(user => user.generateToken())
.then(token => Promise.resolve(token))
.catch(err => Promise.reject(err));
}
Empty file added disa-lab/lib/.gitkeep
Empty file.
22 changes: 22 additions & 0 deletions disa-lab/lib/basic-auth-middleware.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
'use strict';

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

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

let authHeaders = req.headers.authorization;
if(!authHeaders) return next(createError(401, 'Authorization headers required'));

let base64Str = authHeaders.split('Basic ')[1];
if(!base64Str) return next(createError(401, 'Username and Password required'));

let [username, password] = new Buffer(base64Str, 'base64').toString().split(':');
req.auth = {username, password};

if(!req.auth.username) return next(createError(401, 'Username required'));
if(!req.auth.password) return next(createError(401, 'Password required'));

next();
};
28 changes: 28 additions & 0 deletions disa-lab/lib/error-middleware.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
'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.log('message', err.message);
console.log('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();
};
Empty file added disa-lab/models/.gitkeep
Empty file.
78 changes: 78 additions & 0 deletions disa-lab/models/user.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
'use strict';

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

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(createError(401, 'Password hashing failed'));
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(createError(401, 'Password validation failed'));
if(!valid) return reject(createError(401, 'Wrong password'));

resolve(this);
});
});
};

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

return new Promise((resolve, reject) => {
let tries = 0;
let _generateFindHash = () => {
this.findHash = crypto.randomBytes(32).toString('hex');
this.save()
.then(() => resolve(this.findHash))
.catch(err => {
if(tries > 3) return reject(createError(401, 'Generate findhash failed'));
tries++;
_generateFindHash();
});
};

_generateFindHash();
});
};

userSchema.methods.generateToken = function() {
debug('#generateToken');
return new Promise((resolve, reject) => {
console.log(process.env.APP_SECRET);
this.generateFindHash()
.then(findHash => resolve(jwt.sign({token: findHash}, process.env.APP_SECRET)))
.catch(err => {
console.log(err);
reject(createError(401, 'Generate token failed'));
});
});
};

module.exports = mongoose.model('user', userSchema);
45 changes: 45 additions & 0 deletions disa-lab/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"name": "disa-lab",
"version": "1.0.0",
"description": "lab \u001b[D\u001b[D\u001b[D\u001b[Dj\u001b[CJS 401 Lab 16",
"main": "index.js",
"scripts": {
"test": "test",
"start": "node server.js"
},
"repository": {
"type": "git",
"url": "https://github.com/justdisa"
},
"keywords": [
"lab",
"javascript"
],
"author": "justdisa",
"license": "MIT",
"devDependencies": {
"chai": "^3.5.0",
"chai-http": "^3.0.0",
"coveralls": "^2.13.1",
"istanbul": "^0.4.5",
"mocha": "^3.3.0",
"mocha-lcov-reporter": "^1.3.0"
},
"dependencies": {
"bcrypt": "^1.0.2",
"bluebird": "^3.5.0",
"body-parser": "^1.17.1",
"cors": "^2.8.3",
"crypto": "0.0.3",
"debug": "^2.6.6",
"dotenv": "^4.0.0",
"express": "^4.15.2",
"http-errors": "^1.6.1",
"jsonwebtoken": "^7.4.0",
"mongoose": "^4.9.8",
"morgan": "^1.8.1"
},
"directories": {
"test": "test"
}
}
Empty file added disa-lab/routes/.gitkeep
Empty file.
25 changes: 25 additions & 0 deletions disa-lab/routes/auth-routes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
'use strict';//Some parts of this need to go into auth-controller, but I don't know what. still figuring it out.
//routes in router, what it does goes in the controller.
const debug = require('debug')('cfgram:auth-routes');
const basicAuth = require('../lib/basic-auth-middleware');
const User = require('../models/user');

module.exports = function(router) {
router.post('/signup', (req, res) => {
debug('POST /signup');//debug is "superdope" =D
//hashtag is just a flag saying you're inside the thing
//stuff goes here
return authController.createNewUser(req.body)
.then(token => res.json(token))
.catch(err => res.status(400).send(err));
});

router.get('/signin', basicAuth, (req, res) => {
debug('GET /signin');

return authController.authenticateUser(req.auth)
.then(token => res.json(token))
.catch(err => res.status(401).send(err));
});
return router;
};
25 changes: 25 additions & 0 deletions disa-lab/server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
'use strict';

require('dotenv').load();

const express = require('express');
const cors = require('cors');
const debug = require('debug')('cfgram:server');
const Promise = require('bluebird');
const errorHandler = require('./lib/error-middleware');
const authRoutes = require('./routes/auth-routes');
const bodyParser = require('body-parser').json();
const mongoose = require('mongoose');

const app = express();
const router = express.Router();
const PORT = process.env.PORT || 3000;
const MONGODB_URI = process.env.MONGODB_URI || 'mongodb://localhost/cfgram-dev';

mongoose.Promise = Promise;
mongoose.connect(MONGODB_URI);

app.use(errorHandler);
app.use(cors());
app.use(bodyParser);
app.use('./api', authRoutes(router));
1 change: 1 addition & 0 deletions disa-lab/test/user-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
'use strict';