From 7af15ca75ba76aed000ec25c4b3868ab167a70f8 Mon Sep 17 00:00:00 2001 From: Michael Schoonmaker Date: Mon, 9 Sep 2013 10:15:48 -0700 Subject: [PATCH 1/2] Added little boxes to Getting Started. --- docs/gettingstarted.md | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/docs/gettingstarted.md b/docs/gettingstarted.md index f4d684e1..2b8fbba6 100644 --- a/docs/gettingstarted.md +++ b/docs/gettingstarted.md @@ -1,9 +1,21 @@ -###Getting Started +### Getting Started - -Placeholder for LoopBack Getting Started Guides - -Here we want to insert the boxes - iOS, Android, HTML5/Javascript, - REST +
+
+ iOS SDK +
+ +
+
+
+ +
+ REST API +
+
--- From 159eb0076c053839bfe63358a59b288a95c1ce05 Mon Sep 17 00:00:00 2001 From: Ritchie Date: Thu, 12 Sep 2013 12:09:43 -0700 Subject: [PATCH 2/2] Use a pure JS bcrypt --- lib/models/user.js | 8 ++++---- package.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/models/user.js b/lib/models/user.js index 500f0cc0..86f44f74 100644 --- a/lib/models/user.js +++ b/lib/models/user.js @@ -7,7 +7,7 @@ var Model = require('../loopback').Model , path = require('path') , SALT_WORK_FACTOR = 10 , crypto = require('crypto') - , bcrypt = require('bcrypt') + , bcrypt = require('bcryptjs') , passport = require('passport') , LocalStrategy = require('passport-local').Strategy; @@ -138,9 +138,9 @@ User.logout = function (sid, fn) { User.prototype.hasPassword = function (plain, fn) { if(this.password && plain) { bcrypt.compare(plain, this.password, function(err, isMatch) { - if(err) return fn(err); - fn(null, isMatch); - }); + if(err) return fn(err); + fn(null, isMatch); + }); } else { fn(null, false); } diff --git a/package.json b/package.json index 63d409c3..4a478611 100644 --- a/package.json +++ b/package.json @@ -15,11 +15,11 @@ "loopback-datasource-juggler": "git+ssh://git@github.com:strongloop/loopback-datasource-juggler.git", "strong-remoting": "git+ssh://git@github.com:strongloop/strong-remoting.git", "inflection": "~1.2.5", - "bcrypt": "~0.7.6", "passport": "~0.1.17", "passport-local": "~0.1.6", "nodemailer": "~0.4.4", - "ejs": "~0.8.4" + "ejs": "~0.8.4", + "bcryptjs": "~0.7.10" }, "devDependencies": { "blanket": "~1.1.5",