Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/HEAD'
Browse files Browse the repository at this point in the history
  • Loading branch information
xicilion committed Jul 10, 2024
2 parents 5eb9863 + b731c15 commit 617636c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion demo/defs/user/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ module.exports = db => {
}
},
beforeCreate: function () {
var salt = crypto.randomBytes(64);
const randomBytes = crypto.pseudoRandomBytes || crypto.randomBytes;
var salt = randomBytes(64);
this.salt = salt.hex();
this.password = crypto.pbkdf2(this.password || "", salt, 256, 64, 'sha1').hex();
}
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fib-app",
"version": "1.16.12",
"version": "1.16.13",
"description": "",
"main": "lib",
"types": "typings/index.d.ts",
Expand Down Expand Up @@ -44,7 +44,7 @@
"viz.js": "^2.1.2"
},
"devDependencies": {
"@fibjs/ci": "^2.5.2",
"@fibjs/ci": "^2.7.1",
"@fibjs/detect-port": "^1.0.1",
"cheerio": "1.0.0-rc.3",
"cross-env": "^5.2.0",
Expand All @@ -53,16 +53,16 @@
"fib-pug": "0.0.2",
"fib-push": "^1.4.2",
"fib-session": "^0.6.1",
"fib-typify": "^0.11.1",
"fib-typify": "^0.11.6",
"ts-expect": "^1.3.0",
"vuepress": "^1.0.3",
"webpack": "^4.39.2"
},
"ci": {
"type": "actions",
"version": [
"0.33.0",
"0.34.0"
"0.36.0",
"0.37.0"
]
}
}

0 comments on commit 617636c

Please sign in to comment.