From 43bda1ae2cf618948c70c6a5cd6a4bb77f14d66c Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Mon, 11 Sep 2017 15:47:10 +0100
Subject: [PATCH] upgrade flask-bcrypt to 0.7.1

this uses bcrypt directly rather than using the wrapper python-bcrypt.
WARNING! You'll need to update your local install by running:

```
pip uninstall python-bcrypt
pip install flask-bcrypt==0.7.1
```
---
 app/encryption.py | 2 +-
 requirements.txt  | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/encryption.py b/app/encryption.py
index 34577c0d6..34ba6df8e 100644
--- a/app/encryption.py
+++ b/app/encryption.py
@@ -16,7 +16,7 @@ class Encryption:
 
 
 def hashpw(password):
-    return generate_password_hash(password.encode('UTF-8'), 10)
+    return generate_password_hash(password.encode('UTF-8'), 10).decode('utf-8')
 
 
 def check_hash(password, hashed_password):
diff --git a/requirements.txt b/requirements.txt
index a1ef0f9eb..7df31e888 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,7 @@
 boto3==1.4.7
 celery==3.1.25 # pyup: <4
 docopt==0.6.2
-# ignore flask-bcrypt - when upgrading, it installs an invalid version of bcrypt that isn't removed when a different
-# branch runs, so can cause other PR builds to fail on jenkins.
-# TODO: Upgrade flask-bcrypt in a safe way
-Flask-Bcrypt==0.6.2 # pyup: ignore
+Flask-Bcrypt==0.7.1
 Flask-Marshmallow==0.8.0
 Flask-Migrate==2.1.1
 Flask-Script==2.0.5