Merge pull request #480 from jfurrow/use-different-bcrypt-module

Use more popular bcrypt module
2026-06-05 03:39:24 +00:00 · 2017-10-17 22:10:23 -07:00
parent fbc3851fa3 d38ab85252
commit 3becc2b10d
3 changed files with 106 additions and 16 deletions
@@ -1487,10 +1487,21 @@
      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
      "dev": true
    },
-    "bcrypt-nodejs": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/bcrypt-nodejs/-/bcrypt-nodejs-0.0.3.tgz",
-      "integrity": "sha1-xgkX8m3CNWYVZsaBBhwwPCsohCs="
+    "bcrypt": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz",
+      "integrity": "sha512-pRyDdo73C8Nim3jwFJ7DWe3TZCgwDfWZ6nHS5LSdU77kWbj1frruvdndP02AOavtD4y8v6Fp2dolbHgp4SDrfg==",
+      "requires": {
+        "nan": "2.6.2",
+        "node-pre-gyp": "0.6.36"
+      },
+      "dependencies": {
+        "nan": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
+          "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U="
+        }
+      }
    },
    "bcrypt-pbkdf": {
      "version": "1.0.1",
@@ -2892,8 +2903,7 @@
    "deep-extend": {
      "version": "0.4.2",
      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
-      "dev": true
+      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
    },
    "deep-is": {
      "version": "0.1.3",
@@ -5295,6 +5305,29 @@
        }
      }
    },
+    "fstream-ignore": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+      "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+      "requires": {
+        "fstream": "1.0.11",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4"
+      },
+      "dependencies": {
+        "fstream": {
+          "version": "1.0.11",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+          "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.2"
+          }
+        }
+      }
+    },
    "function-bind": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -8359,6 +8392,33 @@
        "which": "1.3.0"
      }
    },
+    "node-pre-gyp": {
+      "version": "0.6.36",
+      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
+      "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
+      "requires": {
+        "mkdirp": "0.5.1",
+        "nopt": "4.0.1",
+        "npmlog": "4.1.2",
+        "rc": "1.2.2",
+        "request": "2.83.0",
+        "rimraf": "2.6.2",
+        "semver": "5.4.1",
+        "tar": "2.2.1",
+        "tar-pack": "3.4.0"
+      },
+      "dependencies": {
+        "nopt": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+          "requires": {
+            "abbrev": "1.1.1",
+            "osenv": "0.1.4"
+          }
+        }
+      }
+    },
    "node-sass": {
      "version": "4.5.3",
      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.5.3.tgz",
@@ -11127,7 +11187,6 @@
      "version": "1.2.2",
      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz",
      "integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=",
-      "dev": true,
      "requires": {
        "deep-extend": "0.4.2",
        "ini": "1.3.4",
@@ -11138,8 +11197,7 @@
        "minimist": {
          "version": "1.2.0",
          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
        }
      }
    },
@@ -12526,8 +12584,7 @@
    "strip-json-comments": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
    },
    "style-loader": {
      "version": "0.18.2",
@@ -12689,6 +12746,34 @@
        }
      }
    },
+    "tar-pack": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+      "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
+      "requires": {
+        "debug": "2.6.9",
+        "fstream": "1.0.11",
+        "fstream-ignore": "1.0.5",
+        "once": "1.4.0",
+        "readable-stream": "2.3.3",
+        "rimraf": "2.6.2",
+        "tar": "2.2.1",
+        "uid-number": "0.0.6"
+      },
+      "dependencies": {
+        "fstream": {
+          "version": "1.0.11",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+          "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.2"
+          }
+        }
+      }
+    },
    "tar-stream": {
      "version": "1.5.4",
      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz",
@@ -13042,6 +13127,11 @@
        }
      }
    },
+    "uid-number": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+      "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
+    },
    "undefsafe": {
      "version": "0.0.3",
      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-0.0.3.tgz",
@@ -29,7 +29,7 @@
    "babel-preset-react-app": "^3.0.1",
    "babel-preset-stage-2": "^6.18.0",
    "babel-runtime": "^6.25.0",
-    "bcrypt-nodejs": "0.0.3",
+    "bcrypt": "^1.0.3",
    "body-parser": "^1.12.4",
    "case-sensitive-paths-webpack-plugin": "2.1.1",
    "chalk": "^2.0.1",
@@ -72,11 +72,10 @@
    "ospath": "^1.2.2",
    "passport": "^0.3.2",
    "passport-jwt": "^2.1.0",
-    "pug": "^2.0.0-rc.3",
-    "react-document-title": "^2.0.3",
    "postcss-flexbugs-fixes": "^3.2.0",
    "postcss-loader": "2.0.6",
    "promise": "^8.0.1",
+    "pug": "^2.0.0-rc.3",
    "react": "^15.6.1",
    "react-addons-create-fragment": "^15.6.0",
    "react-addons-css-transition-group": "^15.6.0",
@@ -84,6 +83,7 @@
    "react-dev-utils": "^3.0.2",
    "react-dnd": "^2.2.3",
    "react-dnd-html5-backend": "^2.2.3",
+    "react-document-title": "^2.0.3",
    "react-dom": "^15.6.1",
    "react-dropzone": "^3.4.0",
    "react-error-overlay": "^1.0.9",
@@ -1,5 +1,5 @@
 'use strict';
-const bcrypt = require('bcrypt-nodejs');
+const bcrypt = require('bcrypt');
 const Datastore = require('nedb');

 const config = require('../../config');
@@ -47,7 +47,7 @@ class Users {

      let username = credentials.username;

-      bcrypt.hash(credentials.password, salt, null, (err, hash) => {
+      bcrypt.hash(credentials.password, salt, (err, hash) => {
        if (err) {
          return callback(null, err);
        }