From 1cd99290db41aa669de30877a685efdd8c298bd8 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 18 Jan 2017 14:19:50 +0900 Subject: bye bye bcrypt-nodejs Closes #47 --- src/api/private/signin.ts | 4 ++-- src/api/private/signup.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/api/private') 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 -- cgit v1.2.3-freya