new try with different bcrypt lib

Author: Ian Redpath

package.json

@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "async": "^1.5.2",
-    "bcrypt": "^0.8.5",
+    "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.15.0",
     "cookie-parser": "^1.4.1",
     "express": "^4.13.4",
@@ -43,7 +43,6 @@
     "gulp-sourcemaps": "^1.6.0",
     "gulp-typescript": "^2.11.0",
     "gulpclass": "0.0.8",
-    "node-gyp": "^3.3.1",
     "run-sequence": "^1.1.5",
     "rxjs": "5.0.0-beta.2",
     "tsc": "^1.20150623.0",

server/models/user.model.ts

@@ -1,7 +1,7 @@
 import * as mongoose from 'mongoose'
 import * as Q from 'q'
 import * as _ from 'lodash'
-import * as bcrypt from 'bcrypt'
+import * as bcrypt from 'bcrypt-nodejs'
 
 import UserSchema from './user.schema.server'
 export default class UserModel {
@@ -18,7 +18,8 @@ export default class UserModel {
 	create(newUser) {
 		let deferred = Q.defer()
 		// encrypt password before creating
-		bcrypt.hash(newUser.password, 10, (err, hash) => {
+
+		bcrypt.hash(newUser.password, null, null, (err, hash) => {
 			if (err) {
 				deferred.reject(err)
 			} else {
@@ -54,7 +55,7 @@ export default class UserModel {
 	update(id: number, what) {
 		let deferred = Q.defer()
 		// encrypt password before creating
-		bcrypt.hash(what.password, 10, (err, hash) => {
+		bcrypt.hash(what.password, null, null, (err, hash) => {
 			if (err) {
 				deferred.reject(err)
 			} else {
@@ -97,20 +98,26 @@ export default class UserModel {
 
 	findUserByCredentials(username: string, password: string) {
 		let deferred = Q.defer()
-		console.log(`${username}, ${password}`)
 		this.findUserByUsername(username)
 			.then(user => {
-				console.log(user)
+				if (!user) {
+					deferred.reject('invalid username')
+				}
 				bcrypt.compare(password, (<any>user).password, (err, res) => {
 					if (err) {
 						deferred.reject(err)
 					} else if (!res) {
-						deferred.reject({ message: 'invalid password' })
+						// we may be comparing two encrypted passwords
+						if (password === (<any>user).password) {
+							deferred.resolve(user)
+						} else {
+							deferred.reject('invalid password')
+						}
 					} else {
 						deferred.resolve(user)
 					}
 				})
-			})
+			}, error => { deferred.reject(error.message) })
 		return deferred.promise
 	}
 }

server/server.ts

@@ -33,7 +33,7 @@ import PosterEndpoints from './project/endpoints/posterEndpoints'
 
 const ipaddress:string = process.env.OPENSHIFT_NODEJS_IP || '127.0.0.1';
 const port:number = process.env.OPENSHIFT_NODEJS_PORT || 3000;
-let mongoConnectionString: string = "mongodb://127.0.0.1:27017/webdevevelopment3"
+let mongoConnectionString: string = "mongodb://127.0.0.1:27017/webdevevelopment4"
 if (process.env.OPENSHIFT_MONGODB_DB_PASSWORD) {
 	const DB_USERNAME = process.env.OPENSHIFT_MONGODB_DB_USERNAME
 	const DB_PASSWORD = process.env.OPENSHIFT_MONGODB_DB_PASSWORD

server/services/user.service.server.ts

@@ -6,15 +6,9 @@ export default function Userendpoints(app, userModel: UserModel) {
 
 	// local strategy
 	const localStrat = (username, password, done) => {
-		if (password.indexOf('$2a$10') == 0) { // encrypted check hack
-			userModel.findUserByEncryptedCredentials(username, password)
+		userModel.findUserByCredentials(username, password)
 				.then(user => { return done(null, user ? user : false) },
 				err => { return done(err) })
-		} else {
-			userModel.findUserByCredentials(username, password)
-				.then(user => { return done(null, user ? user : false) },
-				err => { return done(err) })
-		}
 	}
 	passport.use('assignment', new local.Strategy(localStrat))
 

typings.json

@@ -1,7 +1,7 @@
 {
   "ambientDependencies": {
     "async": "github:DefinitelyTyped/DefinitelyTyped/async/async.d.ts#56295f5058cac7ae458540423c50ac2dcf9fc711",
-    "bcrypt": "github:DefinitelyTyped/DefinitelyTyped/bcrypt/bcrypt.d.ts#56295f5058cac7ae458540423c50ac2dcf9fc711",
+    "bcrypt-nodejs": "github:DefinitelyTyped/DefinitelyTyped/bcrypt-nodejs/bcrypt-nodejs.d.ts#56295f5058cac7ae458540423c50ac2dcf9fc711",
     "body-parser": "github:DefinitelyTyped/DefinitelyTyped/body-parser/body-parser.d.ts#7de6c3dd94feaeb21f20054b9f30d5dabc5efabd",
     "cookie-parser": "github:DefinitelyTyped/DefinitelyTyped/cookie-parser/cookie-parser.d.ts#56295f5058cac7ae458540423c50ac2dcf9fc711",
     "del": "github:DefinitelyTyped/DefinitelyTyped/del/del.d.ts#9027703c0bd831319dcdf7f3169f7a468537f448",