Merge pull request #43 from mirceaalexandru/buffer

mirceaalexandru · mirceaalexandru · commit e8e4e096db99 · 2016-05-24T14:03:14.000+03:00
Added test for password as buffer. Update some dependencies.
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "eraro": "0.4.1",
-    "lodash": "3.10.1",
+    "lodash": "4.13.x",
     "node-uuid": "1.4.7"
   },
   "devDependencies": {
diff --git a/user.js b/user.js
@@ -326,6 +326,11 @@ module.exports = function user (options) {
             }
             else return done(null, {ok: false, why: 'user-not-found', nick: q.nick, email: q.email})
           }
+
+          if (_.isBuffer(user.pass)) {
+            user.pass = user.pass.toString('utf8')
+          }
+
           args.user = user
 
           return cmd.call(seneca, args, done)
@@ -623,6 +628,7 @@ module.exports = function user (options) {
       return make_login(user, 'auto')
     }
     else {
+
       seneca.act({role: role, cmd: 'verify_password', proposed: args.password, pass: user.pass, salt: user.salt}, function (err, out) {
         if (err) return done(err)
         if (!out.ok) {

Original file line number	Diff line number	Diff line change
`@@ -326,6 +326,11 @@ module.exports = function user (options) {`
`326`	`326`	`}`
`327`	`327`	`else return done(null, {ok: false, why: 'user-not-found', nick: q.nick, email: q.email})`
`328`	`328`	`}`
	`329`	`+`
	`330`	`+ if (_.isBuffer(user.pass)) {`
	`331`	`+ user.pass = user.pass.toString('utf8')`
	`332`	`+ }`
	`333`	`+`
`329`	`334`	`args.user = user`
`330`	`335`
`331`	`336`	`return cmd.call(seneca, args, done)`
`@@ -623,6 +628,7 @@ module.exports = function user (options) {`
`623`	`628`	`return make_login(user, 'auto')`
`624`	`629`	`}`
`625`	`630`	`else {`
	`631`	`+`
`626`	`632`	`seneca.act({role: role, cmd: 'verify_password', proposed: args.password, pass: user.pass, salt: user.salt}, function (err, out) {`
`627`	`633`	`if (err) return done(err)`
`628`	`634`	`if (!out.ok) {`