diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-01-18 14:19:50 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-01-18 14:19:50 +0900 |
| commit | 1cd99290db41aa669de30877a685efdd8c298bd8 (patch) | |
| tree | 1ae1dee774ed4318978d48bcc4e1f11507ece784 | |
| parent | test (diff) | |
| download | misskey-1cd99290db41aa669de30877a685efdd8c298bd8.tar.gz misskey-1cd99290db41aa669de30877a685efdd8c298bd8.tar.bz2 misskey-1cd99290db41aa669de30877a685efdd8c298bd8.zip | |
bye bye bcrypt-nodejs
Closes #47
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | src/api/private/signin.ts | 4 | ||||
| -rw-r--r-- | src/api/private/signup.ts | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/package.json b/package.json index 7eb4fb603f..10783d8806 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "test": "mocha --harmony" }, "dependencies": { - "@types/bcrypt": "1.0.0", + "@types/bcryptjs": "2.4.0", "@types/body-parser": "0.0.33", "@types/browserify": "12.0.30", "@types/chai": "3.4.34", @@ -66,7 +66,7 @@ "babel-polyfill": "6.20.0", "babel-preset-es2015": "6.18.0", "babel-preset-stage-3": "6.17.0", - "bcrypt": "1.0.2", + "bcryptjs": "2.4.0", "body-parser": "1.15.2", "browserify": "13.3.0", "browserify-livescript": "0.2.3", diff --git a/src/api/private/signin.ts b/src/api/private/signin.ts index 4d2cebac40..5af44ce940 100644 --- a/src/api/private/signin.ts +++ b/src/api/private/signin.ts @@ -1,5 +1,5 @@ import * as express from 'express'; -import * as bcrypt from 'bcrypt'; +import * as bcrypt from 'bcryptjs'; import User from '../models/user'; import Signin from '../models/signin'; import serialize from '../serializers/signin'; @@ -23,7 +23,7 @@ export default async (req: express.Request, res: express.Response) => { } // Compare password - const same = await bcrypt.compare(password, user.password); + const same = bcrypt.compareSync(password, user.password); if (same) { const expires = 1000 * 60 * 60 * 24 * 365; // One Year diff --git a/src/api/private/signup.ts b/src/api/private/signup.ts index 53d9e369ac..2b679b914c 100644 --- a/src/api/private/signup.ts +++ b/src/api/private/signup.ts @@ -1,5 +1,5 @@ import * as express from 'express'; -import * as bcrypt from 'bcrypt'; +import * as bcrypt from 'bcryptjs'; import rndstr from 'rndstr'; import recaptcha = require('recaptcha-promise'); import User from '../models/user'; @@ -54,7 +54,7 @@ export default async (req: express.Request, res: express.Response) => { } // Generate hash of password - const salt = bcrypt.genSaltSync(14); + const salt = bcrypt.genSaltSync(8); const hash = bcrypt.hashSync(password, salt); // Generate secret |