Merging conflict with two_factor.py

Fixed merge mistake with two_factor.py.
This commit is contained in:
Nicholas Staples
2016-03-30 09:58:10 +01:00
parent 62ca57a5de
commit 48daac7b94
11 changed files with 44 additions and 123 deletions

View File

@@ -162,6 +162,11 @@ def valid_phone_number(phone_number):
return False
@login_manager.user_loader
def load_user(user_id):
return user_api_client.get_user(user_id)
# https://www.owasp.org/index.php/List_of_useful_HTTP_headers
def useful_headers_after_request(response):
response.headers.add('X-Frame-Options', 'deny')