move from bcrypt to flask_bcrypt

Closes #77

app/auth.py

@@ -1,11 +1,11 @@
-import bcrypt
 from flask import Blueprint
 from flask import current_app
 from flask import flash
 from flask import redirect
 from flask import render_template
 from flask import request
 from flask import url_for
+from flask.ext.bcrypt import Bcrypt
 from flask.ext.login import login_user
 from flask.ext.login import LoginManager
 from flask.ext.login import logout_user
@@ -33,10 +33,13 @@ def auth_user(login, password):
     except NoResultFound:
         return None
     db_hash = user.password
-    hashed = bcrypt.hashpw(password.encode('utf-8'), db_hash.encode('ascii'))
-    if db_hash != hashed:
+    password = password.encode('utf-8')
+    db_hash = db_hash.encode('ascii')
+    bcrypt = Bcrypt(current_app)
+    if bcrypt.check_password_hash(db_hash, password):
+        return user
+    else:
         return None
-    return user
 
 
 class SignupForm(Form):

app/models.py

@@ -6,9 +6,9 @@
 import random
 import string
 
-import bcrypt
 import koremutake
 from flask import current_app
+from flask.ext.bcrypt import Bcrypt
 from flask.ext.login import current_user
 from flask.ext.sqlalchemy import SQLAlchemy
 
@@ -80,8 +80,8 @@ def generate(fake):
     def set_password(self, clear, workfactor):
         if workfactor is None:
             workfactor = current_app.config['BCRYPT_WORKFACTOR']
-        salt = bcrypt.gensalt(workfactor)
-        self.password = bcrypt.hashpw(clear.encode('utf-8'), salt)
+        bcrypt = Bcrypt(current_app)
+        self.password = bcrypt.generate_password_hash(clear.encode('utf-8'), workfactor)
 
     def disable_password(self):
         self.password = '!'

requirements.txt

@@ -1,9 +1,9 @@
-bcrypt==1.1
 coverage==3.7.1
 fake-factory==0.4.2
 Flask==0.10.1
 Flask-Admin==1.0.8
 Flask-Assets==0.10
+Flask-Bcrypt==0.6.0
 Flask-Login==0.2.11
 Flask-Migrate==1.3
 Flask-Script==2.0.5